From f358f322dae5780c03d541546f2fbf830f141a04 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 4 Mar 2021 00:50:33 +0100 Subject: [PATCH] Bump Buildroot to 2021.02-rc3 (#1260) * Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10) --- .../configs/intel_nuc_defconfig | 2 +- .../configs/odroid_c2_defconfig | 2 +- .../configs/odroid_c4_defconfig | 2 +- .../configs/odroid_n2_defconfig | 2 +- .../configs/odroid_xu4_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/rpi0_w_defconfig | 2 +- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 4 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/configs/rpi_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 2 +- .../0001-docker-add-AppArmor-support.patch | 52 +- ...0002-network-manager-wpa_supplicant.patch} | 16 +- .../0002-rpi-firmware-Bump-firmware.patch | 39 - ...lient.patch => 0003-Fix-dhcp-client.patch} | 16 +- ...h => 0004-docker-proxy-Bump-version.patch} | 12 +- ...ware-Allow-to-deploy-multiple-firmwa.patch | 76 + .../0005-rpi-use-latest-wifi-driver.patch | 48 - .../0006-ODROID-XU4-video-firmware.patch | 50 - ...rmware-add-new-option-for-Samsung-MF.patch | 54 - ...latest-systemd-stable-release-246.10.patch | 82 - ...rmware-add-new-option-for-USB-TI-341.patch | 53 - buildroot/.flake8 | 2 +- buildroot/CHANGES | 254 ++ buildroot/Config.in.legacy | 92 +- buildroot/DEVELOPERS | 79 +- buildroot/Makefile | 6 +- buildroot/arch/Config.in.arc | 19 +- buildroot/arch/Config.in.powerpc | 4 - buildroot/board/arm/foundation-v8/readme.txt | 7 +- .../overlay/boot/extlinux/extlinux.conf | 4 + buildroot/board/arrow/avenger96/readme.txt | 41 + buildroot/board/atmel/readme.txt | 2 + .../board/kontron/smarc-sal28/genimage.cfg | 12 + .../board/kontron/smarc-sal28/readme.txt | 18 +- .../microchip/sam9x60ek_mmc/genimage.cfg | 31 + buildroot/board/minnowboard/genimage.cfg | 5 +- buildroot/board/minnowboard/grub.cfg | 2 +- buildroot/board/minnowboard/linux.config | 1 + buildroot/board/nexbox/a95x/boot.txt | 2 +- buildroot/board/nexbox/a95x/genimage.cfg | 2 + .../board/orangepi/orangepi-pc/linux.fragment | 1 - buildroot/board/orangepi/orangepi-r1/boot.cmd | 2 +- .../board/orangepi/orangepi-r1/genimage.cfg | 8 +- .../orangepi/orangepi-zero-plus2/boot.cmd | 2 +- .../orangepi/orangepi-zero-plus2/genimage.cfg | 9 +- buildroot/board/pine64/rock64/extlinux.conf | 4 + buildroot/board/pine64/rock64/genimage.cfg | 23 + ...328-needs-itb-image-to-boot-properly.patch | 32 + buildroot/board/pine64/rock64/post-build.sh | 9 + buildroot/board/pine64/rock64/readme.txt | 95 + .../patches/linux/versatile-nommu.patch | 22 +- .../board/qemu/arm-vexpress-tz/readme.txt | 2 +- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 +- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 +- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 +- ...ude-hi-and-lo-in-clobber-list-for-R6.patch | 16 +- buildroot/board/qemu/post-image.sh | 14 +- ...x-mcpu-options-for-SPE-only-compiler.patch | 10 +- .../board/qemu/ppc-virtex-ml507/linux.config | 36 - .../board/qemu/ppc-virtex-ml507/readme.txt | 5 - .../linux/0001-arch-sh-vmlinux.scr.patch | 32 - ...02-include-asm-generic-vmlinux.lds.h.patch | 32 - .../linux/0001-arch-sh-vmlinux.scr.patch | 32 - ...02-include-asm-generic-vmlinux.lds.h.patch | 27 - ...1-arm-dts-owl-s500-Fix-incorrect-PPI.patch | 52 - ...002-arm-dts-owl-s500-add-RoseapplePi.patch | 89 - .../board/sifive/hifive-unleashed/boot.cmd | 4 + .../{genimage.cfg => genimage_sdcard.cfg} | 14 +- .../hifive-unleashed/genimage_spi-nor.cfg | 19 + .../hifive-unleashed/linux.config.fragment | 14 +- .../sifive/hifive-unleashed/post-build.sh | 2 + .../board/sifive/hifive-unleashed/readme.txt | 68 +- buildroot/board/sinovoip/m1-plus/boot.cmd | 5 + buildroot/board/sinovoip/m1-plus/genimage.cfg | 37 + .../sinovoip/m1-plus/linux-wifi.fragment | 10 + ...nanapi-m1-plus-Disable-OOB-IRQ-for-b.patch | 39 + .../board/sinovoip/m1-plus/post-build.sh | 4 + buildroot/board/sinovoip/m1-plus/readme.txt | 64 + ...rcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt | 1 + .../lib/firmware/brcm/brcmfmac43362-sdio.txt | 56 + .../common/stm32mp157/post-image.sh | 2 + buildroot/boot/arm-trusted-firmware/Config.in | 4 +- .../arm-trusted-firmware.hash | 2 +- .../boot/at91bootstrap3/at91bootstrap3.mk | 3 + buildroot/boot/barebox/Config.in | 4 +- buildroot/boot/barebox/barebox.hash | 6 +- buildroot/boot/barebox/barebox.mk | 2 +- .../boot-wrapper-aarch64.mk | 2 +- buildroot/boot/grub2/grub2.mk | 1 + ...raining_leveling.c-uninitialized-var.patch | 31 - .../boot/mv-ddr-marvell/mv-ddr-marvell.hash | 2 +- .../boot/mv-ddr-marvell/mv-ddr-marvell.mk | 4 +- buildroot/boot/shim/shim.mk | 1 + buildroot/boot/uboot/Config.in | 14 +- buildroot/boot/uboot/uboot.hash | 2 +- buildroot/boot/uboot/uboot.mk | 11 +- .../vexpress-firmware/vexpress-firmware.hash | 2 +- buildroot/configs/aarch64_efi_defconfig | 6 +- buildroot/configs/arm_foundationv8_defconfig | 13 +- buildroot/configs/avenger96_defconfig | 34 + buildroot/configs/bananapi_m1_plus_defconfig | 44 + buildroot/configs/bananapi_m2_zero_defconfig | 6 +- .../freescale_imx6dlsabreauto_defconfig | 4 +- .../configs/freescale_imx6dlsabresd_defconfig | 4 +- .../freescale_imx6qsabreauto_defconfig | 4 +- .../configs/freescale_imx6qsabresd_defconfig | 4 +- .../configs/freescale_imx6sxsabresd_defconfig | 4 +- .../configs/freescale_imx6ullevk_defconfig | 4 +- .../configs/freescale_imx7dsabresd_defconfig | 4 +- .../configs/freescale_imx8mmevk_defconfig | 8 +- .../configs/freescale_imx8mnevk_defconfig | 6 +- .../configs/freescale_imx8mqevk_defconfig | 6 +- .../configs/freescale_imx8qmmek_defconfig | 6 +- .../configs/freescale_imx8qxpmek_defconfig | 6 +- buildroot/configs/hifive_unleashed_defconfig | 31 +- buildroot/configs/imx6-sabresd_defconfig | 8 +- buildroot/configs/imx6-sabresd_qt5_defconfig | 8 +- .../configs/kontron_smarc_sal28_defconfig | 16 +- buildroot/configs/lafrite_defconfig | 4 +- .../configs/linksprite_pcduino_defconfig | 9 +- .../configs/microchip_sam9x60ek_mmc_defconfig | 27 + .../microchip_sam9x60ek_mmc_dev_defconfig | 77 + .../minnowboard_max-graphical_defconfig | 4 +- buildroot/configs/minnowboard_max_defconfig | 6 +- buildroot/configs/mx51evk_defconfig | 8 +- buildroot/configs/mx53loco_defconfig | 8 +- buildroot/configs/nexbox_a95x_defconfig | 4 +- buildroot/configs/nitrogen6sx_defconfig | 8 +- buildroot/configs/nitrogen6x_defconfig | 8 +- buildroot/configs/nitrogen7_defconfig | 8 +- buildroot/configs/nitrogen8m_defconfig | 13 +- buildroot/configs/nitrogen8mm_defconfig | 13 +- buildroot/configs/nitrogen8mn_defconfig | 13 +- buildroot/configs/orangepi_pc_defconfig | 6 +- buildroot/configs/orangepi_r1_defconfig | 7 +- buildroot/configs/orangepi_zero_defconfig | 6 +- .../configs/orangepi_zero_plus2_defconfig | 7 +- buildroot/configs/qemu_aarch64_virt_defconfig | 6 +- .../configs/qemu_arm_versatile_defconfig | 6 +- .../qemu_arm_versatile_nommu_defconfig | 6 +- buildroot/configs/qemu_arm_vexpress_defconfig | 6 +- .../configs/qemu_arm_vexpress_tz_defconfig | 10 +- buildroot/configs/qemu_m68k_mcf5208_defconfig | 6 +- buildroot/configs/qemu_m68k_q800_defconfig | 6 +- .../configs/qemu_microblazebe_mmu_defconfig | 6 +- .../configs/qemu_microblazeel_mmu_defconfig | 6 +- .../configs/qemu_mips32r2_malta_defconfig | 6 +- .../configs/qemu_mips32r2el_malta_defconfig | 6 +- .../configs/qemu_mips32r6_malta_defconfig | 6 +- .../configs/qemu_mips32r6el_malta_defconfig | 6 +- buildroot/configs/qemu_mips64_malta_defconfig | 6 +- .../configs/qemu_mips64el_malta_defconfig | 6 +- .../configs/qemu_mips64r6_malta_defconfig | 6 +- .../configs/qemu_mips64r6el_malta_defconfig | 6 +- buildroot/configs/qemu_nios2_10m50_defconfig | 6 +- buildroot/configs/qemu_or1k_defconfig | 6 +- buildroot/configs/qemu_ppc64_e5500_defconfig | 4 +- .../configs/qemu_ppc64_pseries_defconfig | 6 +- .../configs/qemu_ppc64le_pseries_defconfig | 6 +- buildroot/configs/qemu_ppc_g3beige_defconfig | 6 +- buildroot/configs/qemu_ppc_mac99_defconfig | 6 +- .../configs/qemu_ppc_mpc8544ds_defconfig | 6 +- .../configs/qemu_ppc_virtex_ml507_defconfig | 34 - buildroot/configs/qemu_riscv32_virt_defconfig | 6 +- buildroot/configs/qemu_riscv64_virt_defconfig | 6 +- buildroot/configs/qemu_s390x_defconfig | 6 +- buildroot/configs/qemu_sh4_r2d_defconfig | 7 +- buildroot/configs/qemu_sh4eb_r2d_defconfig | 7 +- .../configs/qemu_sparc64_sun4u_defconfig | 6 +- buildroot/configs/qemu_sparc_ss10_defconfig | 6 +- buildroot/configs/qemu_x86_64_defconfig | 6 +- buildroot/configs/qemu_x86_defconfig | 6 +- buildroot/configs/qemu_xtensa_lx60_defconfig | 6 +- .../configs/qemu_xtensa_lx60_nommu_defconfig | 6 +- buildroot/configs/raspberrypi0_defconfig | 6 +- buildroot/configs/raspberrypi0w_defconfig | 6 +- buildroot/configs/raspberrypi2_defconfig | 6 +- buildroot/configs/raspberrypi3_64_defconfig | 6 +- buildroot/configs/raspberrypi3_defconfig | 6 +- .../configs/raspberrypi3_qt5we_defconfig | 6 +- buildroot/configs/raspberrypi4_64_defconfig | 6 +- buildroot/configs/raspberrypi4_defconfig | 6 +- buildroot/configs/raspberrypi_defconfig | 6 +- buildroot/configs/rock64_defconfig | 40 + buildroot/configs/roseapplepi_defconfig | 6 +- buildroot/configs/snps_archs38_hsdk_defconfig | 26 +- .../configs/solidrun_clearfog_gt_8k_defconfig | 14 +- .../configs/solidrun_macchiatobin_defconfig | 13 +- buildroot/configs/wandboard_defconfig | 8 +- .../docs/manual/adding-packages-generic.txt | 39 + .../docs/manual/adding-packages-qmake.txt | 4 + buildroot/docs/manual/manual.html | 47 +- buildroot/docs/manual/manual.pdf | Bin 579507 -> 582317 bytes buildroot/docs/manual/manual.text | 43 +- buildroot/docs/website/docs.html | 12 + buildroot/docs/website/download.html | 58 +- buildroot/docs/website/news.html | 202 +- buildroot/fs/common.mk | 5 + buildroot/fs/cpio/Config.in | 5 + buildroot/linux/Config.in | 8 +- buildroot/linux/linux.hash | 13 +- buildroot/linux/linux.mk | 5 + buildroot/package/Config.in | 42 +- buildroot/package/Config.in.host | 3 +- buildroot/package/abootimg/Config.in.host | 8 + buildroot/package/abootimg/abootimg.mk | 10 + buildroot/package/acsccid/Config.in | 7 +- buildroot/package/aer-inject/aer-inject.hash | 2 +- buildroot/package/aircrack-ng/aircrack-ng.mk | 1 + buildroot/package/alsa-lib/alsa-lib.mk | 1 + buildroot/package/am33x-cm3/am33x-cm3.hash | 2 +- buildroot/package/angularjs/angularjs.mk | 2 + buildroot/package/apache/apache.mk | 2 + buildroot/package/apcupsd/Config.in | 12 +- buildroot/package/apparmor/3.0.0 | 1 - buildroot/package/apparmor/apparmor.hash | 2 +- buildroot/package/apparmor/apparmor.mk | 5 +- .../armbian-firmware/armbian-firmware.hash | 2 +- buildroot/package/asn1c/asn1c.mk | 1 + buildroot/package/asterisk/asterisk.mk | 3 + buildroot/package/at-spi2-atk/at-spi2-atk.mk | 1 + buildroot/package/at/at.hash | 6 +- buildroot/package/at/at.mk | 6 +- ...am-link-against-libpthread-for-atftp.patch | 26 - ...fix-musl-compile-add-missing-defines.patch | 42 - ...d.h-fix-musl-compile-missing-include.patch | 40 - buildroot/package/atftp/atftp.hash | 4 +- buildroot/package/atftp/atftp.mk | 5 +- ...1-ifprop.c-fix-build-with-kernel-4.6.patch | 51 + .../0002-photosyst.c-fix-build-on-musl.patch | 38 + buildroot/package/atop/Config.in | 7 +- buildroot/package/atop/atop.hash | 2 +- buildroot/package/atop/atop.mk | 3 +- buildroot/package/attr/attr.mk | 1 + ...01-Fix-pkg-config-for-static-linking.patch | 56 - .../0002-cast-to-unsigned-gcc6.patch | 28 - ...ays-check-the-number-of-coefficients.patch | 36 - ...ues-to-fix-index-overflow-in-IMA.cpp.patch | 39 - ...multiplication-overflow-in-sfconvert.patch | 72 - ...ail-when-error-occurs-in-parseFormat.patch | 42 - ...lication-overflow-in-MSADPCM-decodeS.patch | 122 - .../audiofile/0008-CVE-2015-7747.patch | 161 - ...9-Fix-static-linking-with-libsndfile.patch | 193 - buildroot/package/audiofile/Config.in | 11 - buildroot/package/audiofile/audiofile.hash | 4 - buildroot/package/audiofile/audiofile.mk | 41 - buildroot/package/audit/audit.mk | 2 + buildroot/package/augeas/augeas.mk | 1 + ...lude-linux-nfs.h-directly-in-rpc_sub.patch | 32 - buildroot/package/autofs/autofs.hash | 6 +- buildroot/package/autofs/autofs.mk | 2 +- buildroot/package/avahi/avahi.mk | 1 + buildroot/package/avrdude/Config.in | 6 +- buildroot/package/axel/axel.hash | 2 +- buildroot/package/axel/axel.mk | 3 +- .../azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- .../azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- buildroot/package/babeltrace2/babeltrace2.mk | 4 + buildroot/package/balena-engine/Config.in | 26 + .../package/balena-engine/balena-engine.hash | 3 + .../package/balena-engine/balena-engine.mk | 109 + buildroot/package/bash/bash.mk | 1 + buildroot/package/bats-core/bats-core.hash | 2 +- buildroot/package/bats-core/bats-core.mk | 2 +- .../bayer2rgb-neon/bayer2rgb-neon.hash | 4 +- buildroot/package/bc/bc.mk | 1 + buildroot/package/bcm2835/bcm2835.hash | 2 +- buildroot/package/bcm2835/bcm2835.mk | 2 +- buildroot/package/bctoolbox/bctoolbox.hash | 4 +- buildroot/package/bctoolbox/bctoolbox.mk | 7 +- buildroot/package/bdwgc/bdwgc.mk | 1 + buildroot/package/beecrypt/beecrypt.mk | 1 + buildroot/package/belle-sip/belle-sip.hash | 2 +- buildroot/package/belle-sip/belle-sip.mk | 2 +- buildroot/package/belr/belr.hash | 2 +- buildroot/package/belr/belr.mk | 2 +- buildroot/package/berkeleydb/berkeleydb.mk | 2 + buildroot/package/bind/0001-cross.patch | 25 +- buildroot/package/bind/bind.hash | 8 +- buildroot/package/bind/bind.mk | 8 +- .../0004-bfd-xtensa-fix-PR-ld-25630.patch | 37 - .../2.33.1/0005-xtensa-fix-PR-ld-25861.patch | 432 -- ...TENSA_NDIFF-handling-for-PR-ld-25861.patch | 128 - .../{2.35.1 => 2.35.2}/0001-sh-conf.patch | 0 .../0002-poison-system-directories.patch | 0 .../{2.33.1 => 2.36.1}/0001-sh-conf.patch | 12 +- .../0002-poison-system-directories.patch | 58 +- buildroot/package/binutils/Config.in.host | 22 +- buildroot/package/binutils/binutils.hash | 4 +- buildroot/package/binutils/binutils.mk | 3 +- buildroot/package/bison/bison.mk | 1 + buildroot/package/bitcoin/bitcoin.hash | 4 +- buildroot/package/bitcoin/bitcoin.mk | 4 +- .../0001-fix-build-issue-with-gcc-10.patch | 140 - buildroot/package/bluez-alsa/bluez-alsa.hash | 2 +- buildroot/package/bluez-alsa/bluez-alsa.mk | 3 +- .../bluez5_utils-headers.mk | 2 + buildroot/package/bluez5_utils/S40bluetooth | 61 + .../package/bluez5_utils/bluez5_utils.mk | 7 + buildroot/package/boa/0001-use-name-max.patch | 21 - buildroot/package/boa/Config.in | 8 - buildroot/package/boa/boa.conf | 187 - buildroot/package/boa/boa.hash | 3 - buildroot/package/boa/boa.mk | 19 - buildroot/package/boa/mime.types | 205 - buildroot/package/boinc/boinc.mk | 1 + .../{0002-fenv.patch => 0001-fenv.patch} | 0 .../boost/0001-fix-uclibc-eventfd.patch | 38 - buildroot/package/boost/Config.in | 15 + buildroot/package/boost/boost.hash | 2 +- buildroot/package/boost/boost.mk | 16 +- ...roup-l-flags-from-LDFLAGS-to-the-end.patch | 75 + ...d-data-arch-arm64.txt-add-aarch64_be.patch | 31 - .../package/botan/0002-Avoid-empty-l.patch | 25 + buildroot/package/botan/botan.hash | 2 +- buildroot/package/botan/botan.mk | 8 +- buildroot/package/brickd/brickd.hash | 4 +- .../package/bridge-utils/bridge-utils.mk | 1 + ...gmprivs_linux.c-fix-build-with-gcc-5.patch | 55 + ...nput_event-time-related-compile-fail.patch | 52 - buildroot/package/brltty/brltty.hash | 6 +- buildroot/package/brltty/brltty.mk | 2 +- buildroot/package/brotli/brotli.mk | 1 + buildroot/package/bsdiff/bsdiff.mk | 1 + buildroot/package/bustle/bustle.hash | 4 +- buildroot/package/bustle/bustle.mk | 14 +- ...ock-Fix-settimeofday-for-glibc-v2.31.patch | 58 - ...3-update_passwd-fix-context-variable.patch | 41 + buildroot/package/busybox/busybox.hash | 4 +- buildroot/package/busybox/busybox.mk | 5 +- buildroot/package/busybox/udhcpc.script | 2 +- buildroot/package/bzip2/bzip2.mk | 1 + ...c-lib-Makefile.am-install-ares_dns.h.patch | 37 - buildroot/package/c-ares/c-ares.hash | 2 +- buildroot/package/c-ares/c-ares.mk | 4 +- .../package/c-capnproto/c-capnproto.hash | 2 +- buildroot/package/c-icap/c-icap.hash | 6 +- buildroot/package/c-icap/c-icap.mk | 3 +- .../package/c-periphery/c-periphery.hash | 2 +- buildroot/package/c-periphery/c-periphery.mk | 2 +- buildroot/package/cairo/cairo.mk | 1 + buildroot/package/can-utils/Config.in | 5 - buildroot/package/can-utils/can-utils.hash | 2 +- buildroot/package/can-utils/can-utils.mk | 2 +- buildroot/package/capnproto/capnproto.mk | 1 + ...castore-fix-build-without-lzma-or-xz.patch | 35 + ...tall-udev-rules-without-udev-support.patch | 53 + buildroot/package/casync/Config.in | 13 + buildroot/package/casync/casync.hash | 3 + buildroot/package/casync/casync.mk | 64 + buildroot/package/cc-tool/Config.in | 7 +- buildroot/package/ccid/Config.in | 6 +- buildroot/package/ccid/ccid.hash | 2 +- buildroot/package/ccid/ccid.mk | 2 +- buildroot/package/cegui/cegui.mk | 3 +- ...alized-shared_ptr-within-the-archive.patch | 67 + buildroot/package/cereal/cereal.mk | 4 + buildroot/package/chartjs/chartjs.hash | 2 +- buildroot/package/chartjs/chartjs.mk | 6 +- ...-fix-build-with-older-kernel-headers.patch | 33 + buildroot/package/chrony/chrony.hash | 4 +- buildroot/package/chrony/chrony.mk | 18 +- buildroot/package/cifs-utils/cifs-utils.mk | 1 + buildroot/package/civetweb/civetweb.mk | 1 + buildroot/package/cjson/cjson.mk | 1 + buildroot/package/clamav/clamav.hash | 2 +- buildroot/package/clamav/clamav.mk | 3 +- buildroot/package/clang/clang.mk | 1 + buildroot/package/clinfo/clinfo.hash | 6 +- buildroot/package/clinfo/clinfo.mk | 2 +- buildroot/package/collectd/Config.in | 30 + buildroot/package/collectd/collectd.mk | 9 +- buildroot/package/connman/S45connman | 64 +- buildroot/package/connman/connman.hash | 4 +- buildroot/package/connman/connman.mk | 3 +- .../conntrack-tools/conntrack-tools.mk | 1 + buildroot/package/coremark-pro/Config.in | 8 + .../package/coremark-pro/coremark-pro.hash | 3 + .../package/coremark-pro/coremark-pro.mk | 62 + .../package/coremark-pro/coremark-pro.sh.in | 35 + buildroot/package/coremark/Config.in | 8 + buildroot/package/coremark/coremark.hash | 3 + buildroot/package/coremark/coremark.mk | 21 + buildroot/package/coreutils/coreutils.mk | 1 + buildroot/package/cpio/cpio.mk | 1 + buildroot/package/crda/crda.mk | 1 + .../cryptodev-linux/cryptodev-linux.mk | 1 + buildroot/package/cryptopp/cryptopp.mk | 2 + buildroot/package/cryptsetup/cryptsetup.mk | 1 + ...fix-cross-compilation-without-dejavu.patch | 41 - .../package/cups-filters/cups-filters.hash | 4 +- .../package/cups-filters/cups-filters.mk | 4 +- buildroot/package/cups/cups.mk | 1 + buildroot/package/cvs/cvs.mk | 1 + buildroot/package/czmq/czmq.hash | 6 +- buildroot/package/czmq/czmq.mk | 2 +- buildroot/package/daemon/0001-fix-musl.patch | 4 +- buildroot/package/daemon/daemon.hash | 7 +- buildroot/package/daemon/daemon.mk | 5 +- buildroot/package/dash/dash.hash | 2 +- buildroot/package/dash/dash.mk | 2 +- .../package/datatables-buttons/Config.in | 12 + .../datatables-buttons.hash | 3 + .../datatables-buttons/datatables-buttons.mk | 25 + .../package/datatables-fixedcolumns/Config.in | 10 + .../datatables-fixedcolumns.hash | 3 + .../datatables-fixedcolumns.mk | 25 + .../package/datatables-responsive/Config.in | 12 + .../datatables-responsive.hash | 3 + .../datatables-responsive.mk | 25 + buildroot/package/datatables/Config.in | 7 + buildroot/package/datatables/datatables.hash | 3 + buildroot/package/datatables/datatables.mk | 25 + buildroot/package/dav1d/dav1d.hash | 2 +- buildroot/package/dav1d/dav1d.mk | 2 +- buildroot/package/davici/davici.mk | 1 + buildroot/package/dbus-glib/dbus-glib.mk | 1 + .../package/dbus-triggerd/dbus-triggerd.hash | 2 +- buildroot/package/dbus/dbus.mk | 2 + ...ne-to-logfile-openning-error-message.patch | 1 + buildroot/package/dcron/dcron.hash | 3 +- buildroot/package/dcron/dcron.mk | 8 +- buildroot/package/delve/Config.in | 22 + buildroot/package/delve/delve.hash | 3 + buildroot/package/delve/delve.mk | 17 + buildroot/package/dfu-util/Config.in | 6 +- buildroot/package/dfu-util/Config.in.host | 4 + buildroot/package/dhcp/dhcp.mk | 1 + ...-src-dhcpcd.c-fix-build-without-fork.patch | 36 - ...rivsep-linux.c-add-support-for-nds32.patch | 40 + buildroot/package/dhcpcd/dhcpcd.hash | 4 +- buildroot/package/dhcpcd/dhcpcd.mk | 7 +- buildroot/package/dnsmasq/dnsmasq.hash | 4 +- buildroot/package/dnsmasq/dnsmasq.mk | 9 +- buildroot/package/docker-cli/docker-cli.hash | 4 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../docker-containerd/docker-containerd.mk | 24 +- .../package/docker-engine/docker-engine.hash | 4 +- .../package/docker-engine/docker-engine.mk | 21 +- buildroot/package/domoticz/domoticz.mk | 1 + buildroot/package/dovecot/dovecot.mk | 1 + buildroot/package/dropbear/dropbear.mk | 2 + buildroot/package/dt-utils/dt-utils.hash | 4 +- .../dtv-scan-tables/dtv-scan-tables.hash | 6 +- buildroot/package/dump1090/Config.in | 6 +- buildroot/package/ebtables/ebtables.mk | 9 + .../package/ecryptfs-utils/ecryptfs-utils.mk | 1 + buildroot/package/ed/ed.mk | 1 + .../package/edid-decode/edid-decode.hash | 2 +- buildroot/package/efl/Config.in | 10 - ...not-download-or-compile-dependencies.patch | 12 +- buildroot/package/ejabberd/ejabberd.hash | 4 +- buildroot/package/ejabberd/ejabberd.mk | 4 +- buildroot/package/elfutils/elfutils.mk | 4 + ...001-build-Add-rawmemchr-to-missing.h.patch | 47 + ...l-add-missing-include-in-dhcp-server.patch | 26 + ...nl-fix-compile-with-older-toolchains.patch | 68 - buildroot/package/ell/Config.in | 6 +- buildroot/package/ell/ell.hash | 2 +- buildroot/package/ell/ell.mk | 2 +- .../environment-setup/environment-setup | 1 + .../environment-setup/environment-setup.mk | 5 + .../package/erlang-eimp/erlang-eimp.hash | 4 +- buildroot/package/erlang-eimp/erlang-eimp.mk | 2 +- .../package/erlang-jiffy/erlang-jiffy.hash | 4 +- .../package/erlang-jiffy/erlang-jiffy.mk | 2 +- ...ipt-remove-extra-dependency-to-base6.patch | 26 + .../erlang-p1-acme/erlang-p1-acme.hash | 4 +- .../package/erlang-p1-acme/erlang-p1-acme.mk | 2 +- .../erlang-p1-cache-tab.hash | 4 +- .../erlang-p1-cache-tab.mk | 2 +- .../erlang-p1-mqtree/erlang-p1-mqtree.hash | 4 +- .../erlang-p1-mqtree/erlang-p1-mqtree.mk | 2 +- .../erlang-p1-oauth2/erlang-p1-oauth2.hash | 4 +- .../erlang-p1-oauth2/erlang-p1-oauth2.mk | 2 +- .../erlang-p1-pkix/erlang-p1-pkix.hash | 4 +- .../package/erlang-p1-pkix/erlang-p1-pkix.mk | 2 +- .../erlang-p1-sip/0001-correct-include.patch | 31 + .../erlang-p1-sip/0001-fix-includes.patch | 19 - .../package/erlang-p1-sip/erlang-p1-sip.hash | 4 +- .../package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- .../erlang-p1-stringprep.hash | 8 +- .../erlang-p1-stringprep.mk | 2 +- .../erlang-p1-stun/erlang-p1-stun.hash | 4 +- .../package/erlang-p1-stun/erlang-p1-stun.mk | 2 +- .../package/erlang-p1-tls/erlang-p1-tls.hash | 4 +- .../package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- .../erlang-p1-utils/erlang-p1-utils.hash | 4 +- .../erlang-p1-utils/erlang-p1-utils.mk | 2 +- .../package/erlang-p1-xml/erlang-p1-xml.hash | 4 +- .../package/erlang-p1-xml/erlang-p1-xml.mk | 2 +- .../erlang-p1-xmpp/0001-fix-includes.patch | 4 +- .../erlang-p1-xmpp/erlang-p1-xmpp.hash | 4 +- .../package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 2 +- .../erlang-p1-yaml/erlang-p1-yaml.hash | 4 +- .../package/erlang-p1-yaml/erlang-p1-yaml.mk | 2 +- .../erlang-p1-yconf/erlang-p1-yconf.hash | 4 +- .../erlang-p1-yconf/erlang-p1-yconf.mk | 2 +- .../erlang-p1-zlib/erlang-p1-zlib.hash | 4 +- .../package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- buildroot/package/erofs-utils/Config.in | 13 + .../package/erofs-utils/erofs-utils.hash | 4 +- buildroot/package/erofs-utils/erofs-utils.mk | 18 +- buildroot/package/ethtool/ethtool.hash | 6 +- buildroot/package/ethtool/ethtool.mk | 3 +- buildroot/package/exfat-utils/exfat-utils.mk | 2 +- buildroot/package/exfat/exfat.mk | 2 +- buildroot/package/exim/exim.mk | 1 + buildroot/package/exiv2/exiv2.mk | 5 +- buildroot/package/expat/expat.mk | 1 + buildroot/package/faad2/faad2.hash | 2 +- buildroot/package/faad2/faad2.mk | 4 +- buildroot/package/fail2ban/fail2ban.mk | 1 + ...fine-_STAT_VER-if-not-already-define.patch | 45 + ...d-wrappers-for-new-glibc-2.33-symbol.patch | 80 + ....ac-fix-__xmknod-at-pointer-argument.patch | 66 + .../0005-fix-build-regression-on-macOS.patch | 63 + buildroot/package/fakeroot/fakeroot.mk | 2 +- buildroot/package/fbgrab/fbgrab.hash | 2 +- buildroot/package/fbgrab/fbgrab.mk | 2 +- buildroot/package/fetchmail/fetchmail.hash | 9 +- buildroot/package/fetchmail/fetchmail.mk | 3 +- ...264-skip-decode-if-pic-has-no-slices.patch | 36 + ...-make-sure-mpegts-read-header-always.patch | 38 + buildroot/package/ffmpeg/ffmpeg.mk | 9 + buildroot/package/file/file.mk | 1 + .../package/flare-engine/flare-engine.hash | 2 +- .../package/flare-engine/flare-engine.mk | 4 +- buildroot/package/flare-game/flare-game.hash | 4 +- buildroot/package/flare-game/flare-game.mk | 4 +- buildroot/package/flashbench/flashbench.hash | 2 +- ...kefile-Fix-building-on-AArch64-NixOS.patch | 95 + buildroot/package/flatbuffers/flatbuffers.mk | 1 + buildroot/package/flex/flex.mk | 1 + buildroot/package/fluidsynth/Config.in | 10 + buildroot/package/fluidsynth/fluidsynth.mk | 14 + buildroot/package/fmc/fmc.hash | 2 +- buildroot/package/fmlib/fmlib.hash | 2 +- buildroot/package/fmt/fmt.hash | 2 +- buildroot/package/fmt/fmt.mk | 2 +- buildroot/package/fping/fping.mk | 1 + buildroot/package/freerdp/freerdp.mk | 1 + .../firmware-imx/firmware-imx.hash | 6 +- .../firmware-imx/firmware-imx.mk | 2 +- .../imx-alsa-plugins/imx-alsa-plugins.hash | 2 +- .../imx-gpu-g2d/imx-gpu-g2d.hash | 8 +- .../freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 4 +- .../freescale-imx/imx-gpu-viv/Config.in | 6 +- .../imx-gpu-viv/imx-gpu-viv.hash | 8 +- .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 42 +- .../freescale-imx/imx-lib/imx-lib.hash | 2 +- .../imx-sc-firmware/imx-sc-firmware.hash | 6 +- .../imx-sc-firmware/imx-sc-firmware.mk | 2 +- .../freescale-imx/imx-seco/imx-seco.hash | 6 +- .../freescale-imx/imx-seco/imx-seco.mk | 2 +- .../imx-vpu-hantro/imx-vpu-hantro.hash | 6 +- .../imx-vpu-hantro/imx-vpu-hantro.mk | 2 +- .../freescale-imx/imx-vpu/imx-vpu.hash | 6 +- .../package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +- .../kernel-module-imx-gpu-viv.hash | 2 +- .../kernel-module-imx-gpu-viv.mk | 2 +- buildroot/package/freetype/freetype.mk | 1 + buildroot/package/frotz/Config.in | 14 + buildroot/package/frotz/frotz.hash | 3 + buildroot/package/frotz/frotz.mk | 31 + ...all-future-minor-versions-of-python3.patch | 30 - buildroot/package/frr/frr.hash | 2 +- buildroot/package/frr/frr.mk | 2 +- .../fuse-overlayfs/fuse-overlayfs.hash | 2 +- .../package/fuse-overlayfs/fuse-overlayfs.mk | 2 +- buildroot/package/fwts/Config.in | 5 +- ...-check-return-value-in-gdImageBmpPtr.patch | 80 - ...l-infinite-loop-in-gdImageCreateFrom.patch | 61 - ...lized-read-in-gdImageCreateFromXbm-C.patch | 41 - ...Potential-double-free-in-gdImage-Ptr.patch | 219 - ...-pointer-dereference-in-gdImageClone.patch | 44 - ...f-Bounds-Write-on-Heap-CVE-2019-6977.patch | 39 - buildroot/package/gd/gd.hash | 4 +- buildroot/package/gd/gd.mk | 19 +- ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 52 +- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 16 +- .../0003-use-asm-sgidefs.h.patch | 6 +- .../0004-gdbserver-fix-build-for-m68k.patch | 19 +- ...fork-inferior-include-linux-ptrace.h.patch | 16 +- ...e-of-is-operator-for-comparison-in-p.patch | 42 - buildroot/package/gdb/Config.in | 3 +- buildroot/package/gdb/Config.in.host | 12 +- buildroot/package/gdb/gdb-python-config | 23 +- buildroot/package/gdb/gdb.hash | 2 +- buildroot/package/gdb/gdb.mk | 19 +- ...eson.build-link-with-lintl-if-needed.patch | 45 + ...ixbuf-io.c-fix-build-without-gmodule.patch | 41 + buildroot/package/gdk-pixbuf/gdk-pixbuf.hash | 6 +- buildroot/package/gdk-pixbuf/gdk-pixbuf.mk | 76 +- buildroot/package/gensio/gensio.hash | 6 +- buildroot/package/gensio/gensio.mk | 2 +- .../package/gesftpserver/gesftpserver.mk | 2 + buildroot/package/ghostscript/ghostscript.mk | 1 + .../git/0001-Fix-build-without-threads.patch | 100 + buildroot/package/git/git.hash | 2 +- buildroot/package/git/git.mk | 5 +- buildroot/package/gkrellm/Config.in | 43 + buildroot/package/gkrellm/gkrellm.hash | 4 + buildroot/package/gkrellm/gkrellm.mk | 54 + .../glib-networking/glib-networking.hash | 4 +- .../glib-networking/glib-networking.mk | 5 +- .../glibc.hash | 7 - .../glibc.hash | 2 +- buildroot/package/glibc/glibc.mk | 10 +- buildroot/package/gmp/gmp.hash | 6 +- buildroot/package/gmp/gmp.mk | 3 +- buildroot/package/gnupg/gnupg.mk | 1 + buildroot/package/gnupg2/gnupg2.hash | 8 +- buildroot/package/gnupg2/gnupg2.mk | 4 +- buildroot/package/gnuplot/gnuplot.mk | 5 +- buildroot/package/gnuradio/Config.in | 9 + buildroot/package/gnuradio/gnuradio.mk | 7 + buildroot/package/gnutls/gnutls.mk | 1 + buildroot/package/go/go.hash | 2 +- buildroot/package/go/go.mk | 3 +- .../google-breakpad/google-breakpad.hash | 2 +- buildroot/package/gr-osmosdr/Config.in | 4 + buildroot/package/gr-osmosdr/gr-osmosdr.hash | 4 +- buildroot/package/gr-osmosdr/gr-osmosdr.mk | 2 +- ...ix-small-heap-overwrite-or-assertion.patch | 78 - .../graphicsmagick/graphicsmagick.hash | 4 +- .../package/graphicsmagick/graphicsmagick.mk | 6 +- buildroot/package/graphite2/graphite2.mk | 1 + buildroot/package/grep/grep.hash | 4 +- buildroot/package/grep/grep.mk | 3 +- ...ix-cross-compilation-with-gRPC_BUILD.patch | 43 + .../0001-target-build-using-host-plugin.patch | 52 - buildroot/package/grpc/grpc.hash | 2 +- buildroot/package/grpc/grpc.mk | 18 +- .../package/gstreamer1/gst-omx/gst-omx.hash | 4 +- .../package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- .../gst1-interpipe/gst1-interpipe.hash | 2 +- .../gst1-interpipe/gst1-interpipe.mk | 2 +- .../gstreamer1/gst1-libav/gst1-libav.hash | 4 +- .../gstreamer1/gst1-libav/gst1-libav.mk | 2 +- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- ...eo-gstvideoaggregator.c-fix-build-wi.patch | 45 + .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- .../0001-fix-builds-with-python-3.8.patch | 43 - .../package/gstreamer1/gst1-python/Config.in | 1 + .../gstreamer1/gst1-python/gst1-python.hash | 4 +- .../gstreamer1/gst1-python/gst1-python.mk | 3 +- .../gst1-rtsp-server/gst1-rtsp-server.hash | 4 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- .../gstreamer1/gst1-shark/gst1-shark.hash | 4 +- .../gstreamer1/gst1-shark/gst1-shark.mk | 2 +- .../gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- .../gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../0001-utils.c-fix-static-build.patch | 74 - .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- .../gstreamer1/gstreamer1/gstreamer1.hash | 4 +- .../gstreamer1/gstreamer1/gstreamer1.mk | 2 +- buildroot/package/gtest/gtest.mk | 2 + buildroot/package/guile/guile.mk | 4 + buildroot/package/gzip/gzip.mk | 1 + buildroot/package/hackrf/Config.in | 6 +- buildroot/package/haproxy/haproxy.hash | 4 +- buildroot/package/haproxy/haproxy.mk | 3 +- ...001-meson.build-check-for-pthread.h.patch} | 2 +- ...allow-introspection-when-cross-compi.patch | 33 - buildroot/package/harfbuzz/harfbuzz.hash | 2 +- buildroot/package/harfbuzz/harfbuzz.mk | 2 +- buildroot/package/haveged/haveged.mk | 1 + buildroot/package/hdparm/hdparm.hash | 8 +- buildroot/package/hdparm/hdparm.mk | 2 +- buildroot/package/hidapi/Config.in | 7 +- buildroot/package/hiredis/hiredis.mk | 1 + buildroot/package/hostapd/hostapd.mk | 1 + buildroot/package/hplip/Config.in | 5 +- buildroot/package/htop/Config.in | 5 + buildroot/package/htop/htop.hash | 2 +- buildroot/package/htop/htop.mk | 16 +- buildroot/package/htpdate/htpdate.hash | 2 +- buildroot/package/htpdate/htpdate.mk | 2 +- buildroot/package/hwdata/hwdata.hash | 2 +- buildroot/package/hwdata/hwdata.mk | 2 +- buildroot/package/i2pd/i2pd.hash | 6 +- buildroot/package/i2pd/i2pd.mk | 7 +- .../i7z/0001-fix-build-with-gcc-10.patch | 63 + buildroot/package/icu/icu.hash | 4 +- buildroot/package/icu/icu.mk | 2 +- buildroot/package/ifupdown/ifupdown.mk | 1 + .../igd2-for-linux/igd2-for-linux.hash | 2 +- .../package/igd2-for-linux/igd2-for-linux.mk | 27 +- .../package/imagemagick/imagemagick.hash | 4 +- buildroot/package/imagemagick/imagemagick.mk | 33 +- .../package/imx-mkimage/imx-mkimage.hash | 4 +- buildroot/package/imx-mkimage/imx-mkimage.mk | 2 +- buildroot/package/imx-usb-loader/Config.in | 6 +- .../package/imx-usb-loader/Config.in.host | 5 + buildroot/package/inadyn/inadyn.hash | 5 +- buildroot/package/inadyn/inadyn.mk | 2 +- .../0001-meson-optionally-depend-on-c.patch | 34 + buildroot/package/inih/Config.in | 7 + buildroot/package/inih/inih.hash | 3 + buildroot/package/inih/inih.mk | 20 + ...-Werror=format-overflow-under-gcc-10.patch | 162 + .../intel-mediadriver/intel-mediadriver.mk | 6 +- .../package/intel-mediasdk/intel-mediasdk.mk | 5 +- .../intel-microcode/intel-microcode.hash | 2 +- .../intel-microcode/intel-microcode.mk | 2 +- buildroot/package/iozone/iozone.hash | 2 +- buildroot/package/iozone/iozone.mk | 2 +- buildroot/package/iperf/iperf.mk | 2 + buildroot/package/iperf3/iperf3.mk | 1 + buildroot/package/ipmitool/ipmitool.mk | 1 + .../ipsec-tools/0001-susv3-legacy.patch | 35 - .../ipsec-tools/0002-configure-automake.patch | 21 - .../0003-Don-t-link-against-libfl.patch | 92 - .../ipsec-tools/0004-CVE-2015-4047.patch | 26 - .../ipsec-tools/0005-CVE-2016-10396.patch | 208 - .../ipsec-tools/0006-openssl-1.1.patch | 1104 ----- buildroot/package/ipsec-tools/Config.in | 75 - .../package/ipsec-tools/ipsec-tools.hash | 6 - buildroot/package/ipsec-tools/ipsec-tools.mk | 85 - buildroot/package/ipset/ipset.mk | 2 + ...ler-warning-fixes-for-NO_SHARED_LIBS.patch | 58 - buildroot/package/iptables/iptables.hash | 2 +- buildroot/package/iptables/iptables.mk | 5 +- buildroot/package/iputils/iputils.hash | 4 +- buildroot/package/iputils/iputils.mk | 18 +- ...ix-uint64_t-printf-format-use-PRIu64.patch | 105 + buildroot/package/irqbalance/S13irqbalance | 2 + .../package/irqbalance/irqbalance.service | 1 + buildroot/package/iw/iw.hash | 2 +- buildroot/package/iw/iw.mk | 3 +- ...re.ac-fix-static-build-with-readline.patch | 61 + .../0001-src-ap.c-fix-build-with-uclibc.patch | 36 - buildroot/package/iwd/Config.in | 7 +- buildroot/package/iwd/iwd.hash | 2 +- buildroot/package/iwd/iwd.mk | 5 +- buildroot/package/jack2/jack2.hash | 3 +- buildroot/package/jack2/jack2.mk | 4 +- buildroot/package/jansson/jansson.mk | 1 + buildroot/package/jasper/jasper.hash | 2 +- buildroot/package/jasper/jasper.mk | 3 +- buildroot/package/jhead/jhead.mk | 1 + .../jitterentropy-library.mk | 1 + buildroot/package/jquery/jquery.mk | 1 + buildroot/package/json-c/json-c.mk | 1 + .../json-for-modern-cpp.hash | 2 +- .../json-for-modern-cpp.mk | 2 +- buildroot/package/jsoncpp/jsoncpp.mk | 1 + buildroot/package/jszip/Config.in | 7 + buildroot/package/jszip/jszip.hash | 3 + buildroot/package/jszip/jszip.mk | 17 + ...don-t-override-LDFLAGS-with-CPPFLAGS.patch | 44 - buildroot/package/kismet/Config.in | 1 - buildroot/package/kismet/kismet.hash | 2 +- buildroot/package/kismet/kismet.mk | 12 +- buildroot/package/kmod/kmod.hash | 2 +- buildroot/package/kmod/kmod.mk | 4 +- ...0001-fix-compiler-errors-with-gcc-10.patch | 35 - ...0001-meson-add-use-system-fmt-option.patch | 46 + ...ring-to-card.h-to-follow-gcc10-porti.patch | 27 - ...meson-add-use-system-pybind11-option.patch | 43 + ...ly-build-py-in-case-pykms-is-enabled.patch | 48 + buildroot/package/kmsxx/Config.in | 9 +- buildroot/package/kmsxx/kmsxx.hash | 4 +- buildroot/package/kmsxx/kmsxx.mk | 74 +- .../kodi-inputstream-adaptive/Config.in | 2 +- .../kodi-inputstream-adaptive.mk | 2 +- buildroot/package/kodi/Config.in | 5 +- buildroot/package/kodi/kodi.mk | 1 - .../kvm-unit-tests/kvm-unit-tests.hash | 2 +- buildroot/package/kvmtool/kvmtool.hash | 2 +- buildroot/package/lcms2/lcms2.mk | 11 +- buildroot/package/leptonica/leptonica.hash | 4 +- buildroot/package/leptonica/leptonica.mk | 12 +- buildroot/package/less/less.hash | 6 +- buildroot/package/less/less.mk | 2 +- buildroot/package/lftp/lftp.mk | 1 + .../package/libabseil-cpp/libabseil-cpp.hash | 2 +- .../package/libabseil-cpp/libabseil-cpp.mk | 2 +- ...-ENABLE_SHARED-boolean-to-allow-stat.patch | 56 - ...ile-add-missing-DESTDIR-variable-use.patch | 32 - ...t-libgcc-to-avoid-unresolved-symbols.patch | 57 - buildroot/package/libaio/libaio.hash | 4 +- buildroot/package/libaio/libaio.mk | 2 +- buildroot/package/libao/libao.mk | 1 + ...or-add-missing-include-for-socklen_t.patch | 35 - ...orce-host-cpp-to-detect-reallocarray.patch | 37 - ...-aa_status-Fix-build-issue-with-musl.patch | 33 - .../package/libapparmor/libapparmor.hash | 2 +- buildroot/package/libapparmor/libapparmor.mk | 4 +- buildroot/package/libarchive/libarchive.hash | 4 +- buildroot/package/libarchive/libarchive.mk | 3 +- buildroot/package/libass/libass.mk | 1 + buildroot/package/libassuan/libassuan.hash | 10 +- buildroot/package/libassuan/libassuan.mk | 2 +- .../package/libblockdev/libblockdev.hash | 2 +- buildroot/package/libblockdev/libblockdev.mk | 2 +- buildroot/package/libbluray/libbluray.hash | 6 +- buildroot/package/libbluray/libbluray.mk | 3 +- .../package/libbroadvoice/libbroadvoice.hash | 4 +- buildroot/package/libbsd/Config.in | 6 +- .../0001-remove-msgcat-dependency.patch | 36 - .../package/libbytesize/libbytesize.hash | 2 +- buildroot/package/libbytesize/libbytesize.mk | 5 +- buildroot/package/libcamera/libcamera.hash | 2 +- buildroot/package/libcamera/libcamera.mk | 15 +- buildroot/package/libcap-ng/libcap-ng.hash | 2 +- buildroot/package/libcap-ng/libcap-ng.mk | 3 +- ...ding-progs-tcapsh-static-to-sudotest.patch | 79 - buildroot/package/libcap/Config.in | 2 +- buildroot/package/libcap/libcap.hash | 2 +- buildroot/package/libcap/libcap.mk | 2 +- buildroot/package/libcdio/libcdio.mk | 1 + buildroot/package/libclc/libclc.hash | 4 +- buildroot/package/libcli/Config.in | 4 +- buildroot/package/libcli/libcli.hash | 4 +- buildroot/package/libcli/libcli.mk | 2 +- buildroot/package/libcoap/libcoap.hash | 6 +- buildroot/package/libcoap/libcoap.mk | 2 +- .../package/libcpprestsdk/libcpprestsdk.hash | 2 +- .../package/libcpprestsdk/libcpprestsdk.mk | 4 +- buildroot/package/libcurl/libcurl.hash | 6 +- buildroot/package/libcurl/libcurl.mk | 4 +- .../0003-xf86drm.c-fix-build-failure.patch | 84 - buildroot/package/libdrm/libdrm.hash | 9 +- buildroot/package/libdrm/libdrm.mk | 3 +- buildroot/package/libdvbsi/libdvbsi.hash | 9 +- buildroot/package/libdvbsi/libdvbsi.mk | 4 +- ...pilation-error-introduced-with-epoll.patch | 44 - buildroot/package/libeXosip2/libeXosip2.hash | 4 +- buildroot/package/libeXosip2/libeXosip2.mk | 2 +- buildroot/package/libebml/libebml.mk | 1 + buildroot/package/libedit/libedit.hash | 4 +- buildroot/package/libedit/libedit.mk | 2 +- buildroot/package/libepoxy/libepoxy.hash | 4 +- buildroot/package/libepoxy/libepoxy.mk | 2 +- buildroot/package/liberation/liberation.hash | 2 +- buildroot/package/liberation/liberation.mk | 4 +- buildroot/package/libesmtp/libesmtp.mk | 1 + buildroot/package/libestr/libestr.mk | 1 + buildroot/package/libevdev/libevdev.hash | 10 +- buildroot/package/libevdev/libevdev.mk | 4 +- buildroot/package/libexif/libexif.mk | 1 + .../package/libfastjson/libfastjson.hash | 2 +- buildroot/package/libfastjson/libfastjson.mk | 3 +- buildroot/package/libfcgi/libfcgi.mk | 2 + buildroot/package/libffi/libffi.mk | 2 + buildroot/package/libftdi/Config.in | 6 +- buildroot/package/libftdi1/Config.in | 6 +- .../0001-remove-old-uclibc-hack.patch | 34 - buildroot/package/libfuse3/libfuse3.hash | 2 +- buildroot/package/libfuse3/libfuse3.mk | 2 +- buildroot/package/libg7221/libg7221.hash | 4 +- ...ult-to-underscore-yes-for-cross-buil.patch | 48 - ...e.ac-add-an-option-to-disable-tests.patch} | 0 buildroot/package/libgcrypt/libgcrypt.hash | 8 +- buildroot/package/libgcrypt/libgcrypt.mk | 13 +- ...-CMakeLists.txt-add-BUILD_BENCHMARKS.patch | 37 + buildroot/package/libgeos/Config.in | 15 + buildroot/package/libgeos/libgeos.hash | 3 + buildroot/package/libgeos/libgeos.mk | 28 + buildroot/package/libgit2/libgit2.mk | 1 + buildroot/package/libglew/Config.in | 2 +- buildroot/package/libglew/libglew.hash | 7 +- buildroot/package/libglew/libglew.mk | 4 +- .../0003-remove-cpp-requirement.patch | 2 +- buildroot/package/libglib2/libglib2.hash | 4 +- buildroot/package/libglib2/libglib2.mk | 6 +- ...nfigure.ac-fix-build-without-threads.patch | 54 + buildroot/package/libgpg-error/Config.in | 8 +- .../package/libgpg-error/libgpg-error.hash | 7 +- .../package/libgpg-error/libgpg-error.mk | 11 +- buildroot/package/libgpgme/libgpgme.hash | 6 +- buildroot/package/libgpgme/libgpgme.mk | 4 +- buildroot/package/libgphoto2/Config.in | 6 +- buildroot/package/libgphoto2/libgphoto2.hash | 9 +- buildroot/package/libgphoto2/libgphoto2.mk | 9 +- ...nfigure-switch-for-building-examples.patch | 91 + buildroot/package/libgpiod/libgpiod.hash | 2 +- buildroot/package/libgpiod/libgpiod.mk | 12 +- buildroot/package/libgsasl/libgsasl.hash | 8 +- buildroot/package/libgsasl/libgsasl.mk | 2 +- buildroot/package/libgsm/libgsm.hash | 2 +- buildroot/package/libgsm/libgsm.mk | 2 +- buildroot/package/libgtk2/libgtk2.hash | 6 +- buildroot/package/libgtk2/libgtk2.mk | 2 +- .../package/libgtk3/0001-no-gtk-doc.patch | 2 +- .../0002-fix-introspection-check.patch | 2 +- .../libgtk3/0003-disable-atk-bridge.patch | 6 +- buildroot/package/libgtk3/Config.in | 2 +- buildroot/package/libgtk3/libgtk3.hash | 6 +- buildroot/package/libgtk3/libgtk3.mk | 2 +- .../package/libhdhomerun/libhdhomerun.hash | 2 +- .../package/libhdhomerun/libhdhomerun.mk | 2 +- buildroot/package/libhid/Config.in | 6 +- ...001-use-poll.h-instead-of-sys-poll.h.patch | 33 + ...linux-Add-missing-include-sys-time.h.patch | 32 + ...uffer-overflow-when-handling-message.patch | 27 + buildroot/package/libiec61850/Config.in | 21 + .../package/libiec61850/libiec61850.hash | 3 + buildroot/package/libiec61850/libiec61850.mk | 18 + buildroot/package/libiio/Config.in | 6 +- buildroot/package/libilbc/libilbc.hash | 4 +- buildroot/package/libinput/libinput.hash | 8 +- buildroot/package/libinput/libinput.mk | 2 +- buildroot/package/libiqrf/Config.in | 6 +- buildroot/package/libjpeg/libjpeg.mk | 1 + buildroot/package/libkrb5/libkrb5.mk | 2 + buildroot/package/libksba/libksba.hash | 12 +- buildroot/package/libksba/libksba.mk | 3 +- buildroot/package/liblogging/liblogging.mk | 1 + buildroot/package/libmatroska/libmatroska.mk | 1 + .../package/libmaxminddb/libmaxminddb.mk | 1 + buildroot/package/libmbim/libmbim.mk | 1 + buildroot/package/libmdbx/Config.in | 45 + buildroot/package/libmdbx/libmdbx.hash | 5 + buildroot/package/libmdbx/libmdbx.mk | 42 + .../package/libmicrohttpd/libmicrohttpd.hash | 2 +- .../package/libmicrohttpd/libmicrohttpd.mk | 2 +- buildroot/package/libmnl/libmnl.mk | 1 + buildroot/package/libndp/libndp.mk | 1 + .../package/libnetconf2/libnetconf2.hash | 2 +- buildroot/package/libnetconf2/libnetconf2.mk | 2 +- .../libnetfilter_conntrack.mk | 1 + .../libnetfilter_cthelper.mk | 1 + .../libnetfilter_cttimeout.mk | 1 + .../libnetfilter_queue/libnetfilter_queue.mk | 1 + buildroot/package/libnfc/Config.in | 12 +- .../package/libnfnetlink/libnfnetlink.mk | 1 + buildroot/package/libnpupnp/libnpupnp.hash | 4 +- buildroot/package/libnpupnp/libnpupnp.mk | 2 +- .../package/libnss/0001-fix-old-abi-ppc.patch | 40 - buildroot/package/libnss/libnss.hash | 4 +- buildroot/package/libnss/libnss.mk | 2 +- buildroot/package/libolm/libolm.hash | 2 +- buildroot/package/libolm/libolm.mk | 2 +- buildroot/package/libopenssl/libopenssl.hash | 4 +- buildroot/package/libopenssl/libopenssl.mk | 8 +- buildroot/package/libosip2/libosip2.hash | 4 +- buildroot/package/libosip2/libosip2.mk | 2 +- buildroot/package/libostree/Config.in | 4 +- buildroot/package/libostree/libostree.hash | 2 +- buildroot/package/libostree/libostree.mk | 11 +- buildroot/package/libpcap/libpcap.hash | 5 +- buildroot/package/libpcap/libpcap.mk | 16 +- buildroot/package/libphidget/Config.in | 7 +- buildroot/package/libplist/libplist.mk | 1 + .../package/libpwquality/libpwquality.hash | 2 +- .../package/libpwquality/libpwquality.mk | 2 +- buildroot/package/libraw/libraw.mk | 1 + buildroot/package/librelp/librelp.hash | 2 +- buildroot/package/librelp/librelp.mk | 2 +- buildroot/package/libressl/libressl.mk | 1 + buildroot/package/librsvg/librsvg.hash | 4 +- buildroot/package/librsvg/librsvg.mk | 2 +- buildroot/package/librtlsdr/Config.in | 6 +- buildroot/package/librtlsdr/librtlsdr.mk | 11 - buildroot/package/libsecret/libsecret.hash | 4 +- buildroot/package/libsecret/libsecret.mk | 2 +- ...d-to-something-which-never-conflicts.patch | 71 + buildroot/package/libselinux/libselinux.mk | 1 + buildroot/package/libsemanage/libsemanage.mk | 1 + buildroot/package/libsepol/libsepol.mk | 1 + buildroot/package/libshout/libshout.hash | 9 +- buildroot/package/libshout/libshout.mk | 2 +- ...001-Improve-support-for-Linux-RISC-V.patch | 79 - ...irection-RISC-V-stack-grows-downward.patch | 35 - ...0003-Improve-support-for-Linux-nds32.patch | 76 - ...direction-NDS32-stack-grows-downward.patch | 25 - buildroot/package/libsigsegv/libsigsegv.hash | 6 +- buildroot/package/libsigsegv/libsigsegv.mk | 7 +- buildroot/package/libsilk/libsilk.hash | 4 +- .../package/libsocketcan/libsocketcan.hash | 4 +- .../package/libsocketcan/libsocketcan.mk | 2 +- .../package/libsoundtouch/libsoundtouch.hash | 2 +- .../package/libsoundtouch/libsoundtouch.mk | 2 +- buildroot/package/libssh/libssh.mk | 4 +- buildroot/package/libssh2/libssh2.mk | 1 + buildroot/package/libsvgtiny/libsvgtiny.hash | 4 +- buildroot/package/libsysfs/libsysfs.mk | 2 + buildroot/package/libtasn1/libtasn1.mk | 1 + ...parts-of-TIRPC-requiring-NIS-support.patch | 50 - buildroot/package/libtirpc/libtirpc.hash | 6 +- buildroot/package/libtirpc/libtirpc.mk | 3 +- buildroot/package/libtomcrypt/libtomcrypt.mk | 1 + .../libtorrent-rasterbar.hash | 2 +- .../libtorrent-rasterbar.mk | 7 +- buildroot/package/libuci/libuci.hash | 2 +- buildroot/package/libudfread/libudfread.hash | 2 +- buildroot/package/libudfread/libudfread.mk | 2 +- ...xt-fix-static-build-with-a-zlib-and-.patch | 51 - buildroot/package/libuhttpd/libuhttpd.hash | 2 +- buildroot/package/libuhttpd/libuhttpd.mk | 3 +- .../package/libunistring/libunistring.mk | 1 + ...t_t-instead-of-__sigset_t-on-AArch64.patch | 46 - ...0003-Fix-compilation-with-fno-common.patch | 445 -- buildroot/package/libunwind/libunwind.hash | 2 +- buildroot/package/libunwind/libunwind.mk | 2 +- buildroot/package/libupnp/libupnp.mk | 1 + buildroot/package/libupnpp/libupnpp.hash | 4 +- buildroot/package/libupnpp/libupnpp.mk | 2 +- ...parsing-of-descriptors-for-multi-con.patch | 62 + buildroot/package/libusb/Config.in | 6 +- buildroot/package/libusb/libusb.hash | 4 +- buildroot/package/libusb/libusb.mk | 2 +- ...001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 34 + .../package/libva-utils/libva-utils.hash | 6 +- buildroot/package/libva-utils/libva-utils.mk | 2 +- buildroot/package/libva/libva.hash | 6 +- buildroot/package/libva/libva.mk | 2 +- .../package/libvncserver/libvncserver.mk | 1 + buildroot/package/libwebsockets/Config.in | 2 +- .../package/libwebsockets/libwebsockets.hash | 2 +- .../package/libwebsockets/libwebsockets.mk | 2 +- buildroot/package/libxml2/libxml2.mk | 1 + buildroot/package/libxslt/libxslt.mk | 1 + buildroot/package/libyang/libyang.hash | 2 +- buildroot/package/libyang/libyang.mk | 3 +- buildroot/package/libyuv/libyuv.hash | 4 +- buildroot/package/libzip/libzip.mk | 1 + buildroot/package/libzlib/libzlib.mk | 2 + .../0001-Fix-default-config-file.patch | 27 +- buildroot/package/lighttpd/Config.in | 2 +- buildroot/package/lighttpd/lighttpd.hash | 6 +- buildroot/package/lighttpd/lighttpd.mk | 3 +- buildroot/package/links/links.mk | 1 + buildroot/package/linphone/Config.in | 6 +- buildroot/package/linphone/linphone.hash | 2 +- buildroot/package/linphone/linphone.mk | 5 +- buildroot/package/linux-backports/Config.in | 2 +- .../linux-backports/linux-backports.hash | 8 +- .../linux-backports/linux-backports.mk | 19 +- buildroot/package/linux-firmware/Config.in | 20 +- .../linux-firmware/linux-firmware.hash | 68 +- .../package/linux-firmware/linux-firmware.mk | 34 +- .../package/linux-headers/Config.in.host | 31 +- .../package/linux-headers/linux-headers.mk | 10 +- ...when-crypt-does-not-require-libcrypt.patch | 37 - .../linux-pam/0002-fix-build-on-musl.patch | 320 -- buildroot/package/linux-pam/linux-pam.hash | 4 +- buildroot/package/linux-pam/linux-pam.mk | 12 +- .../linux-syscall-support.hash | 2 +- .../package/linux-tools/linux-tool-perf.mk.in | 11 +- buildroot/package/lldpd/lldpd.hash | 4 +- buildroot/package/lldpd/lldpd.mk | 2 +- buildroot/package/llvm/llvm.mk | 1 + ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 .../localedef.hash | 2 +- buildroot/package/localedef/localedef.mk | 2 +- buildroot/package/logrotate/logrotate.hash | 2 +- buildroot/package/logrotate/logrotate.mk | 8 +- ...01-cacheflush01-Rewrite-into-new-API.patch | 225 - ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 64 +- .../package/ltp-testsuite/ltp-testsuite.hash | 4 +- .../package/ltp-testsuite/ltp-testsuite.mk | 30 +- buildroot/package/lua-bit32/lua-bit32.hash | 4 +- buildroot/package/lua-bit32/lua-bit32.mk | 4 +- buildroot/package/lua-curl/lua-curl.hash | 4 +- buildroot/package/lua-curl/lua-curl.mk | 2 +- buildroot/package/lua-http/Config.in | 2 +- buildroot/package/lua-http/lua-http.hash | 4 +- buildroot/package/lua-http/lua-http.mk | 2 +- buildroot/package/lua-lyaml/lua-lyaml.hash | 4 +- buildroot/package/lua-lyaml/lua-lyaml.mk | 2 +- buildroot/package/lua/lua.mk | 1 + buildroot/package/luajit/luajit.mk | 8 +- buildroot/package/lualdap/Config.in | 16 + buildroot/package/lualdap/lualdap.hash | 3 + buildroot/package/lualdap/lualdap.mk | 33 + buildroot/package/luarocks/luarocks.hash | 2 +- buildroot/package/luarocks/luarocks.mk | 2 +- .../luasyslog/0001-compat-Lua-5.3.patch | 52 - .../luasyslog/0001-remove-AX_LUA_LIBS.patch | 27 + buildroot/package/luasyslog/Config.in | 4 +- buildroot/package/luasyslog/luasyslog.hash | 6 +- buildroot/package/luasyslog/luasyslog.mk | 11 +- buildroot/package/lxc/lxc.mk | 1 + buildroot/package/lz4/lz4.hash | 2 +- buildroot/package/lz4/lz4.mk | 3 +- ...001-PATCH-Define-PN_XNUM-if-missing.patch} | 0 ...move-duplicated-variable-definitions.patch | 104 - ...-makedumpfile.h-fix-build-on-sparc64.patch | 35 + .../package/makedumpfile/makedumpfile.hash | 2 +- .../package/makedumpfile/makedumpfile.mk | 4 +- buildroot/package/mariadb/mariadb.mk | 1 + buildroot/package/matio/matio.mk | 1 + buildroot/package/mbedtls/mbedtls.mk | 2 + buildroot/package/mbuffer/mbuffer.hash | 4 +- buildroot/package/mbuffer/mbuffer.mk | 2 +- buildroot/package/mdevd/mdevd.hash | 4 +- buildroot/package/mdevd/mdevd.mk | 2 +- buildroot/package/mediastreamer/Config.in | 6 +- .../package/mediastreamer/mediastreamer.hash | 2 +- .../package/mediastreamer/mediastreamer.mk | 2 +- buildroot/package/memcached/memcached.hash | 6 +- buildroot/package/memcached/memcached.mk | 3 +- buildroot/package/memtester/memtester.mk | 6 +- .../package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 20 +- ...tion-to-disable-optional-neon-suppor.patch | 4 +- ...xes-to-loader-when-using-x11-and-dri.patch | 35 - buildroot/package/mesa3d/Config.in | 2 +- buildroot/package/mesa3d/mesa3d.hash | 6 +- buildroot/package/mesa3d/mesa3d.mk | 4 +- .../package/meson/cross-compilation.conf.in | 6 +- buildroot/package/meson/meson.hash | 4 +- buildroot/package/meson/meson.mk | 2 +- buildroot/package/mfgtools/Config.in.host | 5 + buildroot/package/midori/midori.mk | 1 + buildroot/package/mii-diag/mii-diag.mk | 1 + .../package/minetest-game/minetest-game.hash | 6 +- .../package/minetest-game/minetest-game.mk | 2 +- buildroot/package/minetest/minetest.hash | 4 +- buildroot/package/minetest/minetest.mk | 5 +- buildroot/package/minicom/minicom.hash | 4 +- buildroot/package/minicom/minicom.mk | 7 +- .../0001-Use-pkg-config-to-find-ZSTD.patch | 30 - .../0002-mz.h-fix-build-with-gcc-4.8.patch | 60 - buildroot/package/minizip/minizip.hash | 2 +- buildroot/package/minizip/minizip.mk | 33 +- buildroot/package/mksh/mksh.hash | 4 +- buildroot/package/mksh/mksh.mk | 2 +- buildroot/package/mmc-utils/mmc-utils.hash | 4 +- buildroot/package/moarvm/moarvm.hash | 2 +- buildroot/package/moarvm/moarvm.mk | 2 +- buildroot/package/mongodb/mongodb.mk | 2 + buildroot/package/mongoose/mongoose.hash | 4 +- buildroot/package/mongoose/mongoose.mk | 8 +- ...le-backtrace-on-not-supported-uclibc.patch | 27 - ...ath-depending-on-C-library-being-use.patch | 34 - ...03-configure.ac-checks-for-libunwind.patch | 40 - ...-leftover-code-from-pre-monoctx-area.patch | 33 - buildroot/package/mono/Config.in | 2 + buildroot/package/mono/mono.hash | 2 +- buildroot/package/mono/mono.mk | 6 +- buildroot/package/monolite/monolite.hash | 2 +- buildroot/package/monolite/monolite.mk | 2 +- buildroot/package/mosquitto/mosquitto.hash | 8 +- buildroot/package/mosquitto/mosquitto.mk | 21 +- ...meson.build-fix-GenParseName-linking.patch | 38 + buildroot/package/mpd/Config.in | 20 +- buildroot/package/mpd/mpd.hash | 2 +- buildroot/package/mpd/mpd.mk | 14 +- buildroot/package/mpfr/mpfr.mk | 1 + buildroot/package/mpv/Config.in | 11 +- buildroot/package/mpv/mpv.hash | 2 +- buildroot/package/mpv/mpv.mk | 21 +- buildroot/package/mrouted/Config.in | 19 + .../{sysklogd/S02klogd => mrouted/S41mrouted} | 13 +- buildroot/package/mrouted/mrouted.hash | 6 +- buildroot/package/mrouted/mrouted.mk | 22 +- buildroot/package/msmtp/msmtp.hash | 4 +- buildroot/package/msmtp/msmtp.mk | 2 +- buildroot/package/mtd/mtd.mk | 2 + buildroot/package/mtools/mtools.hash | 4 +- buildroot/package/mtools/mtools.mk | 2 +- buildroot/package/mtr/mtr.mk | 1 + ...bs-to-fix-buffer-overflow-and-other-.patch | 114 - buildroot/package/musl/musl.hash | 4 +- buildroot/package/musl/musl.mk | 2 +- buildroot/package/mutt/mutt.mk | 27 +- buildroot/package/mxsldr/Config.in.host | 5 + buildroot/package/nano/Config.in | 2 +- buildroot/package/nano/nano.hash | 4 +- buildroot/package/nano/nano.mk | 28 +- buildroot/package/ncmpc/ncmpc.hash | 2 +- buildroot/package/ncmpc/ncmpc.mk | 3 +- buildroot/package/ncurses/ncurses.mk | 1 + buildroot/package/ne10/ne10.mk | 2 + buildroot/package/neofetch/Config.in | 10 + buildroot/package/neofetch/neofetch.hash | 2 + buildroot/package/neofetch/neofetch.mk | 17 + buildroot/package/net-tools/net-tools.hash | 2 +- buildroot/package/netcat-openbsd/Config.in | 6 +- .../netcat-openbsd/netcat-openbsd.hash | 4 +- buildroot/package/netcat/netcat.mk | 1 + ...support-using-current-user-for-SR-mo.patch | 93 - buildroot/package/netopeer2/netopeer2.hash | 2 +- buildroot/package/netopeer2/netopeer2.mk | 23 +- ...ezahn-remove-unused-MZ_SIZE_LONG_INT.patch | 41 - ...e-needlessly-global-variables-static.patch | 139 - ...-variable-definitions-cli-h-to-cli-c.patch | 77 - ...le-definitions-from-mops-h-to-mops-c.patch | 69 - ...-definitions-from-llist-h-to-llist-c.patch | 47 - ...definitions-from-mz-h-to-mausezahn-c.patch | 184 - .../package/netsniff-ng/netsniff-ng.hash | 2 +- buildroot/package/netsniff-ng/netsniff-ng.mk | 2 +- ...figure-static-linking-Fix-SSL-checks.patch | 20 +- .../0002-configure-Fix-lcrypto-lz-test.patch | 15 +- ..._CHECK_FUNCS-TLS_method-TLSv1_method.patch | 4 +- ...once-that-opening-proc-net-if_inet6-.patch | 30 - ...x-Fix-a-memory-leak-in-an-error-path.patch | 37 - buildroot/package/netsnmp/netsnmp.hash | 10 +- buildroot/package/netsnmp/netsnmp.mk | 4 +- .../netsurf-buildsystem.hash | 2 +- buildroot/package/nettle/nettle.mk | 1 + .../network-manager/network-manager.mk | 1 + buildroot/package/nfs-utils/nfs-utils.mk | 2 + buildroot/package/nftables/nftables.mk | 1 + buildroot/package/nghttp2/nghttp2.mk | 1 + buildroot/package/nginx/S50nginx | 2 +- buildroot/package/nginx/nginx.mk | 11 +- buildroot/package/nginx/nginx.service | 3 +- buildroot/package/ngircd/ngircd.hash | 2 +- buildroot/package/ngircd/ngircd.mk | 3 +- ...01-set-minimum-cmake-version-to-3.10.patch | 30 - ...fdiagnostics-color-from-make-command.patch | 29 - .../0003-CMake-fix-object-library-usage.patch | 56 - buildroot/package/ninja/ninja.hash | 4 +- buildroot/package/ninja/ninja.mk | 2 +- buildroot/package/nmap/nmap.hash | 6 +- buildroot/package/nmap/nmap.mk | 5 +- buildroot/package/nodejs/nodejs.hash | 4 +- buildroot/package/nodejs/nodejs.mk | 4 +- buildroot/package/ntfs-3g/ntfs-3g.mk | 1 + buildroot/package/ntp/ntp.mk | 7 +- buildroot/package/nvidia-modprobe/Config.in | 8 + .../nvidia-modprobe/nvidia-modprobe.hash | 3 + .../nvidia-modprobe/nvidia-modprobe.mk | 22 + buildroot/package/nvme/nvme.mk | 9 + buildroot/package/odhcp6c/odhcp6c.hash | 2 +- ...-lib-pud-Makefile-fix-parallel-build.patch | 33 + ...ud-adapt-to-API-changes-in-gpsd-3-20.patch | 105 + buildroot/package/olsr/olsr.mk | 11 +- buildroot/package/omxplayer/Config.in | 6 +- buildroot/package/oniguruma/oniguruma.mk | 1 + ...sts.txt-project-only-contains-C-code.patch | 27 + ...eLists.txt-fix-build-without-threads.patch | 37 + buildroot/package/open62541/Config.in | 71 + buildroot/package/open62541/open62541.hash | 3 + buildroot/package/open62541/open62541.mk | 57 + .../0001-fix-gfortran-detection.patch | 30 + buildroot/package/openblas/Config.in | 21 + buildroot/package/openblas/openblas.mk | 9 +- buildroot/package/opencv3/opencv3.hash | 2 +- buildroot/package/opencv3/opencv3.mk | 2 +- buildroot/package/openfpgaloader/Config.in | 7 +- buildroot/package/openjdk/Config.in | 7 +- buildroot/package/openjpeg/openjpeg.mk | 1 + buildroot/package/openlayers/openlayers.hash | 2 +- buildroot/package/openlayers/openlayers.mk | 2 +- ...TS-9454-fix-issuerAndThisUpdateCheck.patch | 26 + buildroot/package/openldap/openldap.mk | 4 + buildroot/package/openntpd/openntpd.mk | 1 + buildroot/package/openocd/Config.in | 28 +- buildroot/package/openocd/Config.in.host | 4 + buildroot/package/openrc/openrc.mk | 1 + buildroot/package/openssh/openssh.mk | 3 + .../openswan/0001-fix-build-with-gcc-10.patch | 49 - buildroot/package/openswan/Config.in | 6 +- buildroot/package/openswan/openswan.hash | 6 +- buildroot/package/openswan/openswan.mk | 8 +- buildroot/package/openvpn/openvpn.hash | 4 +- buildroot/package/openvpn/openvpn.mk | 10 +- buildroot/package/opkg-utils/opkg-utils.hash | 2 +- buildroot/package/opusfile/opusfile.hash | 4 +- buildroot/package/opusfile/opusfile.mk | 2 +- ...powerpc.c-fix-build-with-kernel-4.11.patch | 70 + buildroot/package/ortp/ortp.hash | 2 +- buildroot/package/ortp/ortp.mk | 2 +- buildroot/package/p11-kit/p11-kit.mk | 1 + .../package/paho-mqtt-cpp/paho-mqtt-cpp.mk | 4 - buildroot/package/pango/Config.in | 2 +- buildroot/package/pango/pango.hash | 4 +- buildroot/package/pango/pango.mk | 10 +- buildroot/package/patch/patch.mk | 1 + buildroot/package/pax-utils/pax-utils.mk | 1 + buildroot/package/paxtest/paxtest.mk | 1 + buildroot/package/pcre/pcre.mk | 1 + buildroot/package/pcre2/Config.in | 1 - buildroot/package/pcsc-lite/Config.in | 4 + buildroot/package/pdbg/pdbg.hash | 2 +- buildroot/package/pdbg/pdbg.mk | 2 +- .../perl-date-manip/perl-date-manip.hash | 4 +- .../perl-date-manip/perl-date-manip.mk | 2 +- buildroot/package/perl-devel-cycle/Config.in | 6 + .../perl-devel-cycle/perl-devel-cycle.hash | 6 + .../perl-devel-cycle/perl-devel-cycle.mk | 14 + buildroot/package/perl-devel-size/Config.in | 11 + .../perl-devel-size/perl-devel-size.hash | 6 + .../perl-devel-size/perl-devel-size.mk | 14 + .../perl-extutils-pkgconfig.hash | 6 + .../perl-extutils-pkgconfig.mk | 18 + .../perl-file-listing/perl-file-listing.hash | 4 +- .../perl-file-listing/perl-file-listing.mk | 2 +- ...-fix-cross-compilation-with-gdlib.pc.patch | 34 + buildroot/package/perl-gd/Config.in | 2 - buildroot/package/perl-gd/perl-gd.mk | 42 +- .../perl-http-cookies/perl-http-cookies.hash | 6 +- .../perl-http-cookies/perl-http-cookies.mk | 2 +- .../perl-http-entity-parser.hash | 4 +- .../perl-http-entity-parser.mk | 2 +- .../perl-http-message/perl-http-message.hash | 4 +- .../perl-http-message/perl-http-message.mk | 2 +- .../perl-json-maybexs/perl-json-maybexs.hash | 4 +- .../perl-json-maybexs/perl-json-maybexs.mk | 2 +- .../perl-libwww-perl/perl-libwww-perl.hash | 4 +- .../perl-libwww-perl/perl-libwww-perl.mk | 2 +- .../package/perl-lwp-protocol-https/Config.in | 2 +- .../perl-lwp-protocol-https.hash | 4 +- .../perl-lwp-protocol-https.mk | 2 +- buildroot/package/perl-math-int64/Config.in | 10 + .../perl-math-int64/perl-math-int64.hash | 6 + .../perl-math-int64/perl-math-int64.mk | 14 + .../perl-mojolicious/perl-mojolicious.hash | 4 +- .../perl-mojolicious/perl-mojolicious.mk | 2 +- buildroot/package/perl-moo/Config.in | 1 - buildroot/package/perl-moo/perl-moo.hash | 4 +- buildroot/package/perl-moo/perl-moo.mk | 2 +- .../package/perl-net-dns/perl-net-dns.hash | 6 +- .../package/perl-net-dns/perl-net-dns.mk | 2 +- .../package/perl-net-http/perl-net-http.hash | 6 +- .../package/perl-net-http/perl-net-http.mk | 2 +- .../perl-package-stash.hash | 6 +- .../perl-package-stash/perl-package-stash.mk | 2 +- .../perl-params-util/perl-params-util.hash | 4 +- .../perl-params-util/perl-params-util.mk | 2 +- buildroot/package/perl-plack/perl-plack.hash | 6 +- buildroot/package/perl-plack/perl-plack.mk | 2 +- .../perl-role-tiny/perl-role-tiny.hash | 6 +- .../package/perl-role-tiny/perl-role-tiny.mk | 2 +- buildroot/package/perl-type-tiny/Config.in | 2 +- .../perl-type-tiny/perl-type-tiny.hash | 6 +- .../package/perl-type-tiny/perl-type-tiny.mk | 2 +- buildroot/package/perl-uri/perl-uri.hash | 4 +- buildroot/package/perl-uri/perl-uri.mk | 2 +- ...the-generated-subdirectory-Makefiles.patch | 32 - buildroot/package/perl/Config.in | 10 + buildroot/package/perl/perl.hash | 14 +- buildroot/package/perl/perl.mk | 12 +- buildroot/package/phidgetwebservice/Config.in | 7 +- buildroot/package/php/php.hash | 2 +- buildroot/package/php/php.mk | 3 +- buildroot/package/piglit/piglit.hash | 2 +- buildroot/package/pigz/pigz.hash | 4 +- buildroot/package/pigz/pigz.mk | 2 +- buildroot/package/pinentry/Config.in | 11 + buildroot/package/pinentry/pinentry.hash | 6 +- buildroot/package/pinentry/pinentry.mk | 17 +- buildroot/package/pixman/pixman.mk | 1 + buildroot/package/pixz/0001-fix-linkage.patch | 41 - buildroot/package/pixz/pixz.hash | 2 +- buildroot/package/pixz/pixz.mk | 2 +- buildroot/package/pkg-download.mk | 8 +- buildroot/package/pkg-generic.mk | 72 +- buildroot/package/pkg-meson.mk | 4 +- buildroot/package/pkg-qmake.mk | 12 + buildroot/package/pkg-utils.mk | 12 +- ...th-the-sysroot-a-subset-of-variables.patch | 12 +- ...me-modversion-insted-of-version-if-o.patch | 2 +- buildroot/package/pkgconf/pkgconf.hash | 4 +- buildroot/package/pkgconf/pkgconf.mk | 2 +- ...ure.ac-fix-error-with-version-string.patch | 29 + ...02-printxf.h-add-stdarg.h-in-include.patch | 27 + buildroot/package/ply/Config.in | 29 + buildroot/package/ply/ply.hash | 3 + buildroot/package/ply/ply.mk | 15 + buildroot/package/pngquant/pngquant.hash | 4 +- buildroot/package/pngquant/pngquant.mk | 2 +- .../policycoreutils/policycoreutils.mk | 1 + buildroot/package/polkit/polkit.mk | 1 + buildroot/package/popperjs/Config.in | 6 + buildroot/package/popperjs/popperjs.hash | 3 + buildroot/package/popperjs/popperjs.mk | 19 + buildroot/package/poppler/poppler.mk | 11 +- buildroot/package/postgresql/Config.in | 9 + buildroot/package/postgresql/postgresql.hash | 8 +- buildroot/package/postgresql/postgresql.mk | 11 +- .../package/powerpc-utils/powerpc-utils.mk | 1 + buildroot/package/pppd/pppd.mk | 2 + .../package/prelink-cross/prelink-cross.hash | 2 +- buildroot/package/privoxy/privoxy.hash | 8 +- buildroot/package/privoxy/privoxy.mk | 3 +- buildroot/package/proftpd/proftpd.mk | 1 + buildroot/package/proj/proj.hash | 6 +- buildroot/package/proj/proj.mk | 2 +- buildroot/package/protobuf/protobuf.hash | 2 +- buildroot/package/protobuf/protobuf.mk | 10 +- buildroot/package/psplash/psplash.hash | 4 +- buildroot/package/pugixml/pugixml.hash | 4 +- buildroot/package/pugixml/pugixml.mk | 4 +- buildroot/package/pulseaudio/pulseaudio.hash | 10 +- buildroot/package/pulseaudio/pulseaudio.mk | 4 +- buildroot/package/pure-ftpd/pure-ftpd.mk | 1 + .../python-aiohttp-jinja2.hash | 6 +- .../python-aiohttp-jinja2.mk | 4 +- .../python-aiohttp-remotes.hash | 6 +- .../python-aiohttp-remotes.mk | 4 +- buildroot/package/python-aiohttp/Config.in | 5 +- .../python-aiohttp/python-aiohttp.hash | 6 +- .../package/python-aiohttp/python-aiohttp.mk | 4 +- .../python-aiorwlock/python-aiorwlock.hash | 6 +- .../python-aiorwlock/python-aiorwlock.mk | 4 +- buildroot/package/python-bleak/Config.in | 8 + .../package/python-bleak/python-bleak.hash | 5 + .../package/python-bleak/python-bleak.mk | 14 + buildroot/package/python-bluezero/Config.in | 1 + .../python-bluezero/python-bluezero.hash | 6 +- .../python-bluezero/python-bluezero.mk | 5 +- .../package/python-boto3/python-boto3.hash | 6 +- .../package/python-boto3/python-boto3.mk | 4 +- .../python-botocore/python-botocore.hash | 4 +- .../python-botocore/python-botocore.mk | 4 +- .../package/python-bottle/python-bottle.hash | 4 +- .../package/python-bottle/python-bottle.mk | 6 +- buildroot/package/python-can/python-can.hash | 4 +- buildroot/package/python-can/python-can.mk | 4 +- .../package/python-cbor2/python-cbor2.hash | 6 +- .../package/python-cbor2/python-cbor2.mk | 4 +- .../python-certifi/python-certifi.hash | 4 +- .../package/python-certifi/python-certifi.mk | 4 +- .../python-chardet/python-chardet.hash | 6 +- .../package/python-chardet/python-chardet.mk | 4 +- .../python-colorama/python-colorama.hash | 7 +- .../python-colorama/python-colorama.mk | 4 +- buildroot/package/python-defusedxml/Config.in | 6 + .../python-defusedxml/python-defusedxml.hash | 5 + .../python-defusedxml/python-defusedxml.mk | 14 + .../package/python-django/python-django.hash | 6 +- .../package/python-django/python-django.mk | 6 +- buildroot/package/python-esptool/Config.in | 2 + .../python-esptool/python-esptool.hash | 4 +- .../package/python-esptool/python-esptool.mk | 4 +- .../package/python-fire/python-fire.hash | 4 +- buildroot/package/python-fire/python-fire.mk | 4 +- .../python-flask-cors/python-flask-cors.hash | 5 +- .../python-flask-cors/python-flask-cors.mk | 6 +- .../python-iniconfig/python-iniconfig.hash | 4 +- .../python-iniconfig/python-iniconfig.mk | 4 +- buildroot/package/python-iso8601/Config.in | 2 +- .../python-iso8601/python-iso8601.hash | 7 +- .../package/python-iso8601/python-iso8601.mk | 4 +- .../package/python-janus/python-janus.hash | 4 +- .../package/python-janus/python-janus.mk | 4 +- .../package/python-jinja2/python-jinja2.mk | 1 + .../python-jmespath/python-jmespath.hash | 4 +- .../python-jmespath/python-jmespath.mk | 4 +- buildroot/package/python-libusb1/Config.in | 6 +- buildroot/package/python-lxml/python-lxml.mk | 2 + .../package/python-mako/python-mako.hash | 4 +- buildroot/package/python-mako/python-mako.mk | 4 +- .../python-markupsafe/python-markupsafe.mk | 1 + .../python-modbus-tk/python-modbus-tk.hash | 5 +- .../python-modbus-tk/python-modbus-tk.mk | 4 +- .../python-multidict/python-multidict.hash | 4 +- .../python-multidict/python-multidict.mk | 4 +- buildroot/package/python-mwclient/Config.in | 4 +- .../python-mwclient/python-mwclient.hash | 6 +- .../python-mwclient/python-mwclient.mk | 4 +- buildroot/package/python-mwscrape/Config.in | 3 +- .../python-mwscrape/python-mwscrape.hash | 2 +- .../python-mwscrape/python-mwscrape.mk | 2 +- .../python-mwscrape2slob.hash | 2 +- .../python-mwscrape2slob.mk | 2 +- buildroot/package/python-nfc/Config.in | 6 +- buildroot/package/python-pillow/Config.in | 1 + .../package/python-pillow/python-pillow.hash | 3 +- .../package/python-pillow/python-pillow.mk | 13 +- buildroot/package/python-ply/python-ply.mk | 1 + ....py-remove-unneeded-wheel-dependency.patch | 41 - .../python-protobuf/python-protobuf.hash | 2 +- .../package/python-pybind/python-pybind.hash | 4 +- .../package/python-pybind/python-pybind.mk | 2 +- .../python-pycryptodomex.hash | 4 +- .../python-pycryptodomex.mk | 4 +- buildroot/package/python-pycups/Config.in | 8 + .../package/python-pycups/python-pycups.hash | 5 + .../package/python-pycups/python-pycups.mk | 15 + .../package/python-pydal/python-pydal.hash | 4 +- .../package/python-pydal/python-pydal.mk | 2 +- buildroot/package/python-pyjwt/Config.in | 1 + .../package/python-pyjwt/python-pyjwt.hash | 6 +- .../package/python-pyjwt/python-pyjwt.mk | 4 +- buildroot/package/python-pylibftdi/Config.in | 6 +- .../python-pyparsing/python-pyparsing.hash | 8 +- .../python-pyparsing/python-pyparsing.mk | 4 +- .../package/python-pytest-asyncio/Config.in | 8 + .../python-pytest-asyncio.hash | 5 + .../python-pytest-asyncio.mk | 14 + buildroot/package/python-pytest/Config.in | 2 +- .../package/python-pytest/python-pytest.hash | 4 +- .../package/python-pytest/python-pytest.mk | 4 +- buildroot/package/python-pyusb/Config.in | 6 +- buildroot/package/python-remi/Config.in | 3 + .../package/python-remi/python-remi.hash | 2 +- buildroot/package/python-remi/python-remi.mk | 4 +- .../python-requests-oauthlib.hash | 6 +- .../python-requests-oauthlib.mk | 4 +- .../python-requests/python-requests.hash | 6 +- .../python-requests/python-requests.mk | 4 +- .../python-s3transfer/python-s3transfer.hash | 6 +- .../python-s3transfer/python-s3transfer.mk | 4 +- .../python-serial-asyncio.hash | 6 +- .../python-serial-asyncio.mk | 4 +- .../package/python-serial/python-serial.hash | 6 +- .../package/python-serial/python-serial.mk | 4 +- .../python-setuptools/python-setuptools.mk | 2 + .../package/python-sockjs/python-sockjs.hash | 6 +- .../package/python-sockjs/python-sockjs.mk | 4 +- buildroot/package/python-thrift/Config.in | 5 +- .../package/python-thrift/python-thrift.hash | 6 +- .../package/python-thrift/python-thrift.mk | 8 +- .../package/python-txdbus/python-txdbus.hash | 4 +- .../package/python-txdbus/python-txdbus.mk | 4 +- .../python-typing-extensions/Config.in | 7 + .../python-typing-extensions.hash | 5 + .../python-typing-extensions.mk | 14 + .../package/python-typing/python-typing.hash | 6 +- .../package/python-typing/python-typing.mk | 4 +- .../python-urllib3/python-urllib3.hash | 6 +- .../package/python-urllib3/python-urllib3.mk | 4 +- .../package/python-yarl/python-yarl.hash | 4 +- buildroot/package/python-yarl/python-yarl.mk | 4 +- .../package/python-yatl/python-yatl.hash | 4 +- buildroot/package/python-yatl/python-yatl.mk | 4 +- buildroot/package/python/Config.in | 2 +- buildroot/package/python/python.mk | 1 + .../python3-jinja2/python3-jinja2.hash | 1 + .../package/python3-jinja2/python3-jinja2.mk | 18 + .../package/python3-mako/python3-mako.mk | 2 +- .../python3-markupsafe.hash | 1 + .../python3-markupsafe/python3-markupsafe.mk | 16 + .../package/python3-ply/python3-ply.hash | 1 + buildroot/package/python3-ply/python3-ply.mk | 16 + .../python3-pycryptodomex.mk | 4 +- .../python3-requests/python3-requests.mk | 4 +- buildroot/package/python3/Config.in | 5 + buildroot/package/python3/python3.hash | 8 +- buildroot/package/python3/python3.mk | 9 +- .../package/qcom-db410c-firmware/Config.in | 7 + .../qcom-db410c-firmware.hash | 3 + .../qcom-db410c-firmware.mk | 41 + buildroot/package/qdecoder/qdecoder.hash | 4 +- buildroot/package/qdecoder/qdecoder.mk | 2 +- ...age-of-mcontext-structure-on-ARM-uCl.patch | 4 +- ...t-libusb.c-fix-build-with-kernel-5.0.patch | 43 + .../qemu/0004-meson-add-tests-option.patch | 92 + buildroot/package/qemu/Config.in.host | 4 + buildroot/package/qemu/qemu.hash | 6 +- buildroot/package/qemu/qemu.mk | 23 +- .../package/{rcw => qoriq-rcw}/Config.in.host | 8 +- buildroot/package/qoriq-rcw/qoriq-rcw.hash | 3 + buildroot/package/qoriq-rcw/qoriq-rcw.mk | 67 + buildroot/package/qpid-proton/qpid-proton.mk | 2 + .../qt-webkit-kiosk/qt-webkit-kiosk.hash | 2 +- buildroot/package/qt5/Config.in | 3 + buildroot/package/qt5/qt5.mk | 2 +- buildroot/package/qt5/qt53d/qt53d.hash | 10 +- buildroot/package/qt5/qt5base/Config.in | 5 + buildroot/package/qt5/qt5base/qt5base.hash | 17 +- buildroot/package/qt5/qt5base/qt5base.mk | 11 +- .../package/qt5/qt5charts/qt5charts.hash | 6 +- buildroot/package/qt5/qt5coap/Config.in | 11 + buildroot/package/qt5/qt5coap/qt5coap.hash | 6 + buildroot/package/qt5/qt5coap/qt5coap.mk | 15 + .../qt5/qt5connectivity/qt5connectivity.hash | 14 +- .../qt5/qt5declarative/qt5declarative.hash | 14 +- .../package/qt5/qt5enginio/qt5enginio.hash | 10 +- .../qt5graphicaleffects.hash | 14 +- .../qt5/qt5imageformats/qt5imageformats.hash | 14 +- buildroot/package/qt5/qt5knx/Config.in | 12 + buildroot/package/qt5/qt5knx/qt5knx.hash | 6 + buildroot/package/qt5/qt5knx/qt5knx.mk | 15 + .../package/qt5/qt5location/qt5location.hash | 14 +- .../package/qt5/qt5lottie/qt5lottie.hash | 4 +- buildroot/package/qt5/qt5mqtt/Config.in | 13 + buildroot/package/qt5/qt5mqtt/qt5mqtt.hash | 6 + buildroot/package/qt5/qt5mqtt/qt5mqtt.mk | 15 + .../qt5/qt5multimedia/qt5multimedia.hash | 16 +- .../qt5quickcontrols/qt5quickcontrols.hash | 12 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 10 +- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5remoteobjects/qt5remoteobjects.hash | 12 +- .../package/qt5/qt5script/qt5script.hash | 16 +- buildroot/package/qt5/qt5scxml/qt5scxml.hash | 11 +- .../package/qt5/qt5sensors/qt5sensors.hash | 14 +- .../qt5/qt5serialbus/qt5serialbus.hash | 12 +- .../qt5/qt5serialport/qt5serialport.hash | 14 +- buildroot/package/qt5/qt5svg/qt5svg.hash | 12 +- ...-designer-tool-fixes-configure-error.patch | 10 +- buildroot/package/qt5/qt5tools/qt5tools.hash | 14 +- .../qt5virtualkeyboard.hash | 14 +- .../package/qt5/qt5wayland/qt5wayland.hash | 14 +- .../qt5/qt5webchannel/qt5webchannel.hash | 14 +- .../qt5/qt5webengine/chromium-latest.inc | 116 +- .../qt5/qt5webengine/qt5webengine.hash | 1968 ++++---- .../qt5webkit-examples.hash | 2 +- .../package/qt5/qt5webkit/qt5webkit.hash | 6 +- .../qt5/qt5websockets/qt5websockets.hash | 12 +- .../package/qt5/qt5webview/qt5webview.hash | 12 +- .../qt5/qt5x11extras/qt5x11extras.hash | 14 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 14 +- buildroot/package/quagga/quagga.mk | 1 + ...ile-add-optional-link-with-libatomic.patch | 37 + buildroot/package/quickjs/Config.in | 19 + buildroot/package/quickjs/quickjs.hash | 2 + buildroot/package/quickjs/quickjs.mk | 44 + ...-configure.ac-add-disable-pie-option.patch | 55 - ...-realloc-3-instead-of-reallocarray-3.patch | 34 + buildroot/package/quota/quota.hash | 10 +- buildroot/package/quota/quota.mk | 7 +- buildroot/package/rabbitmq-c/rabbitmq-c.mk | 5 - ...ck-protector-the-toolchain-might-lac.patch | 27 - buildroot/package/radvd/radvd.hash | 6 +- buildroot/package/radvd/radvd.mk | 10 +- buildroot/package/rapidjson/rapidjson.mk | 1 + buildroot/package/raptor/raptor.mk | 2 + .../raspberrypi-usbboot/Config.in.host | 5 + ...c-mount.c-fix-build-with-kernel-4.14.patch | 43 - buildroot/package/rauc/rauc.hash | 4 +- buildroot/package/rauc/rauc.mk | 3 +- buildroot/package/rcw-smarc-sal28/Config.in | 25 + .../rcw-smarc-sal28/rcw-smarc-sal28.hash | 3 + .../rcw-smarc-sal28/rcw-smarc-sal28.mk | 37 + buildroot/package/rcw/rcw.hash | 3 - buildroot/package/rcw/rcw.mk | 67 - buildroot/package/readline/Config.in | 18 + buildroot/package/readline/readline.hash | 4 +- buildroot/package/readline/readline.mk | 9 +- buildroot/package/redis/redis.mk | 1 + buildroot/package/refpolicy/refpolicy.hash | 2 +- buildroot/package/refpolicy/refpolicy.mk | 5 +- buildroot/package/resiprocate/resiprocate.mk | 1 + ...01-configure-allow-cross-compilation.patch | 57 + .../0002-configure-add-uclinux-target.patch | 36 + buildroot/package/rhash/rhash.hash | 9 +- buildroot/package/rhash/rhash.mk | 37 +- ...-configure.ac-fix-with-rtlsdr-option.patch | 29 - ..._jitter-disambiguate-call-to-encrypt.patch | 53 - buildroot/package/rng-tools/Config.in | 12 +- buildroot/package/rng-tools/rng-tools.hash | 2 +- buildroot/package/rng-tools/rng-tools.mk | 13 +- ...ls-build_detect_platform-fix-C-tests.patch | 67 +- ...patiblity-fix-CRC32-C-implementation.patch | 3787 +++++++++++++++ ...e-POWER-crc32c-with-C-implementation.patch | 4058 ----------------- buildroot/package/rocksdb/rocksdb.hash | 4 +- buildroot/package/rocksdb/rocksdb.mk | 16 +- .../rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- .../rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- buildroot/package/rpi-firmware/Config.in | 10 + .../package/rpi-firmware/rpi-firmware.hash | 2 +- .../package/rpi-firmware/rpi-firmware.mk | 19 +- .../package/rpi-userland/rpi-userland.hash | 2 +- .../package/rpi-userland/rpi-userland.mk | 2 +- .../rpi-wifi-firmware/rpi-wifi-firmware.hash | 4 +- .../rpi-wifi-firmware/rpi-wifi-firmware.mk | 6 +- buildroot/package/rsyslog/rsyslog.hash | 2 +- buildroot/package/rsyslog/rsyslog.mk | 5 +- ...-Allow-build-for-not-supported-archs.patch | 52 - buildroot/package/rt-tests/rt-tests.hash | 2 +- buildroot/package/rt-tests/rt-tests.mk | 4 +- buildroot/package/rtc-tools/rtc-tools.hash | 4 +- buildroot/package/rtl8188eu/rtl8188eu.hash | 2 +- buildroot/package/rtl8188eu/rtl8188eu.mk | 2 +- buildroot/package/rtl8723bu/rtl8723bu.hash | 2 +- buildroot/package/rtl8723bu/rtl8723bu.mk | 2 +- buildroot/package/rtmpdump/rtmpdump.hash | 4 +- ...xt-fix-build-with-mbedtls-but-withou.patch | 47 - buildroot/package/rtty/rtty.hash | 2 +- buildroot/package/rtty/rtty.mk | 2 +- buildroot/package/runc/runc.mk | 5 +- buildroot/package/rust-bin/rust-bin.hash | 94 +- buildroot/package/rust-bin/rust-bin.mk | 2 +- buildroot/package/rust/rust.hash | 10 +- buildroot/package/rust/rust.mk | 4 +- ...-function-conflicts-with-glibc-nss-h.patch | 104 + buildroot/package/samba4/samba4.hash | 4 +- buildroot/package/samba4/samba4.mk | 4 +- .../package/screen/0008_CVE-2021-26937.patch | 68 + buildroot/package/screen/screen.mk | 4 + buildroot/package/screenfetch/Config.in | 9 + .../package/screenfetch/screenfetch.hash | 2 + buildroot/package/screenfetch/screenfetch.mk | 17 + ...ctfb-SDL_DirectFB_render.c-fix-build.patch | 46 - ...-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch} | 34 +- buildroot/package/sdl2/sdl2.hash | 4 +- buildroot/package/sdl2/sdl2.mk | 4 +- buildroot/package/sdl_ttf/sdl_ttf.hash | 2 +- buildroot/package/sdl_ttf/sdl_ttf.mk | 15 +- buildroot/package/sed/sed.mk | 1 + .../0001-port.h-include-sys-time.h.patch | 39 - buildroot/package/ser2net/ser2net.hash | 6 +- buildroot/package/ser2net/ser2net.mk | 4 +- buildroot/package/setools/setools.mk | 1 + .../shadowsocks-libev/shadowsocks-libev.hash | 2 +- .../shadowsocks-libev/shadowsocks-libev.mk | 3 +- .../shairport-sync/shairport-sync.hash | 2 +- .../package/shairport-sync/shairport-sync.mk | 2 +- buildroot/package/sigrok-cli/sigrok-cli.hash | 2 +- buildroot/package/sigrok-cli/sigrok-cli.mk | 2 +- buildroot/package/sispmctl/Config.in | 6 +- buildroot/package/slirp/slirp.mk | 2 + .../package/smartmontools/smartmontools.mk | 1 + buildroot/package/smcroute/smcroute.mk | 1 + buildroot/package/snappy/snappy.mk | 1 + buildroot/package/snort/snort.hash | 4 +- buildroot/package/snort/snort.mk | 3 +- buildroot/package/socat/socat.mk | 1 + ....ac-put-back-disable-stack-protector.patch | 45 + ...re.ac-fix-static-linking-with-id3tag.patch | 47 + buildroot/package/sox/sox.hash | 4 +- buildroot/package/sox/sox.mk | 60 +- buildroot/package/spawn-fcgi/spawn-fcgi.mk | 1 + buildroot/package/spdlog/Config.in | 2 +- buildroot/package/spdlog/spdlog.hash | 2 +- buildroot/package/spdlog/spdlog.mk | 11 +- buildroot/package/speexdsp/speexdsp.hash | 4 +- buildroot/package/spi-tools/spi-tools.hash | 2 +- buildroot/package/spi-tools/spi-tools.mk | 2 +- buildroot/package/spice/spice.mk | 1 + buildroot/package/sqlcipher/sqlcipher.mk | 1 + buildroot/package/sqlite/sqlite.hash | 9 +- buildroot/package/sqlite/sqlite.mk | 6 +- buildroot/package/squashfs/squashfs.mk | 1 + buildroot/package/squid/squid.mk | 1 + buildroot/package/ssdp-responder/Config.in | 20 + buildroot/package/ssdp-responder/S50ssdpd | 42 + .../ssdp-responder/ssdp-responder.hash | 3 + .../package/ssdp-responder/ssdp-responder.mk | 33 + .../0001-sshfs.c-fix-build-with-gcc-4.8.patch | 47 - buildroot/package/sshfs/sshfs.hash | 2 +- buildroot/package/sshfs/sshfs.mk | 2 +- buildroot/package/stella/stella.hash | 2 +- buildroot/package/stella/stella.mk | 2 +- buildroot/package/stellarium/stellarium.hash | 4 +- buildroot/package/stellarium/stellarium.mk | 2 +- buildroot/package/stm32flash/stm32flash.hash | 4 +- buildroot/package/strace/strace.hash | 4 +- buildroot/package/strace/strace.mk | 3 +- buildroot/package/stress-ng/stress-ng.hash | 2 +- buildroot/package/stress-ng/stress-ng.mk | 11 +- buildroot/package/strongswan/strongswan.hash | 6 +- buildroot/package/strongswan/strongswan.mk | 3 +- buildroot/package/subversion/subversion.hash | 4 +- buildroot/package/subversion/subversion.mk | 3 +- buildroot/package/sudo/sudo.mk | 5 +- buildroot/package/sunxi-boards/Config.in | 5 + ...01-mali-support-building-against-5.9.patch | 269 -- ...2-mali-support-building-against-5.10.patch | 98 - .../sunxi-mali-mainline-driver/Config.in | 4 + .../sunxi-mali-mainline-driver.hash | 2 +- .../sunxi-mali-mainline-driver.mk | 3 +- .../sunxi-mali-mainline.hash | 4 +- buildroot/package/sunxi-tools/Config.in | 6 +- buildroot/package/sunxi-tools/Config.in.host | 5 + buildroot/package/swupdate/swupdate.sh | 3 + buildroot/package/sysklogd/Config.in | 44 +- buildroot/package/sysklogd/klogd.service | 11 - buildroot/package/sysklogd/sysklogd.hash | 4 +- buildroot/package/sysklogd/sysklogd.mk | 32 +- buildroot/package/sysklogd/syslog.conf | 7 - buildroot/package/sysklogd/syslogd.service | 4 +- buildroot/package/syslog-ng/syslog-ng.conf | 2 +- buildroot/package/syslog-ng/syslog-ng.hash | 2 +- buildroot/package/syslog-ng/syslog-ng.mk | 3 +- buildroot/package/sysrepo/sysrepo.hash | 2 +- buildroot/package/sysrepo/sysrepo.mk | 2 +- buildroot/package/sysstat/sysstat.hash | 4 +- buildroot/package/sysstat/sysstat.mk | 12 +- buildroot/package/systemd/Config.in | 18 + buildroot/package/systemd/systemd.hash | 4 +- buildroot/package/systemd/systemd.mk | 11 +- buildroot/package/sysvinit/sysvinit.hash | 2 +- buildroot/package/sysvinit/sysvinit.mk | 2 +- buildroot/package/taglib/Config.in | 10 - buildroot/package/taglib/taglib.mk | 8 - buildroot/package/tar/tar.hash | 6 +- buildroot/package/tar/tar.mk | 9 +- buildroot/package/tcl/tcl.mk | 1 + ...ng-don-t-allocate-a-too-large-buffer.patch | 67 - buildroot/package/tcpdump/tcpdump.hash | 6 +- buildroot/package/tcpdump/tcpdump.mk | 19 +- buildroot/package/tcpreplay/tcpreplay.mk | 1 + buildroot/package/tegrarcm/Config.in.host | 5 + buildroot/package/tftpd/tftpd.mk | 2 + buildroot/package/thrift/thrift.mk | 1 + buildroot/package/thttpd/thttpd.mk | 1 + .../package/ti-sgx-demos/ti-sgx-demos.hash | 4 +- buildroot/package/ti-sgx-km/ti-sgx-km.hash | 4 +- buildroot/package/ti-sgx-km/ti-sgx-km.mk | 4 +- ...-Add-missing-sys-sysmacros.h-include.patch | 25 - buildroot/package/ti-sgx-libgbm/Config.in | 12 - .../package/ti-sgx-libgbm/ti-sgx-libgbm.hash | 3 - .../package/ti-sgx-libgbm/ti-sgx-libgbm.mk | 32 - buildroot/package/ti-sgx-um/Config.in | 3 +- buildroot/package/ti-sgx-um/ti-sgx-um.hash | 4 +- buildroot/package/ti-sgx-um/ti-sgx-um.mk | 4 +- buildroot/package/tiff/tiff.hash | 2 +- buildroot/package/tiff/tiff.mk | 2 +- ...1-Allow-building-against-PG13-source.patch | 85 + ...-wrapper-functions-for-base64-encodi.patch | 73 + ...003-Add-missing-utils-acl.h-includes.patch | 149 + ...support-for-PG13-List-implementation.patch | 473 ++ ...djust-code-to-PG13-list-sort-changes.patch | 59 + ...y-code-to-PG13-addRTEtoQuery-changes.patch | 37 + ...G13-convert_tuples_by_name-signature.patch | 65 + ...ode-to-PG13-tuple-conversion-changes.patch | 259 ++ ...hypertable-expansion-to-PG13-changes.patch | 88 + ...decompress-code-to-Var-field-renames.patch | 41 + ...1-Adjust-jsonb_utils-to-PG13-changes.patch | 39 + ...AT_DropExpression-in-process_utility.patch | 48 + ...013-Adjust-copy-code-to-PG13-changes.patch | 34 + ...-PG13-command-completion-tag-changes.patch | 186 + ...-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch | 51 + ...ode-to-PG13-planner_hook-signature-c.patch | 58 + ...just-code-to-deparse_context-changes.patch | 34 + .../timescaledb/0018-Update-compat.h.patch | 27 + ...just-code-to-PG13-tuptoaster-changes.patch | 70 + .../package/timescaledb/timescaledb.hash | 2 +- buildroot/package/timescaledb/timescaledb.mk | 3 +- buildroot/package/tinc/tinc.mk | 1 + buildroot/package/tinydtls/tinydtls.mk | 1 + ...er-the-end-of-the-array-and-overwrit.patch | 35 - buildroot/package/tmux/tmux.hash | 4 +- buildroot/package/tmux/tmux.mk | 6 +- buildroot/package/tor/tor.hash | 2 +- buildroot/package/tor/tor.mk | 3 +- buildroot/package/tovid/Config.in | 11 +- buildroot/package/tpm2-pkcs11/Config.in | 14 + .../package/tpm2-pkcs11/tpm2-pkcs11.hash | 3 + buildroot/package/tpm2-pkcs11/tpm2-pkcs11.mk | 46 + ...01-trace-cmd-libtracecmd-API-cleanup.patch | 1486 ++++++ ...0001-trace-listen-add-missing-header.patch | 38 - ...make-it-build-against-musl-C-library.patch | 140 + ...dd_event_pid-out-of-ifndef-NO_PTRACE.patch | 51 + buildroot/package/trace-cmd/trace-cmd.hash | 8 +- buildroot/package/trace-cmd/trace-cmd.mk | 28 +- buildroot/package/tremor/tremor.hash | 4 +- ...-security-issues-that-are-present-if.patch | 90 - .../0004-trousers-resolve-build-failure.patch | 41 - buildroot/package/trousers/trousers.hash | 10 +- buildroot/package/trousers/trousers.mk | 6 +- buildroot/package/ttyd/ttyd.hash | 2 +- buildroot/package/ttyd/ttyd.mk | 2 +- buildroot/package/tvheadend/tvheadend.hash | 2 +- buildroot/package/tvheadend/tvheadend.mk | 2 +- buildroot/package/tzdata/tzdata.mk | 4 +- buildroot/package/uboot-tools/uboot-tools.mk | 21 +- buildroot/package/ubus/ubus.hash | 2 +- .../uclibc-ng-test/uclibc-ng-test.hash | 2 +- ...sh-Add-64-bit-time-types-from-kernel.patch | 33 + buildroot/package/uclibc/uclibc.hash | 4 +- buildroot/package/uclibc/uclibc.mk | 2 +- buildroot/package/uemacs/uemacs.hash | 4 +- buildroot/package/uhd/Config.in | 75 + buildroot/package/uhd/uhd.mk | 68 +- buildroot/package/uhttpd/uhttpd.hash | 2 +- buildroot/package/uhubctl/Config.in | 6 +- buildroot/package/uhubctl/uhubctl.hash | 2 +- buildroot/package/uhubctl/uhubctl.mk | 2 +- buildroot/package/unbound/unbound.hash | 4 +- buildroot/package/unbound/unbound.mk | 3 +- buildroot/package/unzip/unzip.hash | 24 +- buildroot/package/unzip/unzip.mk | 39 +- buildroot/package/upmpdcli/upmpdcli.hash | 4 +- buildroot/package/upmpdcli/upmpdcli.mk | 2 +- buildroot/package/upower/Config.in | 6 +- buildroot/package/upx/upx.mk | 1 + buildroot/package/usb_modeswitch/Config.in | 6 +- .../package/usb_modeswitch_data/Config.in | 6 +- buildroot/package/usbredir/Config.in | 6 +- buildroot/package/usbutils/Config.in | 7 +- buildroot/package/usbutils/usbutils.hash | 6 +- buildroot/package/usbutils/usbutils.mk | 2 +- .../package/ushare/0001-compile-fixes.patch | 206 - ...002-ushare-fix-building-with-gcc-5.x.patch | 49 - ...fig-h-before-checking-for-CONFIG-NLS.patch | 42 - .../0004-switch-to-libupnp-1.14.x-API.patch | 433 -- buildroot/package/ushare/ushare.hash | 2 +- buildroot/package/ushare/ushare.mk | 5 +- .../package/ustream-ssl/ustream-ssl.hash | 4 +- buildroot/package/utf8proc/utf8proc.hash | 4 +- buildroot/package/utf8proc/utf8proc.mk | 2 +- buildroot/package/util-linux/util-linux.mk | 1 + buildroot/package/uvw/uvw.mk | 4 - buildroot/package/vala/vala.mk | 1 + buildroot/package/valgrind/valgrind.mk | 1 + buildroot/package/valijson/valijson.mk | 1 + .../package/vboot-utils/vboot-utils.hash | 2 +- buildroot/package/vde2/vde2.mk | 2 + buildroot/package/vdr/0001-libjpeg.patch | 40 - ...ility-with-current-versions-of-glibc.patch | 27 - buildroot/package/vdr/vdr.hash | 8 +- buildroot/package/vdr/vdr.mk | 9 +- buildroot/package/vim/vim.mk | 1 + buildroot/package/vlc/vlc.mk | 2 +- ...c-Fix-large-alloca-on-bad-AIFF-input.patch | 37 - ...count-of-channels-in-the-header-CVE-.patch | 88 - ...-on-raw-file-close-reported-by-Hanno.patch | 55 - .../package/vorbis-tools/vorbis-tools.hash | 2 +- .../package/vorbis-tools/vorbis-tools.mk | 14 +- buildroot/package/vsftpd/vsftpd.mk | 1 + buildroot/package/vuejs/vuejs.hash | 3 +- buildroot/package/vuejs/vuejs.mk | 9 +- buildroot/package/waf/waf.hash | 9 +- buildroot/package/waf/waf.mk | 2 +- buildroot/package/wavpack/wavpack.mk | 1 + buildroot/package/wayland/wayland.mk | 1 + buildroot/package/webkitgtk/webkitgtk.hash | 8 +- buildroot/package/webkitgtk/webkitgtk.mk | 3 +- buildroot/package/webp/webp.hash | 4 +- buildroot/package/webp/webp.mk | 4 +- buildroot/package/websocketpp/websocketpp.mk | 1 + buildroot/package/wget/wget.mk | 1 + .../wilink-bt-firmware.hash | 4 +- buildroot/package/wine/wine.mk | 1 + .../wireguard-linux-compat.hash | 4 +- .../wireguard-linux-compat.mk | 2 +- .../package/wireless-regdb/wireless-regdb.mk | 1 + .../package/wireless_tools/wireless_tools.mk | 2 + buildroot/package/wireshark/wireshark.hash | 6 +- buildroot/package/wireshark/wireshark.mk | 3 +- buildroot/package/wlroots/wlroots.hash | 4 +- buildroot/package/wlroots/wlroots.mk | 4 +- buildroot/package/wolfssl/wolfssl.mk | 1 + .../wpa_supplicant/wpa_supplicant.hash | 1 + .../package/wpa_supplicant/wpa_supplicant.mk | 4 + buildroot/package/wpewebkit/wpewebkit.hash | 8 +- buildroot/package/wpewebkit/wpewebkit.mk | 4 +- buildroot/package/wqy-zenhei/Config.in | 16 + buildroot/package/wqy-zenhei/wqy-zenhei.hash | 6 + buildroot/package/wqy-zenhei/wqy-zenhei.mk | 27 + buildroot/package/x11r7/libxcb/libxcb.mk | 10 +- .../xapp_fonttosfnt/xapp_fonttosfnt.hash | 10 +- .../x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk | 2 +- .../x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 8 +- .../x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 2 +- .../package/x11r7/xapp_xprop/xapp_xprop.hash | 10 +- .../package/x11r7/xapp_xprop/xapp_xprop.mk | 2 +- .../package/x11r7/xcb-proto/xcb-proto.hash | 8 +- .../package/x11r7/xcb-proto/xcb-proto.mk | 12 +- .../xdriver_xf86-video-imx-viv.hash | 2 +- .../xdriver_xf86-video-intel.hash | 2 +- .../xdriver_xf86-video-vesa.hash | 10 +- .../xdriver_xf86-video-vesa.mk | 2 +- .../xfont_font-alias/xfont_font-alias.hash | 4 +- .../xfont_font-alias/xfont_font-alias.mk | 2 +- .../xfont_font-misc-ethiopic.hash | 4 +- .../xfont_font-misc-ethiopic.mk | 2 +- .../xkeyboard-config/xkeyboard-config.hash | 2 +- .../xkeyboard-config/xkeyboard-config.mk | 2 +- .../x11r7/xlib_libX11/xlib_libX11.hash | 6 +- .../package/x11r7/xlib_libX11/xlib_libX11.mk | 4 +- .../package/x11r7/xlib_libXi/xlib_libXi.mk | 2 + .../x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 + .../x11r7/xlib_libXrender/xlib_libXrender.mk | 2 + .../package/x11r7/xlib_libXt/xlib_libXt.hash | 11 +- .../package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +- .../package/x11r7/xlib_libXv/xlib_libXv.mk | 2 + .../x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 + ...002-Remove-check-for-useSIGIO-option.patch | 53 - ...002-include-misc.h-fix-uClibc-build.patch} | 0 ...d-Makefile.am-fix-build-without-glx.patch} | 0 ...on-xf86Init.c-fix-build-without-glx.patch} | 0 ...robing-a-non-PCI-platform-device-on.patch} | 0 .../xserver_xorg-server.mk | 3 + buildroot/package/x11vnc/x11vnc.mk | 1 + buildroot/package/x265/x265.mk | 1 + buildroot/package/xapian/xapian.hash | 4 +- buildroot/package/xapian/xapian.mk | 4 +- buildroot/package/xen/xen.mk | 2 + ...Allow-building-with-GCC-10-2-2020101.patch | 1721 +++++++ buildroot/package/xenomai/Config.in | 15 +- buildroot/package/xenomai/xenomai.mk | 2 +- ...s-to-fail-and-fall-back-to-nothreads.patch | 38 - ...> 0001-fix-static-linking-with-curl.patch} | 0 buildroot/package/xerces/xerces.hash | 6 +- buildroot/package/xerces/xerces.mk | 9 +- buildroot/package/xfsprogs/Config.in | 1 + buildroot/package/xfsprogs/xfsprogs.hash | 2 +- buildroot/package/xfsprogs/xfsprogs.mk | 4 +- buildroot/package/xinetd/xinetd.hash | 2 +- buildroot/package/xinetd/xinetd.mk | 6 +- buildroot/package/xorcurses/Config.in | 11 + buildroot/package/xorcurses/xorcurses.hash | 3 + buildroot/package/xorcurses/xorcurses.mk | 27 + buildroot/package/xscreensaver/Config.in | 10 +- .../package/xscreensaver/xscreensaver.hash | 2 +- .../package/xscreensaver/xscreensaver.mk | 70 +- buildroot/package/xtables-addons/Config.in | 2 +- .../xtables-addons/xtables-addons.hash | 2 +- .../package/xtables-addons/xtables-addons.mk | 4 +- buildroot/package/xterm/xterm.hash | 4 +- buildroot/package/xterm/xterm.mk | 3 +- .../xutil_util-macros/xutil_util-macros.hash | 8 +- .../xutil_util-macros/xutil_util-macros.mk | 2 +- buildroot/package/xz/xz.mk | 1 + buildroot/package/yaml-cpp/yaml-cpp.mk | 1 + buildroot/package/ytree/ytree.hash | 2 +- buildroot/package/ytree/ytree.mk | 2 +- ...pp-fix-build-with-libbsd-and-strlcpy.patch | 107 - buildroot/package/zeromq/Config.in | 5 + buildroot/package/zeromq/zeromq.hash | 6 +- buildroot/package/zeromq/zeromq.mk | 26 +- buildroot/package/zip/zip.mk | 1 + buildroot/package/znc/znc.mk | 6 +- buildroot/package/zsh/zsh.mk | 1 + ...ms-util.c-fix-build-without-st_mtime.patch | 40 - buildroot/package/zstd/zstd.hash | 6 +- buildroot/package/zstd/zstd.mk | 26 +- buildroot/package/zziplib/zziplib.hash | 2 +- buildroot/package/zziplib/zziplib.mk | 21 +- .../autobuild/bootlin-aarch64-glibc.config | 4 + .../bootlin-arcle-hs38-uclibc.config | 5 + .../autobuild/bootlin-armv5-uclibc.config | 4 + .../autobuild/bootlin-armv7-glibc.config | 6 + .../autobuild/bootlin-armv7-musl.config | 6 + .../autobuild/bootlin-armv7m-uclibc.config | 4 + .../autobuild/bootlin-m68k-5208-uclibc.config | 4 + .../bootlin-m68k-68040-uclibc.config | 4 + .../bootlin-microblazeel-uclibc.config | 3 + .../autobuild/bootlin-mipsel-uclibc.config | 4 + .../autobuild/bootlin-mipsel32r6-glibc.config | 6 + .../autobuild/bootlin-nios2-glibc.config | 4 + .../autobuild/bootlin-openrisc-uclibc.config | 3 + .../bootlin-powerpc-e500mc-uclibc.config | 4 + .../bootlin-powerpc64le-power8-glibc.config | 4 + .../autobuild/bootlin-riscv32-glibc.config | 5 + .../autobuild/bootlin-riscv64-glibc.config | 5 + .../autobuild/bootlin-riscv64-musl.config | 4 + .../autobuild/bootlin-sh4-uclibc.config | 3 + .../autobuild/bootlin-sparc-uclibc.config | 3 + .../autobuild/bootlin-sparc64-glibc.config | 3 + .../autobuild/bootlin-x86-64-musl.config | 4 + .../autobuild/bootlin-x86-64-uclibc.config | 4 + .../autobuild/bootlin-xtensa-uclibc.config | 3 + .../autobuild/br-aarch64-glibc.config | 9 - .../autobuild/br-arcle-hs38.config | 11 - .../autobuild/br-arm-basic.config | 6 +- .../autobuild/br-arm-cortex-a9-glibc.config | 11 - .../autobuild/br-arm-cortex-a9-musl.config | 11 - .../autobuild/br-arm-cortex-m4-full.config | 12 - .../autobuild/br-arm-full-nothread.config | 6 +- .../autobuild/br-arm-full-static.config | 4 +- .../autobuild/br-arm-full.config | 10 - .../autobuild/br-i386-pentium-mmx-musl.config | 4 +- .../autobuild/br-i386-pentium4-full.config | 4 +- .../autobuild/br-m68k-5208-full.config | 11 - .../autobuild/br-m68k-68040-full.config | 10 - .../autobuild/br-microblazeel-full.config | 9 - .../autobuild/br-mips32r6-el-hf-glibc.config | 11 - .../autobuild/br-mips64-n64-full.config | 6 +- .../autobuild/br-mips64r6-el-hf-glibc.config | 6 +- .../autobuild/br-mipsel-o32-full.config | 10 - .../autobuild/br-nios2-glibc.config | 9 - .../autobuild/br-openrisc-uclibc.config | 9 - .../br-powerpc-603e-basic-cpp.config | 6 +- .../autobuild/br-powerpc-e500mc-full.config | 11 - .../br-powerpc64-power7-glibc.config | 6 +- .../br-powerpc64le-power8-glibc.config | 9 - .../autobuild/br-riscv32.config | 9 - .../autobuild/br-riscv64-musl.config | 9 - .../autobuild/br-riscv64.config | 8 - .../autobuild/br-sh4-full.config | 10 - .../autobuild/br-sparc-uclibc.config | 9 - .../autobuild/br-sparc64-glibc.config | 8 - .../autobuild/br-x86-64-core2-full.config | 11 - .../autobuild/br-x86-64-musl.config | 10 - .../autobuild/br-xtensa-full.config | 9 - .../autobuild/toolchain-configs.csv | 48 +- .../support/dependencies/check-host-cmake.mk | 9 +- .../support/dependencies/check-host-tar.sh | 14 +- buildroot/support/download/git | 31 +- buildroot/support/download/helpers | 76 + buildroot/support/download/svn | 27 +- buildroot/support/misc/Vagrantfile | 2 +- buildroot/support/scripts/boot-qemu-image.py | 10 +- buildroot/support/scripts/cpedb.py | 174 + buildroot/support/scripts/cve.py | 50 +- .../support/scripts/gen-bootlin-toolchains | 2 - buildroot/support/scripts/pkg-stats | 164 +- .../support/testing/tests/boot/test_atf.py | 31 +- .../tests/core/cpeid-br2-external/Config.in | 0 .../core/cpeid-br2-external/external.desc | 1 + .../tests/core/cpeid-br2-external/external.mk | 1 + .../package/cpe-id-pkg1/cpe-id-pkg1.mk | 4 + .../package/cpe-id-pkg2/cpe-id-pkg2.mk | 3 + .../package/cpe-id-pkg3/cpe-id-pkg3.mk | 5 + .../package/cpe-id-pkg4/cpe-id-pkg4.mk | 9 + .../package/cpe-id-pkg5/cpe-id-pkg5.mk | 16 + .../support/testing/tests/core/test_cpeid.py | 110 + .../git-hash/package/bad/bad.hash | 2 +- .../git-hash/package/good/good.hash | 2 +- .../git-partial-sha1-branch-head.hash | 2 +- .../git-partial-sha1-reachable-by-branch.hash | 2 +- .../git-partial-sha1-reachable-by-tag.hash | 2 +- .../git-partial-sha1-tag-itself.hash | 2 +- .../git-partial-sha1-tag-points-to.hash | 2 +- .../git-sha1-branch-head.hash | 2 +- .../git-sha1-reachable-by-branch.hash | 2 +- .../git-sha1-reachable-by-tag.hash | 2 +- .../git-sha1-tag-itself.hash | 2 +- .../git-sha1-tag-points-to.hash | 2 +- .../git-submodule-disabled.hash | 2 +- .../git-submodule-enabled.hash | 2 +- .../git-refs/package/git-tag/git-tag.hash | 2 +- .../git-wrong-content/git-wrong-content.hash | 2 +- .../package/sample_python_pytest_asyncio.py | 31 + .../testing/tests/package/test_lualdap.py | 25 + .../package/test_python_pytest_asyncio.py | 20 + buildroot/toolchain/Config.in | 5 + .../toolchain/toolchain-buildroot/Config.in | 3 +- .../Config.in | 4 +- .../toolchain-external-arm-aarch64-be.hash | 6 +- .../toolchain-external-arm-aarch64-be.mk | 6 +- .../toolchain-external-arm-aarch64/Config.in | 4 +- .../toolchain-external-arm-aarch64.hash | 6 +- .../toolchain-external-arm-aarch64.mk | 6 +- .../toolchain-external-arm-arm/Config.in | 8 +- .../toolchain-external-arm-arm.hash | 6 +- .../toolchain-external-arm-arm.mk | 6 +- .../Config.in.options | 1 - .../Config.in.options | 6 +- buildroot/utils/getdeveloperlib.py | 12 - buildroot/utils/scancpan | 13 +- buildroot/utils/scanpypi | 2 +- 2130 files changed, 23612 insertions(+), 21038 deletions(-) rename buildroot-patches/{0003-network-manager-wpa_supplicant.patch => 0002-network-manager-wpa_supplicant.patch} (80%) delete mode 100644 buildroot-patches/0002-rpi-firmware-Bump-firmware.patch rename buildroot-patches/{0004-Fix-dhcp-client.patch => 0003-Fix-dhcp-client.patch} (64%) rename buildroot-patches/{0007-docker-proxy-Bump-version.patch => 0004-docker-proxy-Bump-version.patch} (82%) create mode 100644 buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch delete mode 100644 buildroot-patches/0005-rpi-use-latest-wifi-driver.patch delete mode 100644 buildroot-patches/0006-ODROID-XU4-video-firmware.patch delete mode 100644 buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch delete mode 100644 buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch delete mode 100644 buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch create mode 100644 buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf create mode 100644 buildroot/board/arrow/avenger96/readme.txt create mode 100644 buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg create mode 100644 buildroot/board/pine64/rock64/extlinux.conf create mode 100644 buildroot/board/pine64/rock64/genimage.cfg create mode 100644 buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch create mode 100755 buildroot/board/pine64/rock64/post-build.sh create mode 100644 buildroot/board/pine64/rock64/readme.txt delete mode 100644 buildroot/board/qemu/ppc-virtex-ml507/linux.config delete mode 100644 buildroot/board/qemu/ppc-virtex-ml507/readme.txt delete mode 100644 buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch delete mode 100644 buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch delete mode 100644 buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch delete mode 100644 buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch delete mode 100644 buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch delete mode 100644 buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch create mode 100644 buildroot/board/sifive/hifive-unleashed/boot.cmd rename buildroot/board/sifive/hifive-unleashed/{genimage.cfg => genimage_sdcard.cfg} (51%) create mode 100644 buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg create mode 100755 buildroot/board/sifive/hifive-unleashed/post-build.sh create mode 100644 buildroot/board/sinovoip/m1-plus/boot.cmd create mode 100644 buildroot/board/sinovoip/m1-plus/genimage.cfg create mode 100644 buildroot/board/sinovoip/m1-plus/linux-wifi.fragment create mode 100644 buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch create mode 100755 buildroot/board/sinovoip/m1-plus/post-build.sh create mode 100644 buildroot/board/sinovoip/m1-plus/readme.txt create mode 120000 buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt create mode 100644 buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt delete mode 100644 buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch create mode 100644 buildroot/configs/avenger96_defconfig create mode 100644 buildroot/configs/bananapi_m1_plus_defconfig create mode 100644 buildroot/configs/microchip_sam9x60ek_mmc_defconfig create mode 100644 buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig delete mode 100644 buildroot/configs/qemu_ppc_virtex_ml507_defconfig create mode 100644 buildroot/configs/rock64_defconfig create mode 100644 buildroot/package/abootimg/Config.in.host delete mode 120000 buildroot/package/apparmor/3.0.0 delete mode 100644 buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch delete mode 100644 buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch delete mode 100644 buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch create mode 100644 buildroot/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch create mode 100644 buildroot/package/atop/0002-photosyst.c-fix-build-on-musl.patch delete mode 100644 buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch delete mode 100644 buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch delete mode 100644 buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch delete mode 100644 buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch delete mode 100644 buildroot/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch delete mode 100644 buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch delete mode 100644 buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch delete mode 100644 buildroot/package/audiofile/0008-CVE-2015-7747.patch delete mode 100644 buildroot/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch delete mode 100644 buildroot/package/audiofile/Config.in delete mode 100644 buildroot/package/audiofile/audiofile.hash delete mode 100644 buildroot/package/audiofile/audiofile.mk delete mode 100644 buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch create mode 100644 buildroot/package/balena-engine/Config.in create mode 100644 buildroot/package/balena-engine/balena-engine.hash create mode 100644 buildroot/package/balena-engine/balena-engine.mk delete mode 100644 buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch delete mode 100644 buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch delete mode 100644 buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch rename buildroot/package/binutils/{2.35.1 => 2.35.2}/0001-sh-conf.patch (100%) rename buildroot/package/binutils/{2.35.1 => 2.35.2}/0002-poison-system-directories.patch (100%) rename buildroot/package/binutils/{2.33.1 => 2.36.1}/0001-sh-conf.patch (84%) rename buildroot/package/binutils/{2.33.1 => 2.36.1}/0002-poison-system-directories.patch (87%) delete mode 100644 buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch create mode 100755 buildroot/package/bluez5_utils/S40bluetooth delete mode 100644 buildroot/package/boa/0001-use-name-max.patch delete mode 100644 buildroot/package/boa/Config.in delete mode 100644 buildroot/package/boa/boa.conf delete mode 100644 buildroot/package/boa/boa.hash delete mode 100644 buildroot/package/boa/boa.mk delete mode 100644 buildroot/package/boa/mime.types rename buildroot/package/boost/{0002-fenv.patch => 0001-fenv.patch} (100%) delete mode 100644 buildroot/package/boost/0001-fix-uclibc-eventfd.patch create mode 100644 buildroot/package/botan/0001-Add--extra-libs-option-and-group-l-flags-from-LDFLAGS-to-the-end.patch delete mode 100644 buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch create mode 100644 buildroot/package/botan/0002-Avoid-empty-l.patch create mode 100644 buildroot/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch delete mode 100644 buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch delete mode 100644 buildroot/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch create mode 100644 buildroot/package/busybox/0003-update_passwd-fix-context-variable.patch delete mode 100644 buildroot/package/c-ares/0001-src-lib-Makefile.am-install-ares_dns.h.patch create mode 100644 buildroot/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch create mode 100644 buildroot/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch create mode 100644 buildroot/package/casync/Config.in create mode 100644 buildroot/package/casync/casync.hash create mode 100644 buildroot/package/casync/casync.mk create mode 100644 buildroot/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch create mode 100644 buildroot/package/chrony/0001-sys_linux-fix-build-with-older-kernel-headers.patch create mode 100644 buildroot/package/coremark-pro/Config.in create mode 100644 buildroot/package/coremark-pro/coremark-pro.hash create mode 100644 buildroot/package/coremark-pro/coremark-pro.mk create mode 100755 buildroot/package/coremark-pro/coremark-pro.sh.in create mode 100644 buildroot/package/coremark/Config.in create mode 100644 buildroot/package/coremark/coremark.hash create mode 100644 buildroot/package/coremark/coremark.mk delete mode 100644 buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch create mode 100644 buildroot/package/datatables-buttons/Config.in create mode 100644 buildroot/package/datatables-buttons/datatables-buttons.hash create mode 100644 buildroot/package/datatables-buttons/datatables-buttons.mk create mode 100644 buildroot/package/datatables-fixedcolumns/Config.in create mode 100644 buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.hash create mode 100644 buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.mk create mode 100644 buildroot/package/datatables-responsive/Config.in create mode 100644 buildroot/package/datatables-responsive/datatables-responsive.hash create mode 100644 buildroot/package/datatables-responsive/datatables-responsive.mk create mode 100644 buildroot/package/datatables/Config.in create mode 100644 buildroot/package/datatables/datatables.hash create mode 100644 buildroot/package/datatables/datatables.mk create mode 100644 buildroot/package/delve/Config.in create mode 100644 buildroot/package/delve/delve.hash create mode 100644 buildroot/package/delve/delve.mk delete mode 100644 buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch create mode 100644 buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch create mode 100644 buildroot/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch create mode 100644 buildroot/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch delete mode 100644 buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch create mode 100644 buildroot/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch create mode 100644 buildroot/package/erlang-p1-sip/0001-correct-include.patch delete mode 100644 buildroot/package/erlang-p1-sip/0001-fix-includes.patch create mode 100644 buildroot/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch create mode 100644 buildroot/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch create mode 100644 buildroot/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch create mode 100644 buildroot/package/fakeroot/0005-fix-build-regression-on-macOS.patch create mode 100644 buildroot/package/ffmpeg/0003-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch create mode 100644 buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch create mode 100644 buildroot/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch create mode 100644 buildroot/package/frotz/Config.in create mode 100644 buildroot/package/frotz/frotz.hash create mode 100644 buildroot/package/frotz/frotz.mk delete mode 100644 buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch delete mode 100644 buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch delete mode 100644 buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch delete mode 100644 buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch delete mode 100644 buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch delete mode 100644 buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch delete mode 100644 buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch rename buildroot/package/gdb/{8.2.1 => 10.1}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (65%) rename buildroot/package/gdb/{8.2.1 => 10.1}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (71%) rename buildroot/package/gdb/{8.2.1 => 10.1}/0003-use-asm-sgidefs.h.patch (90%) rename buildroot/package/gdb/{8.2.1 => 10.1}/0004-gdbserver-fix-build-for-m68k.patch (78%) rename buildroot/package/gdb/{8.2.1 => 10.1}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (82%) delete mode 100644 buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch create mode 100644 buildroot/package/gdk-pixbuf/0001-meson.build-link-with-lintl-if-needed.patch create mode 100644 buildroot/package/gdk-pixbuf/0002-gdk-pixbuf-gdk-pixbuf-io.c-fix-build-without-gmodule.patch create mode 100644 buildroot/package/git/0001-Fix-build-without-threads.patch create mode 100644 buildroot/package/gkrellm/Config.in create mode 100644 buildroot/package/gkrellm/gkrellm.hash create mode 100644 buildroot/package/gkrellm/gkrellm.mk delete mode 100644 buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash rename buildroot/package/glibc/{2.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5 => 2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2}/glibc.hash (70%) delete mode 100644 buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch create mode 100644 buildroot/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch delete mode 100644 buildroot/package/grpc/0001-target-build-using-host-plugin.patch create mode 100644 buildroot/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch delete mode 100644 buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch delete mode 100644 buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch rename buildroot/package/harfbuzz/{0002-meson.build-check-for-pthread.h.patch => 0001-meson.build-check-for-pthread.h.patch} (97%) delete mode 100644 buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch create mode 100644 buildroot/package/i7z/0001-fix-build-with-gcc-10.patch create mode 100644 buildroot/package/inih/0001-meson-optionally-depend-on-c.patch create mode 100644 buildroot/package/inih/Config.in create mode 100644 buildroot/package/inih/inih.hash create mode 100644 buildroot/package/inih/inih.mk create mode 100644 buildroot/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch delete mode 100644 buildroot/package/ipsec-tools/0001-susv3-legacy.patch delete mode 100644 buildroot/package/ipsec-tools/0002-configure-automake.patch delete mode 100644 buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch delete mode 100644 buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch delete mode 100644 buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch delete mode 100644 buildroot/package/ipsec-tools/0006-openssl-1.1.patch delete mode 100644 buildroot/package/ipsec-tools/Config.in delete mode 100644 buildroot/package/ipsec-tools/ipsec-tools.hash delete mode 100644 buildroot/package/ipsec-tools/ipsec-tools.mk delete mode 100644 buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch create mode 100644 buildroot/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch create mode 100644 buildroot/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch delete mode 100644 buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch create mode 100644 buildroot/package/jszip/Config.in create mode 100644 buildroot/package/jszip/jszip.hash create mode 100644 buildroot/package/jszip/jszip.mk delete mode 100644 buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch delete mode 100644 buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch create mode 100644 buildroot/package/kmsxx/0001-meson-add-use-system-fmt-option.patch delete mode 100644 buildroot/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch create mode 100644 buildroot/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch create mode 100644 buildroot/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch delete mode 100644 buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch delete mode 100644 buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch delete mode 100644 buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch delete mode 100644 buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch delete mode 100644 buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch delete mode 100644 buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch delete mode 100644 buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch delete mode 100644 buildroot/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch delete mode 100644 buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch delete mode 100644 buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch delete mode 100644 buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch delete mode 100644 buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch rename buildroot/package/libgcrypt/{0002-configure.ac-add-an-option-to-disable-tests.patch => 0001-configure.ac-add-an-option-to-disable-tests.patch} (100%) create mode 100644 buildroot/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch create mode 100644 buildroot/package/libgeos/Config.in create mode 100644 buildroot/package/libgeos/libgeos.hash create mode 100644 buildroot/package/libgeos/libgeos.mk create mode 100644 buildroot/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch create mode 100644 buildroot/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch create mode 100644 buildroot/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch create mode 100644 buildroot/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch create mode 100644 buildroot/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch create mode 100644 buildroot/package/libiec61850/Config.in create mode 100644 buildroot/package/libiec61850/libiec61850.hash create mode 100644 buildroot/package/libiec61850/libiec61850.mk create mode 100644 buildroot/package/libmdbx/Config.in create mode 100644 buildroot/package/libmdbx/libmdbx.hash create mode 100644 buildroot/package/libmdbx/libmdbx.mk delete mode 100644 buildroot/package/libnss/0001-fix-old-abi-ppc.patch create mode 100644 buildroot/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch delete mode 100644 buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch delete mode 100644 buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch delete mode 100644 buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch delete mode 100644 buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch delete mode 100644 buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch delete mode 100644 buildroot/package/libuhttpd/0001-src-CMakeLists.txt-fix-static-build-with-a-zlib-and-.patch delete mode 100644 buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch delete mode 100644 buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch create mode 100644 buildroot/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch create mode 100644 buildroot/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch delete mode 100644 buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch delete mode 100644 buildroot/package/linux-pam/0002-fix-build-on-musl.patch rename buildroot/package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0001-HACK-only-build-and-install-localedef.patch (100%) rename buildroot/package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename buildroot/package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/localedef.hash (70%) delete mode 100644 buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch create mode 100644 buildroot/package/lualdap/Config.in create mode 100644 buildroot/package/lualdap/lualdap.hash create mode 100644 buildroot/package/lualdap/lualdap.mk delete mode 100644 buildroot/package/luasyslog/0001-compat-Lua-5.3.patch create mode 100644 buildroot/package/luasyslog/0001-remove-AX_LUA_LIBS.patch rename buildroot/package/makedumpfile/{0002-PATCH-Define-PN_XNUM-if-missing.patch => 0001-PATCH-Define-PN_XNUM-if-missing.patch} (100%) delete mode 100644 buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch create mode 100644 buildroot/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch delete mode 100644 buildroot/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch delete mode 100644 buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch delete mode 100644 buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch delete mode 100644 buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch delete mode 100644 buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch delete mode 100644 buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch delete mode 100644 buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch create mode 100644 buildroot/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch rename buildroot/package/{sysklogd/S02klogd => mrouted/S41mrouted} (77%) mode change 100644 => 100755 delete mode 100644 buildroot/package/musl/0003-rewrite-wcsnrtombs-to-fix-buffer-overflow-and-other-.patch create mode 100644 buildroot/package/neofetch/Config.in create mode 100644 buildroot/package/neofetch/neofetch.hash create mode 100644 buildroot/package/neofetch/neofetch.mk delete mode 100644 buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch delete mode 100644 buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch delete mode 100644 buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch delete mode 100644 buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch delete mode 100644 buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch delete mode 100644 buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch delete mode 100644 buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch delete mode 100644 buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch delete mode 100644 buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch delete mode 100644 buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch delete mode 100644 buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch delete mode 100644 buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch create mode 100644 buildroot/package/nvidia-modprobe/Config.in create mode 100644 buildroot/package/nvidia-modprobe/nvidia-modprobe.hash create mode 100644 buildroot/package/nvidia-modprobe/nvidia-modprobe.mk create mode 100644 buildroot/package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch create mode 100644 buildroot/package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch create mode 100644 buildroot/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch create mode 100644 buildroot/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch create mode 100644 buildroot/package/open62541/Config.in create mode 100644 buildroot/package/open62541/open62541.hash create mode 100644 buildroot/package/open62541/open62541.mk create mode 100644 buildroot/package/openblas/0001-fix-gfortran-detection.patch create mode 100644 buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch delete mode 100644 buildroot/package/openswan/0001-fix-build-with-gcc-10.patch create mode 100644 buildroot/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch create mode 100644 buildroot/package/perl-devel-cycle/Config.in create mode 100644 buildroot/package/perl-devel-cycle/perl-devel-cycle.hash create mode 100644 buildroot/package/perl-devel-cycle/perl-devel-cycle.mk create mode 100644 buildroot/package/perl-devel-size/Config.in create mode 100644 buildroot/package/perl-devel-size/perl-devel-size.hash create mode 100644 buildroot/package/perl-devel-size/perl-devel-size.mk create mode 100644 buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash create mode 100644 buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk create mode 100644 buildroot/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch create mode 100644 buildroot/package/perl-math-int64/Config.in create mode 100644 buildroot/package/perl-math-int64/perl-math-int64.hash create mode 100644 buildroot/package/perl-math-int64/perl-math-int64.mk delete mode 100644 buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch delete mode 100644 buildroot/package/pixz/0001-fix-linkage.patch create mode 100644 buildroot/package/ply/0001-configure.ac-fix-error-with-version-string.patch create mode 100644 buildroot/package/ply/0002-printxf.h-add-stdarg.h-in-include.patch create mode 100644 buildroot/package/ply/Config.in create mode 100644 buildroot/package/ply/ply.hash create mode 100644 buildroot/package/ply/ply.mk create mode 100644 buildroot/package/popperjs/Config.in create mode 100644 buildroot/package/popperjs/popperjs.hash create mode 100644 buildroot/package/popperjs/popperjs.mk create mode 100644 buildroot/package/python-bleak/Config.in create mode 100644 buildroot/package/python-bleak/python-bleak.hash create mode 100644 buildroot/package/python-bleak/python-bleak.mk create mode 100644 buildroot/package/python-defusedxml/Config.in create mode 100644 buildroot/package/python-defusedxml/python-defusedxml.hash create mode 100644 buildroot/package/python-defusedxml/python-defusedxml.mk delete mode 100644 buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch create mode 100644 buildroot/package/python-pycups/Config.in create mode 100644 buildroot/package/python-pycups/python-pycups.hash create mode 100644 buildroot/package/python-pycups/python-pycups.mk create mode 100644 buildroot/package/python-pytest-asyncio/Config.in create mode 100644 buildroot/package/python-pytest-asyncio/python-pytest-asyncio.hash create mode 100644 buildroot/package/python-pytest-asyncio/python-pytest-asyncio.mk create mode 100644 buildroot/package/python-typing-extensions/Config.in create mode 100644 buildroot/package/python-typing-extensions/python-typing-extensions.hash create mode 100644 buildroot/package/python-typing-extensions/python-typing-extensions.mk create mode 120000 buildroot/package/python3-jinja2/python3-jinja2.hash create mode 100644 buildroot/package/python3-jinja2/python3-jinja2.mk create mode 120000 buildroot/package/python3-markupsafe/python3-markupsafe.hash create mode 100644 buildroot/package/python3-markupsafe/python3-markupsafe.mk create mode 120000 buildroot/package/python3-ply/python3-ply.hash create mode 100644 buildroot/package/python3-ply/python3-ply.mk create mode 100644 buildroot/package/qcom-db410c-firmware/Config.in create mode 100644 buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.hash create mode 100644 buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.mk create mode 100644 buildroot/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch create mode 100644 buildroot/package/qemu/0004-meson-add-tests-option.patch rename buildroot/package/{rcw => qoriq-rcw}/Config.in.host (86%) create mode 100644 buildroot/package/qoriq-rcw/qoriq-rcw.hash create mode 100644 buildroot/package/qoriq-rcw/qoriq-rcw.mk create mode 100644 buildroot/package/qt5/qt5coap/Config.in create mode 100644 buildroot/package/qt5/qt5coap/qt5coap.hash create mode 100644 buildroot/package/qt5/qt5coap/qt5coap.mk create mode 100644 buildroot/package/qt5/qt5knx/Config.in create mode 100644 buildroot/package/qt5/qt5knx/qt5knx.hash create mode 100644 buildroot/package/qt5/qt5knx/qt5knx.mk create mode 100644 buildroot/package/qt5/qt5mqtt/Config.in create mode 100644 buildroot/package/qt5/qt5mqtt/qt5mqtt.hash create mode 100644 buildroot/package/qt5/qt5mqtt/qt5mqtt.mk create mode 100644 buildroot/package/quickjs/0001-Makefile-add-optional-link-with-libatomic.patch create mode 100644 buildroot/package/quickjs/Config.in create mode 100644 buildroot/package/quickjs/quickjs.hash create mode 100644 buildroot/package/quickjs/quickjs.mk delete mode 100644 buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch create mode 100644 buildroot/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch delete mode 100644 buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch delete mode 100644 buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch create mode 100644 buildroot/package/rcw-smarc-sal28/Config.in create mode 100644 buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.hash create mode 100644 buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.mk delete mode 100644 buildroot/package/rcw/rcw.hash delete mode 100644 buildroot/package/rcw/rcw.mk create mode 100644 buildroot/package/rhash/0001-configure-allow-cross-compilation.patch create mode 100644 buildroot/package/rhash/0002-configure-add-uclinux-target.patch delete mode 100644 buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch delete mode 100644 buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch create mode 100644 buildroot/package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch delete mode 100644 buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch delete mode 100644 buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch delete mode 100644 buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch create mode 100644 buildroot/package/samba4/0005-nsswitch-nsstest-c-Avoid-nss-function-conflicts-with-glibc-nss-h.patch create mode 100644 buildroot/package/screen/0008_CVE-2021-26937.patch create mode 100644 buildroot/package/screenfetch/Config.in create mode 100644 buildroot/package/screenfetch/screenfetch.hash create mode 100644 buildroot/package/screenfetch/screenfetch.mk delete mode 100644 buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch rename buildroot/package/sdl2/{0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch => 0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch} (57%) delete mode 100644 buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch create mode 100644 buildroot/package/sox/0002-configure.ac-put-back-disable-stack-protector.patch create mode 100644 buildroot/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch create mode 100644 buildroot/package/ssdp-responder/Config.in create mode 100755 buildroot/package/ssdp-responder/S50ssdpd create mode 100644 buildroot/package/ssdp-responder/ssdp-responder.hash create mode 100644 buildroot/package/ssdp-responder/ssdp-responder.mk delete mode 100644 buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch delete mode 100644 buildroot/package/sunxi-mali-mainline-driver/0001-mali-support-building-against-5.9.patch delete mode 100644 buildroot/package/sunxi-mali-mainline-driver/0002-mali-support-building-against-5.10.patch delete mode 100644 buildroot/package/sysklogd/klogd.service delete mode 100644 buildroot/package/sysklogd/syslog.conf delete mode 100644 buildroot/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch delete mode 100644 buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch delete mode 100644 buildroot/package/ti-sgx-libgbm/Config.in delete mode 100644 buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash delete mode 100644 buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk create mode 100644 buildroot/package/timescaledb/0001-Allow-building-against-PG13-source.patch create mode 100644 buildroot/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch create mode 100644 buildroot/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch create mode 100644 buildroot/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch create mode 100644 buildroot/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch create mode 100644 buildroot/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch create mode 100644 buildroot/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch create mode 100644 buildroot/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch create mode 100644 buildroot/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch create mode 100644 buildroot/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch create mode 100644 buildroot/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch create mode 100644 buildroot/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch create mode 100644 buildroot/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch create mode 100644 buildroot/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch create mode 100644 buildroot/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch create mode 100644 buildroot/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch create mode 100644 buildroot/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch create mode 100644 buildroot/package/timescaledb/0018-Update-compat.h.patch create mode 100644 buildroot/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch delete mode 100644 buildroot/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch create mode 100644 buildroot/package/tpm2-pkcs11/Config.in create mode 100644 buildroot/package/tpm2-pkcs11/tpm2-pkcs11.hash create mode 100644 buildroot/package/tpm2-pkcs11/tpm2-pkcs11.mk create mode 100644 buildroot/package/trace-cmd/0001-trace-cmd-libtracecmd-API-cleanup.patch delete mode 100644 buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch create mode 100644 buildroot/package/trace-cmd/0002-trace-cmd-make-it-build-against-musl-C-library.patch create mode 100644 buildroot/package/trace-cmd/0003-trace-cmd-Move-add_event_pid-out-of-ifndef-NO_PTRACE.patch delete mode 100644 buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch delete mode 100644 buildroot/package/trousers/0004-trousers-resolve-build-failure.patch create mode 100644 buildroot/package/uclibc/0001-arch-sh-Add-64-bit-time-types-from-kernel.patch delete mode 100644 buildroot/package/ushare/0001-compile-fixes.patch delete mode 100644 buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch delete mode 100644 buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch delete mode 100644 buildroot/package/ushare/0004-switch-to-libupnp-1.14.x-API.patch delete mode 100644 buildroot/package/vdr/0001-libjpeg.patch delete mode 100644 buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch delete mode 100644 buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch delete mode 100644 buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch delete mode 100644 buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch create mode 100644 buildroot/package/wqy-zenhei/Config.in create mode 100644 buildroot/package/wqy-zenhei/wqy-zenhei.hash create mode 100644 buildroot/package/wqy-zenhei/wqy-zenhei.mk delete mode 100644 buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch rename buildroot/package/x11r7/xserver_xorg-server/{0003-include-misc.h-fix-uClibc-build.patch => 0002-include-misc.h-fix-uClibc-build.patch} (100%) rename buildroot/package/x11r7/xserver_xorg-server/{0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch => 0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch} (100%) rename buildroot/package/x11r7/xserver_xorg-server/{0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch => 0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch} (100%) rename buildroot/package/x11r7/xserver_xorg-server/{0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch => 0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch} (100%) create mode 100644 buildroot/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch delete mode 100644 buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch rename buildroot/package/xerces/{0002-fix-static-linking-with-curl.patch => 0001-fix-static-linking-with-curl.patch} (100%) create mode 100644 buildroot/package/xorcurses/Config.in create mode 100644 buildroot/package/xorcurses/xorcurses.hash create mode 100644 buildroot/package/xorcurses/xorcurses.mk delete mode 100644 buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch delete mode 100644 buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-aarch64-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-armv5-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-armv7-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-armv7-musl.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-mipsel-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-nios2-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-openrisc-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-riscv32-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-riscv64-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-riscv64-musl.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-sh4-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-sparc-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-sparc64-glibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-x86-64-musl.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-x86-64-uclibc.config create mode 100644 buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-arcle-hs38.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-arm-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-microblazeel-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-nios2-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-riscv32.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-riscv64-musl.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-riscv64.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-sh4-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-x86-64-musl.config delete mode 100644 buildroot/support/config-fragments/autobuild/br-xtensa-full.config create mode 100755 buildroot/support/download/helpers create mode 100644 buildroot/support/scripts/cpedb.py create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/Config.in create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/external.desc create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/external.mk create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg1/cpe-id-pkg1.mk create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg2/cpe-id-pkg2.mk create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg4/cpe-id-pkg4.mk create mode 100644 buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg5/cpe-id-pkg5.mk create mode 100644 buildroot/support/testing/tests/core/test_cpeid.py create mode 100644 buildroot/support/testing/tests/package/sample_python_pytest_asyncio.py create mode 100644 buildroot/support/testing/tests/package/test_lualdap.py create mode 100644 buildroot/support/testing/tests/package/test_python_pytest_asyncio.py diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 5532af51b..b240f0043 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -28,7 +28,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hasso BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 0c40af0e9..35a4ec856 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 74265e1c9..8a95e88d6 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index ded27d3f7..36d09a599 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index d0599ea6c..43171c2ba 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -93,7 +93,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 6ec223db3..bf57d849c 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hasso BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 95bcc35c4..662411178 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index dec72ea50..8ef4c54dd 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 1cf97435f..9ca8bd8b2 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index aef10be00..cbd68c210 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 2deb9dbad..e3e00d098 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -61,6 +61,8 @@ BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR_CLIENT=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_NETWORK_MANAGER=y +BR2_PACKAGE_NVME=y +BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_TINI=y BR2_PACKAGE_DOCKER_ENGINE=y BR2_PACKAGE_DOCKER_CLI=y @@ -92,7 +94,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index f1b564cdb..b45e275a3 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 389329774..845029484 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 95f4736be..639715769 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -96,7 +96,7 @@ BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-patches/0001-docker-add-AppArmor-support.patch b/buildroot-patches/0001-docker-add-AppArmor-support.patch index 333445ca3..b9923650c 100644 --- a/buildroot-patches/0001-docker-add-AppArmor-support.patch +++ b/buildroot-patches/0001-docker-add-AppArmor-support.patch @@ -1,24 +1,22 @@ -From 53aff7f049c974ab861db563c24d31c5512d1fbc Mon Sep 17 00:00:00 2001 -Message-Id: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> +From f8074c7dbf7966fd15edd897130825684abe05e9 Mon Sep 17 00:00:00 2001 +Message-Id: From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 -Subject: [PATCH 1/9] docker: add AppArmor support +Subject: [PATCH 1/5] docker: add AppArmor support Signed-off-by: Pascal Vizeli Signed-off-by: Stefan Agner --- package/docker-containerd/docker-containerd.mk | 5 +++++ - package/docker-engine/docker-engine.mk | 5 +++++ - package/runc/runc.mk | 5 +++++ - 3 files changed, 15 insertions(+) + 1 file changed, 5 insertions(+) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index 6b79bd14ae..2eed6e346b 100644 +index 626889e5f4..7c74da708f 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk -@@ -18,6 +18,11 @@ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim - - DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim +@@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor + DOCKER_CONTAINERD_TAGS += apparmor + endif +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +DOCKER_CONTAINERD_DEPENDENCIES += libapparmor @@ -28,38 +26,6 @@ index 6b79bd14ae..2eed6e346b 100644 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf DOCKER_CONTAINERD_TAGS += seccomp -diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index 8cedf307ba..7f898680b7 100644 ---- a/package/docker-engine/docker-engine.mk -+++ b/package/docker-engine/docker-engine.mk -@@ -20,6 +20,11 @@ DOCKER_ENGINE_LDFLAGS = \ - DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen - DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd - -+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) -+DOCKER_ENGINE_DEPENDENCIES += libapparmor -+DOCKER_ENGINE_TAGS += apparmor -+endif -+ - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - DOCKER_ENGINE_TAGS += seccomp - DOCKER_ENGINE_DEPENDENCIES += libseccomp -diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index 393bd7b22f..45fe1442ad 100644 ---- a/package/runc/runc.mk -+++ b/package/runc/runc.mk -@@ -12,6 +12,11 @@ RUNC_LICENSE_FILES = LICENSE - RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) - RUNC_TAGS = cgo static_build - -+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) -+RUNC_DEPENDENCIES += libapparmor -+RUNC_TAGS += apparmor -+endif -+ - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - RUNC_TAGS += seccomp - RUNC_DEPENDENCIES += libseccomp host-pkgconf -- -2.30.0 +2.30.1 diff --git a/buildroot-patches/0003-network-manager-wpa_supplicant.patch b/buildroot-patches/0002-network-manager-wpa_supplicant.patch similarity index 80% rename from buildroot-patches/0003-network-manager-wpa_supplicant.patch rename to buildroot-patches/0002-network-manager-wpa_supplicant.patch index bc958f7ff..10723f9c3 100644 --- a/buildroot-patches/0003-network-manager-wpa_supplicant.patch +++ b/buildroot-patches/0002-network-manager-wpa_supplicant.patch @@ -1,10 +1,10 @@ -From 15db6339b4bdd202c44c663edcdc82b6d2f07652 Mon Sep 17 00:00:00 2001 -Message-Id: <15db6339b4bdd202c44c663edcdc82b6d2f07652.1612369715.git.stefan@agner.ch> -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> +From b9f13255e5042fc4e8d64b73c2fccee6e7ca0674 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Pascal Vizeli Date: Thu, 16 Apr 2020 14:32:45 +0000 -Subject: [PATCH 3/9] network-manager: wpa_supplicant +Subject: [PATCH 2/5] network-manager: wpa_supplicant Signed-off-by: Pascal Vizeli --- @@ -29,7 +29,7 @@ index 7d44768460..218dc860ff 100644 select BR2_PACKAGE_LIBNDP help diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index 3dc3188f32..2a04b00cee 100644 +index 4b2ade5b9b..ad170cbe6f 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz @@ -40,7 +40,7 @@ index 3dc3188f32..2a04b00cee 100644 + libgcrypt wpa_supplicant util-linux host-intltool readline libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING - + NETWORK_MANAGER_SELINUX_MODULES = networkmanager -- -2.30.0 +2.30.1 diff --git a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch deleted file mode 100644 index 36050b656..000000000 --- a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b24a9853bf61b59c44f5b5e0c02a41e07b6d776f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -From: Pascal Vizeli -Date: Thu, 16 Apr 2020 11:51:46 +0000 -Subject: [PATCH 2/9] rpi-firmware: Bump firmware - -Signed-off-by: Pascal Vizeli ---- - package/rpi-firmware/rpi-firmware.hash | 2 +- - package/rpi-firmware/rpi-firmware.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 8730ec959b..49a600903c 100644 ---- a/package/rpi-firmware/rpi-firmware.hash -+++ b/package/rpi-firmware/rpi-firmware.hash -@@ -1,3 +1,3 @@ - # Locally computed --sha256 c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz -+sha256 e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243 rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz - sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom -diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index 8b2b2c7154..fe7a099407 100644 ---- a/package/rpi-firmware/rpi-firmware.mk -+++ b/package/rpi-firmware/rpi-firmware.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44 -+RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b - RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) - RPI_FIRMWARE_LICENSE = BSD-3-Clause - RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom --- -2.30.0 - diff --git a/buildroot-patches/0004-Fix-dhcp-client.patch b/buildroot-patches/0003-Fix-dhcp-client.patch similarity index 64% rename from buildroot-patches/0004-Fix-dhcp-client.patch rename to buildroot-patches/0003-Fix-dhcp-client.patch index 46d6aee48..fff9948d0 100644 --- a/buildroot-patches/0004-Fix-dhcp-client.patch +++ b/buildroot-patches/0003-Fix-dhcp-client.patch @@ -1,10 +1,10 @@ -From bd1542bc2e242b189b4a778cb879e3416c40b60a Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> +From 0bc96a0b5c81a8c42de169e41ba4d2f65161701d Mon Sep 17 00:00:00 2001 +Message-Id: <0bc96a0b5c81a8c42de169e41ba4d2f65161701d.1614713774.git.stefan@agner.ch> +In-Reply-To: +References: From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:01:44 +0000 -Subject: [PATCH 4/9] Fix dhcp client +Subject: [PATCH 3/5] Fix dhcp client Signed-off-by: Pascal Vizeli --- @@ -12,10 +12,10 @@ Signed-off-by: Pascal Vizeli 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk -index ad59804d3b..f1ffa81d9a 100644 +index 988c7792dc..d8f331719a 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk -@@ -76,8 +76,7 @@ endif +@@ -77,8 +77,7 @@ endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) define DHCP_INSTALL_CLIENT @@ -26,5 +26,5 @@ index ad59804d3b..f1ffa81d9a 100644 install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ -- -2.30.0 +2.30.1 diff --git a/buildroot-patches/0007-docker-proxy-Bump-version.patch b/buildroot-patches/0004-docker-proxy-Bump-version.patch similarity index 82% rename from buildroot-patches/0007-docker-proxy-Bump-version.patch rename to buildroot-patches/0004-docker-proxy-Bump-version.patch index 93364decc..58421e3b5 100644 --- a/buildroot-patches/0007-docker-proxy-Bump-version.patch +++ b/buildroot-patches/0004-docker-proxy-Bump-version.patch @@ -1,10 +1,10 @@ -From dc54a32cb53394e21bc5dd65c10a847944864a2b Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> +From 4264663b7fdb1379c10bd2b2844c32c617dfb9ec Mon Sep 17 00:00:00 2001 +Message-Id: <4264663b7fdb1379c10bd2b2844c32c617dfb9ec.1614713774.git.stefan@agner.ch> +In-Reply-To: +References: From: Pascal Vizeli Date: Thu, 7 May 2020 09:02:05 +0000 -Subject: [PATCH 7/9] docker-proxy: Bump version +Subject: [PATCH 4/5] docker-proxy: Bump version Signed-off-by: Pascal Vizeli --- @@ -37,5 +37,5 @@ index 6600b24ed9..d0e940db93 100644 DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -- -2.30.0 +2.30.1 diff --git a/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch b/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch new file mode 100644 index 000000000..a6644b644 --- /dev/null +++ b/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch @@ -0,0 +1,76 @@ +From 49e3db2dafa620dcbb11c1ed68f442aa8fd4696f Mon Sep 17 00:00:00 2001 +Message-Id: <49e3db2dafa620dcbb11c1ed68f442aa8fd4696f.1614713774.git.stefan@agner.ch> +In-Reply-To: +References: +From: Stefan Agner +Date: Mon, 8 Feb 2021 14:08:28 +0100 +Subject: [PATCH 5/5] package/rpi-firmware: Allow to deploy multiple firmware + files + +Add a new config option to allow a specific list of firmware files to be +deployed. This is useful if the system needs to decide at runtime which +firmware to use. + +Signed-off-by: Stefan Agner +--- + package/rpi-firmware/Config.in | 10 ++++++++++ + package/rpi-firmware/rpi-firmware.mk | 17 +++++++++++++++-- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in +index f5a25c5680..ce31ad46de 100644 +--- a/package/rpi-firmware/Config.in ++++ b/package/rpi-firmware/Config.in +@@ -58,8 +58,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD + The cut-down firmware, for emergency situations, with only + features required to boot a Linux kernel. + ++config BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST ++ bool "deploy firmware files from list" ++ help ++ Deploy firmware files as listed. ++ + endchoice + ++config BR2_PACKAGE_RPI_FIRMWARE_LIST ++ string ++ default "start.elf start_x.elf start_cd.elf fixup.dat fixup_x.dat fixup_cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI ++ default "start4.elf start4x.elf start4cd.elf fixup4.dat fixup4x.dat fixup4cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 ++ + config BR2_PACKAGE_RPI_FIRMWARE_BOOT + string + default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI +diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk +index f3d28ef825..58085a8ca8 100644 +--- a/package/rpi-firmware/rpi-firmware.mk ++++ b/package/rpi-firmware/rpi-firmware.mk +@@ -48,11 +48,24 @@ define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN + endef + endif + ++ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST),y) ++define RPI_FIRMWARE_INSTALL_FIRMWARE ++ $(foreach firmware,$(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_LIST)), \ ++ $(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware) ++ ) ++endef ++else ++define RPI_FIRMWARE_INSTALL_FIRMWARE ++ $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf ++ $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat ++endef ++endif ++ ++ + define RPI_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt + $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt +- $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf +- $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat ++ $(RPI_FIRMWARE_INSTALL_FIRMWARE) + $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) + $(RPI_FIRMWARE_INSTALL_DTB) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) +-- +2.30.1 + diff --git a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch deleted file mode 100644 index 61c1be829..000000000 --- a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ff288c78226a2e61abf75bb285b429299e384edd Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -From: Pascal Vizeli -Date: Thu, 16 Apr 2020 12:05:21 +0000 -Subject: [PATCH 5/9] rpi: use latest wifi driver - -Signed-off-by: Pascal Vizeli ---- - package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- - package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -index b8931d2c45..68e33debba 100644 ---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -@@ -1,3 +1,3 @@ - # Locally calculated --sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz -+sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz - sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx -diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -index 6be02509fe..0c697bddbe 100644 ---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -@@ -4,14 +4,14 @@ - # - ################################################################################ - --RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 --RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -+RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639 -+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) - RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY - RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - - define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm -- $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm -+ $(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm - endef - - $(eval $(generic-package)) --- -2.30.0 - diff --git a/buildroot-patches/0006-ODROID-XU4-video-firmware.patch b/buildroot-patches/0006-ODROID-XU4-video-firmware.patch deleted file mode 100644 index 5c07d8dfa..000000000 --- a/buildroot-patches/0006-ODROID-XU4-video-firmware.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4526121b86b259e426766c4ba35b2911b2c0965c Mon Sep 17 00:00:00 2001 -Message-Id: <4526121b86b259e426766c4ba35b2911b2c0965c.1607000394.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Wed, 11 Nov 2020 22:16:10 +0100 -Subject: [PATCH 6/7] ODROID-XU4: video firmware - ---- - package/linux-firmware/Config.in | 6 ++++++ - package/linux-firmware/linux-firmware.mk | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in -index 105daf42b8..109af152f8 100644 ---- a/package/linux-firmware/Config.in -+++ b/package/linux-firmware/Config.in -@@ -44,6 +44,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO - help - Firmware files for Qualcomm Adreno GPU firmware - -+ -+config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8 -+ bool "Samsung MFC video encoder/decoder driver v8" -+ help -+ Firmware files for samsung MFC video encoder/decoder driver v8 -+ - endmenu # Video - - menu "Bluetooth firmware" -diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index 8808b5284c..f1c84a134d 100644 ---- a/package/linux-firmware/linux-firmware.mk -+++ b/package/linux-firmware/linux-firmware.mk -@@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a* - LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt - endif - -+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y) -+LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw -+# No license file; the license is in the file WHENCE -+# which is installed unconditionally -+endif -+ - # Intel Wireless Bluetooth - ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) - LINUX_FIRMWARE_FILES += intel/ibt-* --- -2.29.2 - diff --git a/buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch b/buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch deleted file mode 100644 index cadf14a43..000000000 --- a/buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3a34b131d0d7a1630e70f60c3bd62240d3b1b654 Mon Sep 17 00:00:00 2001 -Message-Id: <3a34b131d0d7a1630e70f60c3bd62240d3b1b654.1612369715.git.stefan@agner.ch> -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -From: Stefan Agner -Date: Wed, 11 Nov 2020 22:16:10 +0100 -Subject: [PATCH 6/9] package/linux-firmware: add new option for Samsung MFC - firmware - -Multi format codec (MFC) is the IP present in Samsung Exynos -series SoCs for video encoding/decoding operations. - -Signed-off-by: Stefan Agner ---- - package/linux-firmware/Config.in | 5 +++++ - package/linux-firmware/linux-firmware.mk | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in -index 105daf42b8..dbdfdb52b3 100644 ---- a/package/linux-firmware/Config.in -+++ b/package/linux-firmware/Config.in -@@ -44,6 +44,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO - help - Firmware files for Qualcomm Adreno GPU firmware - -+config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8 -+ bool "Samsung MFC video encoder/decoder v8 firmware" -+ help -+ Firmware files for Samsung MFC video encoder/decoder driver v8 -+ - endmenu # Video - - menu "Bluetooth firmware" -diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index 8808b5284c..f1c84a134d 100644 ---- a/package/linux-firmware/linux-firmware.mk -+++ b/package/linux-firmware/linux-firmware.mk -@@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a* - LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt - endif - -+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y) -+LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw -+# No license file; the license is in the file WHENCE -+# which is installed unconditionally -+endif -+ - # Intel Wireless Bluetooth - ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) - LINUX_FIRMWARE_FILES += intel/ibt-* --- -2.30.0 - diff --git a/buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch b/buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch deleted file mode 100644 index ca337bd66..000000000 --- a/buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11 Mon Sep 17 00:00:00 2001 -Message-Id: <6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11.1612369715.git.stefan@agner.ch> -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -From: Stefan Agner -Date: Sun, 20 Dec 2020 16:57:09 +0100 -Subject: [PATCH 8/9] systemd: Bump to latest systemd-stable release 246.10 - ---- - ...o-not-fail-with-read-only-etc-or-var.patch | 34 ------------------- - package/systemd/systemd.hash | 2 +- - package/systemd/systemd.mk | 2 +- - 3 files changed, 2 insertions(+), 36 deletions(-) - delete mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch - -diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch -deleted file mode 100644 -index 01e7f1e906..0000000000 ---- a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch -+++ /dev/null -@@ -1,34 +0,0 @@ --From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001 --From: Felix Riemann --Date: Mon, 19 Oct 2020 18:54:53 +0200 --Subject: [PATCH] update-done: Do not fail with read-only /etc or /var -- --With the switch from log_debug() to log_debug_errno() in commit c413bb28df --systemd-update-done would fail without any error message if /etc --or /var were read-only. This restores the previous behaviour to --silently ignore these directories again. -- --[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280] --Signed-off-by: Romain Naour ----- -- src/update-done/update-done.c | 4 ++-- -- 1 file changed, 2 insertions(+), 2 deletions(-) -- --diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c --index e9d589e0e5..92c348d83b 100644 ----- a/src/update-done/update-done.c --+++ b/src/update-done/update-done.c --@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) { -- -- r = write_string_file_atomic_label_ts(path, message, ts); -- if (r == -EROFS) --- return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path); --- if (r < 0) --+ log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path); --+ else if (r < 0) -- return log_error_errno(r, "Failed to write \"%s\": %m", path); -- return 0; -- } ---- --2.25.4 -- -diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash -index cad249199c..0c2ba1e1c3 100644 ---- a/package/systemd/systemd.hash -+++ b/package/systemd/systemd.hash -@@ -1,5 +1,5 @@ - # sha256 locally computed --sha256 f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178 systemd-246.5.tar.gz -+sha256 3a972d287edd864e0b33321bc74dfe6083d390306461fa7e958895eaa4be6b67 systemd-246.10.tar.gz - sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 - sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 - sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README -diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk -index ddd3f4380e..51a3160050 100644 ---- a/package/systemd/systemd.mk -+++ b/package/systemd/systemd.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --SYSTEMD_VERSION = 246.5 -+SYSTEMD_VERSION = 246.10 - SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) - SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) - SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE --- -2.30.0 - diff --git a/buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch b/buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch deleted file mode 100644 index 1bfe7e03f..000000000 --- a/buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5296f74bba93a16fe1db5493f36e35fad434f9ee Mon Sep 17 00:00:00 2001 -Message-Id: <5296f74bba93a16fe1db5493f36e35fad434f9ee.1612369715.git.stefan@agner.ch> -In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> -From: Stefan Agner -Date: Wed, 23 Dec 2020 10:53:20 +0100 -Subject: [PATCH 9/9] package/linux-firmware: add new option for USB TI - 3410/5052 firmware - -Signed-off-by: Stefan Agner ---- - package/linux-firmware/Config.in | 9 +++++++++ - package/linux-firmware/linux-firmware.mk | 6 ++++++ - 2 files changed, 15 insertions(+) - -diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in -index dbdfdb52b3..6d5e961527 100644 ---- a/package/linux-firmware/Config.in -+++ b/package/linux-firmware/Config.in -@@ -490,4 +490,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X - - endmenu - -+menu "USB to Serial Firmware" -+ -+config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI -+ bool "USB TI 3410/5052 Serial Firmware" -+ help -+ Firmware files for TI 3410/5052 -+ -+endmenu -+ - endif -diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index f1c84a134d..f00fb2e6ae 100644 ---- a/package/linux-firmware/linux-firmware.mk -+++ b/package/linux-firmware/linux-firmware.mk -@@ -620,6 +620,12 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin - LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware - endif - -+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y) -+LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw -+# No license file; the license is in the file WHENCE -+# which is installed unconditionally -+endif -+ - ifneq ($(LINUX_FIRMWARE_FILES),) - define LINUX_FIRMWARE_INSTALL_FILES - cd $(@D) && \ --- -2.30.0 - diff --git a/buildroot/.flake8 b/buildroot/.flake8 index ee3d5035a..7dd7b541c 100644 --- a/buildroot/.flake8 +++ b/buildroot/.flake8 @@ -2,4 +2,4 @@ exclude= # copied from the kernel sources utils/diffconfig -max-line-length=80 +max-line-length=132 diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 7e1e5a58c..ab34fde9a 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,130 @@ +2021.02-rc3, released February 27th, 2021 + + Fixes all over the tree. + + utils/scanpypi: Explicitly use python3 to ensure compatiblity + with packages having python3-only code in setup.py + + support/download: Ensure sub-second timestamp precision is + dropped when creating a tarball from a (subversion) repo, as + that is not representable in the PAX tar format + + Updated/fixed packages: babeltrace2, bind, botan, brltty, + cegui, elfutils, fakeroot, imagemagick, intel-mediasdk, + irqbalance, libglib2, libselinux, libusb, libuwsc, nodejs, + open62541, openldap, ply, python-aiohttp, python-django, + python3, qemu, readline, rust, screen, taglib, unbound, xterm + + Issues resolved (http://bugs.uclibc.org): + + #13516: utils/scanpypi: Failure when parsing diffoscope + #13541: 2021.02.rc2: irqbalance: Daemon couldn't be bound to... + #13561: Create a new user defining users-table.txt not working.. + +2021.02-rc2, released February 16th, 2021 + + Fixes all over the tree. + + Vulnerability scanning: cpedb.py: Drop CPE XML database + caching, as it did not speed up processing much and uses a lot + of additional memory. + pkg-stats: include information about ignored CVEs in JSON + output + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: can-utils, collectd, dnsmaqs, + docker-cli, docker-engine, ebtables, fakeroot, flashrom, + gdk-pixbuf, go, gst1-python, jasper, kodi, + kodi-inputstream-adaptive, lcms2, libgeos, libgpg-error, + libopenssl, mongoose, mpd, ne10, netopeer2, openblas, orc, + perl-gd, ply, postgresql, protobuf, subversion, tcpdump, + tzdate, uboot-tools, wireshark, webkitgtk, wpewebkit, xterm + + New packages: perl-extutils-pkgconfig + + Issues resolved (http://bugs.uclibc.org): + + #11706: binman (U-boot tool) cannot find libfdt "binman: No mod.. + +2021.02-rc1, released February 9th, 2021 + + Fixes all over the tree and new features. + + Toolchain: Default to binutils 2.35.2, add 2.36.1, drop + 2.33.x. Fix GCC 10.x ARC adc/sbc pattern handling, Update ARM + toolchains to 10.2-2020.11 release. + + Architectures: ARC: add support for generic HS48 processor, + PPC: drop PPC601 support, which was removed from Linux 5.10. + + Vulnerability scanning: The CVE checking logic has been + extended to match packages based on CPE (Common Platform + Enumeration) IDs for more accurate matching, and CPE + identifiers have been added for a large amount of packages. + + Download: Rework the tarball creation logic (E.G. when a + package is fetched from a git/svn repo) to no longer require a + host-tar <= 1.29. To differ between the old and the new + format, the new tarballs have gained a -br1 suffix + (--br1.tar.gz). + + SELinux support: A significant number of packages now pull in + the relevant refpolicy modules when enabled. + + New defconfigs: arrow avenger96, bananapi M1+, microchip + sam9x60ek, pine64 rock64 + + Removed defconfigs: QEMU ppc virtex-ml507 + + New packages: balena-engine, casync, coremark, coremark-pro, + datatables, datatables-buttons, datatables-fixedcolumns, + datatables-responsive, delve, frotz, gkrellm, inih, jszip, + libgeos, libiec61850, libmdbx, lualdap, neofetch, + nvidia-modprobe, open62541, perl-devel-cycle, perl-devel-size, + perl-math-int64, ply, popperjs, python-bleak, + python-defusedxml, python-pycups, python-pytest-asyncio, + python-typing-extensions, qcom-db410c-firmware, qt5coap, + qt5knx, qt5mqtt, quickjs, rcw-smarc-sal28, screenfetch, + ssdp-responder, tpm2-pkcs11, wqy-zenhei, xorcurses + + Removed packages: audiofile, boa, ipsec-tools, libupnp18, + ti-sgx-libgdbm + + Renamed rcw package to qoriq-rcw + + Issues resolved (http://bugs.uclibc.org): + + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13416: dhcpcd start warning message: no such user dhcpcd + #13456: ccache prevents build + #13471: package/mpd/mpd.conf make use of path not created + #13506: BR2_PACKAGE_DHCPCD missing directory creation + +2020.11.3, released February 17th, 2021 + + meson: Fix ccache detection handling when per-package builds + are used. + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: atftp, binutils, busybox, cereal, + chartjs, connman, dhcpcd, dnsmasq, docker-cli, docker-engine, + ebtables, fakeroot, flashrom, go, gst1-python, guile, + intel-mediadriver, intel-microcode, jasper, + kodi-inputstream-adaptive, lcms2, libbsd, libopenssl, + makedumpfile, memtester, mosquitto, ne10, openblas, orc, php, + postgresql, privoxy, pugixml, python-bottle, python-django, + python3, rauc, sox, stress-ng, subversion, tzdata, + uboot-tools, uclibc, webkitgtk, wireguard-linux-compat, + wireshark, wpa_supplicant, wpewebkit, xenomai, + xserver_xorg-server, xterm + + Issues resolved (http://bugs.uclibc.org): + + #11706: binman (U-boot tool) cannot find libfdt "binman: No mod.. + #13506: BR2_PACKAGE_DHCPCD missing directory creation + 2020.11.2, released January 31st, 2021 Important / security related fixes. @@ -205,6 +332,42 @@ #13236: Can't compile linux 5.4.8 (with gcc 10 on host) #13286: The system hangs in vmware workstation on the line.. +2020.08.3, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + bustle, c-ares, ca-certificates, cage, cdrkit, cryptopp, + dhcpcd, docker-containerd, dtv-scan-tables, flare-engine, + ghostscript, gvfs, haproxy, imagemagick, imx-gpu-viv, jasper, + jemalloc, jpeg-turbo, libcamera, libcap, libcurl, libglib2, + libgpiod, libkrb5, libopenssl, libplist, libressl, libuv, + libuvw, lynx, mariadb, mbedtls, minidlna, mongodb, monkey, + musl, mutt, ncurses, netsnmp, netsurf, nodejs, opencv3, + openldap, openrc, opkg-utils, paho-mqtt-c, php, privoxy, + proftpd, python-crc16, python-flask-cors, python-lxml, + python-pip, python-pyparsing, python-pyqt5, qemu, qt5base, + raptor, rauc, ruby, setserial, shadowsocks-libev, slirp, + sqlcipher, thermald, ti-sgx-demos, tinycbor, unbound, vsftpd, + wireless-regdb, wireshark, wlroots, x11vnc, xen, xinetd, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13276: libcap builds libcap.pc incorrectly + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13336: thermald-1.9.1 compilation failure with musl 1.2.1 + #13341: Mistake in /etc/init.d/S70vsftpd + #13416: dhcpcd start warning message: no such user dhcpcd + 2020.08.2, released November 16th, 2020 Important / security related fixes. @@ -739,6 +902,97 @@ #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 #12811: bootstrap stuck and no login prompt +2020.02.11, released February 17, 2021 + + Important / security related fixes. + + meson: Fix ccache detection handling when per-package builds + are used. + + Fakeroot: Fix compatibility issue with glibc 2.33 + + Updated/fixed packages: atftp, busybox, cereal, connman, + dhcpcd, dnsmasq, docker-cli, docker-engine, fakeroot, + intel-mediadriver, intel-microcode, jasper, + kodi-inputstream-adaptive, libbsd, libopenssl, linux-headers, + mosquitto, orc, php, postgresql, privoxy, pugixml, + python-bottle, python-django, python3, rauc, sox, subversion, + tzdata, wireguard-linux-compat, wpa_supplicant, xenomai, xterm + + Issues resolved (http://bugs.uclibc.org): + + #13506: BR2_PACKAGE_DHCPCD missing directory creation + +2020.02.10, released January 31st, 2021 + + Important / security related fixes. + + Download: Ensure git submodules are correctly fetched if + enabled for a package with _GIT_SUBMODULES = YES and the + host variant is downloaded first. + + Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not + having libatomic. + + pkg-stats: Fix python 3.8+ deprecation warning. + + meson: Ensure ccache is not detected and used, as it may + conflict with the ccache handling in Buildroot. + + New packages: libnpupnp + + Updated/fixed packages: bctoolbox, brltty, dbus, dovecot, + dovecot-pigeonhole, gcc, gerbera, gmrender-resurrect, gst-omx, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-rtsp-server, gst1-vaapi, + gst1-validate, gstreamer1, gstreamer1-editing-services, + igd2-for-linux, libclc, libllcp, libtorrent-rasterbar, + libupnp, libupnpp, lpc32xxcdl, luarocks, mpd, nfs-utils, + nodejs, openjpeg, openldap, opentracing-cpp, openvpn, p11-kit, + paho-mqtt-c, php, poppler, postgresql, python3, runc, sudo, + syslog-ng, systemd, tini, trace-cmd, tzdata, ushare, vlc, + wavpack, wireguard-linux-compat, wolfssl, xapp_xload, xorriso, + zic + + Removed packages: libupnp18 + + Issues resolved (http://bugs.uclibc.org): + + #13471: package/mpd/mpd.conf make use of path not created + +2020.02.9, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + bustle, c-ares, ca-certificates, cdrkit, cryptopp, dhcpcd, + docker-containerd, dtv-scan-tables, flare-engine, ghostscript, + haproxy, imagemagick, imx-gpu-viv, jasper, jemalloc, + jpeg-turbo, libcap, libcurl, libglib2, libgpiod, libkrb5, + libopenssl, libplist, libressl, libuv, libuvw, lynx, mariadb, + mbedtls, minidlna, monkey, musl, mutt, ncurses, netsnmp, + nodejs, opencv3, openldap, openrc, opkg-utils, paho-mqtt-c, + php, privoxy, proftpd, python-crc16, python-flask-cors, + python-lxml, python-pip, python-pyparsing, python-pyqt5, qemu, + qt5base, raptor, rauc, ruby, setserial, shadowsocks-libev, + slirp, sqlcipher, ti-sgx-demos, tinycbor, vsftpd, + wireless-regdb, wireshark, x11vnc, xen, xinetd, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13276: libcap builds libcap.pc incorrectly + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13341: Mistake in /etc/init.d/S70vsftpd + 2020.02.8, released November 16th, 2020 Important / security related fixes. diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index ff2af6ee6..9deb67b31 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -144,7 +144,29 @@ endif ############################################################################### -comment "Legacy options removed in 2020.11" +comment "Legacy options removed in 2021.02" + +config BR2_PACKAGE_MPD_AUDIOFILE + bool "mpd audiofile support removed" + select BR2_LEGACY + help + The audiofile support was removed from mpd as audiofile is + affected by multiple CVEs and is not maintained anymore (no + release since 2013). + +config BR2_PACKAGE_AUDIOFILE + bool "audiofile package removed" + select BR2_LEGACY + help + The audiofile package was removed as it is affected by + multiple CVEs and is not maintained anymore (no release since + 2013). + +config BR2_BINUTILS_VERSION_2_33_X + bool "binutils 2.33.x has been removed" + select BR2_LEGACY + help + binutils 2.33.x has been removed, use a newer version. config BR2_PACKAGE_LIBUPNP18 bool "libupnp18 package removed" @@ -156,6 +178,74 @@ config BR2_PACKAGE_LIBUPNP18 CVE-2020-12695. The libupnp package (which has been updated to version 1.14.x) has been selected instead. +config BR2_PACKAGE_BOA + bool "boa package removed" + select BR2_LEGACY + help + The boa package was removed as it is affected by multiple + CVEs and is not maintained anymore (no release since 2005). + +config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA + bool "imx sdma firmware is provided by firmware-imx" + select BR2_LEGACY + select BR2_PACKAGE_FREESCALE_IMX + select BR2_PACKAGE_FIRMWARE_IMX + help + linux-firmware provide the same firmware as firmware-imx. + We prefer using firmware-imx as the only provider. + +config BR2_GDB_VERSION_8_2 + bool "gdb 8.2.x has been removed" + select BR2_LEGACY + help + gdb 8.2 support has been removed, you can use a newer + version such as 8.3 or more recent. + +config BR2_PACKAGE_HOST_RCW + bool "rcw package was renamed to qoriq-rcw" + select BR2_PACKAGE_HOST_QORIQ_RCW + select BR2_LEGACY + help + The rcw package was specific to the QorIQ platform, so it has + been renamed to qoriq-rcw, to leave room for other *-rcw + packages for other platforms. + +config BR2_KERNEL_HEADERS_5_9 + bool "kernel headers version 5.9.x are no longer supported" + select BR2_LEGACY + help + Version 5.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_5_8 + bool "kernel headers version 5.8.x are no longer supported" + select BR2_LEGACY + help + Version 5.8.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_powerpc_601 + bool "PowerPC 601 support removed" + select BR2_LEGACY + help + The support for the PowerPC 601 processors has been removed. + +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "ti-sgx-libgbm support removed" + select BR2_LEGACY + help + TI has merged the ti-sgx-libgbm package with the ti-sgx-um + package + +config BR2_PACKAGE_IPSEC_TOOLS + bool "ipsec-tools package was removed" + select BR2_LEGACY + help + This package has been removed as it has security issues and + has been abandoned since 2014. + +comment "Legacy options removed in 2020.11" + config BR2_PACKAGE_OPENCV bool "opencv package was removed" select BR2_LEGACY diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index ec29a76ed..b019fe04d 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -131,6 +131,9 @@ F: package/openal/ F: package/p7zip/ F: package/wine/ +N: Andreas Klinger +F: package/ply/ + N: Andrey Smirnov F: package/python-backports-shutil-get-terminal-size/ F: package/python-decorator/ @@ -169,6 +172,9 @@ F: package/python-pillow/ F: package/python-pydal/ F: package/python-spidev/ F: package/python-web2py/ +F: package/qt5/qt5coap/ +F: package/qt5/qt5knx/ +F: package/qt5/qt5mqtt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ @@ -321,10 +327,12 @@ F: package/freetype/ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ +F: package/gkrellm/ F: package/gli/ F: package/glmark2/ F: package/gpsd/ F: package/hdparm/ +F: package/inih/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ @@ -490,6 +498,8 @@ F: configs/olimex_a13_olinuxino_defconfig F: configs/orangepi_plus_defconfig N: Chris Packham +F: package/coremark/ +F: package/coremark-pro/ F: package/gstreamer1/gst1-shark/ F: package/micropython/ F: package/micropython-lib/ @@ -503,6 +513,7 @@ F: linux/linux-ext-aufs.mk F: package/aufs/ F: package/aufs-util/ F: package/batman-adv/ +F: package/delve/ F: package/docker-cli/ F: package/docker-containerd/ F: package/docker-engine/ @@ -864,6 +875,7 @@ F: package/ncmpc/ F: package/oniguruma/ F: package/oprofile/ F: package/pcmanfm/ +F: package/perl-extutils-pkgconfig/ F: package/python-backcall/ F: package/python-jedi/ F: package/python-parso/ @@ -884,6 +896,10 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ +N: Filip Skoneczny +F: board/sinovoip/m1-plus +F: configs/bananapi_m1_plus_defconfig + N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ @@ -921,6 +937,7 @@ F: package/netsurf/ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk +F: package/quickjs/ F: package/rings/ F: package/tekui/ F: package/wpebackend-fdo/ @@ -929,6 +946,7 @@ F: package/wsapi/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ F: package/xavante/ +F: support/testing/tests/package/test_lua* F: utils/scancpan N: Frank Hunleth @@ -983,6 +1001,7 @@ N: Gilles Talis F: board/freescale/imx8mmevk/ F: configs/freescale_imx8mmevk_defconfig F: package/cctz/ +F: package/faad2/ F: package/fdk-aac/ F: package/httping/ F: package/iozone/ @@ -991,6 +1010,7 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ F: package/webp/ @@ -1033,11 +1053,6 @@ F: package/python-redis/ F: package/python-rpi-ws281x/ F: package/python-wtforms/ -N: Guillaume Gardet -F: package/c-icap/ -F: package/c-icap-modules/ -F: package/sdl2/ - N: Guillaume William Brs F: package/libnids/ F: package/liquid-dsp/ @@ -1267,6 +1282,7 @@ F: configs/globalscale_espressobin_defconfig F: board/globalscale/espressobin/ F: package/mg/ F: package/netcalc/ +F: package/ssdp-responder/ N: Joao Pinto F: board/synopsys/vdk/ @@ -1374,6 +1390,7 @@ F: package/libnss/ F: package/lld/ F: package/llvm/ F: package/python-cython/ +F: package/python-pycups/ F: package/python-raven/ F: package/python-schedule/ F: package/python-sentry-sdk/ @@ -1460,6 +1477,9 @@ F: package/ramsmp/ N: Kieran Bingham F: package/libcamera/ +N: Klaus Heinrich Kiwi +F: package/wqy-zenhei/ + N: Koen Martens F: package/capnproto/ F: package/linuxconsoletools/ @@ -1482,6 +1502,9 @@ N: Leon Anavi F: board/olimex/a10_olinuxino F: configs/olimex_a10_olinuxino_lime_defconfig +N: Leonid Yuriev +F: package/libmdbx/ + N: Lionel Flandrin F: package/python-babel/ F: package/python-daemonize/ @@ -1499,7 +1522,6 @@ F: configs/bananapi_m2_ultra_defconfig F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/ti-sgx-demos/ -F: package/ti-sgx-libgbm/ F: package/ti-sgx-km/ F: package/ti-sgx-um/ @@ -1547,6 +1569,7 @@ F: configs/olpc_xo175_defconfig N: Ludovic Desroches F: board/atmel/ +F: board/microchip/ F: configs/at91* F: configs/atmel_* F: configs/microchip_* @@ -1591,17 +1614,22 @@ F: package/luaossl/ F: package/murata-cyw-fw/ F: package/netdata/ F: package/python-ansicolors/ +F: package/python-bleak/ F: package/python-iniconfig/ F: package/python-intelhex/ F: package/python-packaging/ F: package/python-pluggy/ F: package/python-pytest/ +F: package/python-pytest-asyncio/ +F: package/python-typing-extensions/ F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ F: support/testing/tests/package/sample_python_pytest.py +F: support/testing/tests/package/sample_python_pytest_asyncio.py F: support/testing/tests/package/test_netdata.py F: support/testing/tests/package/test_python_pytest.py +F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson F: package/libostree/ @@ -1743,8 +1771,8 @@ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ +F: package/qoriq-rcw/ F: package/raptor/ -F: package/rcw/ F: package/rng-tools/ F: package/rsyslog/ F: package/setools/ @@ -1851,9 +1879,12 @@ N: Michael Walle F: board/kontron/smarc-sal28/ F: configs/kontron_smarc_sal28_defconfig F: package/libavl/ +F: package/rcw-smarc-sal28/ N: Michał Łyszczek F: board/altera/socrates_cyclone5/ +F: board/pine64/rock64 +F: configs/rock64_defconfig F: configs/socrates_cyclone5_defconfig F: package/netifrc/ F: package/openrc/ @@ -1863,6 +1894,9 @@ N: Michel Stempin F: board/licheepi/ F: configs/licheepi_zero_defconfig +N: Mike Frampton +F: package/qcom-db410c-firmware/ + N: Mike Harmony F: board/sinovoip/m2-plus/ F: configs/bananapi_m2_plus_defconfig @@ -1988,6 +2022,7 @@ N: Pedro Aguilar F: package/libunistring/ N: Peter Korsgaard +F: board/arrow/avenger96/ F: board/beagleboneai/ F: board/minnowboard/ F: board/librecomputer/lafrite/ @@ -1997,6 +2032,7 @@ F: board/orangepi/ F: board/pandaboard/ F: board/roseapplepi/ F: boot/shim/ +F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig F: configs/minnowboard_max-graphical_defconfig @@ -2165,10 +2201,6 @@ F: package/gupnp-av/ F: package/let-me-create/ F: package/nanomsg/ -N: Rahul Jain -F: package/uhttpd/ -F: package/ustream-ssl/ - N: Ramon Fried F: package/bitwise/ @@ -2242,6 +2274,7 @@ F: package/liblinear/ F: package/lensfun/ F: package/libclc/ F: package/libgta/ +F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/llvm/ @@ -2310,10 +2343,6 @@ F: package/ripgrep/ N: Santosh Multhalli F: package/valijson/ -N: Scott Fan -F: package/libssh/ -F: package/x11r7/xdriver_xf86-video-fbturbo/ - N: Sébastien Szymanski F: package/mmc-utils/ F: package/python-flask-jsonrpc/ @@ -2328,18 +2357,14 @@ F: package/mpir/ N: Sergey Matyukevich F: boot/arm-trusted-firmware/ -F: boot/binaries-marvell/ -F: boot/mv-ddr-marvell/ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ -F: board/solidrun/macchiatobin F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig -F: configs/solidrun_macchiatobin_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ @@ -2498,15 +2523,23 @@ N: Thomas De Schampheleire F: docs/manual/ F: package/cereal/ F: package/chartjs/ +F: package/datatables/ +F: package/datatables-buttons/ +F: package/datatables-fixedcolumns/ +F: package/datatables-responsive/ +F: package/jszip/ F: package/libtelnet/ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ F: package/perl-crypt-openssl-aes/ +F: package/perl-devel-cycle/ +F: package/perl-devel-size/ F: package/perl-i18n/ F: package/perl-locale-maketext-lexicon/ F: package/perl-lwp-protocol-https/ +F: package/perl-math-int64/ F: package/perl-math-prime-util/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ @@ -2520,6 +2553,7 @@ F: package/perl-net-ssh2/ F: package/perl-net-telnet/ F: package/perl-path-class/ F: package/pigz/ +F: package/popperjs/ F: package/xenomai/ F: support/scripts/size-stats F: support/testing/tests/package/test_perl_lwp_protocol_https.py @@ -2528,6 +2562,8 @@ F: toolchain/ N: Thomas Huth F: package/ascii-invaders/ +F: package/frotz/ +F: package/xorcurses/ N: Thomas Petazzoni F: arch/Config.in.arm @@ -2677,7 +2713,12 @@ N: Wojciech Niziński F: package/fwup/ N: Yair Ben Avraham +F: package/casync/ F: package/gloox/ +F: package/tpm2-pkcs11/ + +N: Yann CARDAILLAC +F: package/open62541/ N: Yann E. MORIN F: board/friendlyarm/nanopi-neo/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 293b5880f..13e98e85b 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.11.2 +export BR2_VERSION := 2021.02-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1612125000 +BR2_VERSION_EPOCH = 1614447000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -1223,7 +1223,7 @@ check-flake8: | xargs file \ | grep 'Python script' \ | cut -d':' -f1 \ - | xargs -- python3 -m flake8 --statistics --max-line-length=132 + | xargs -- python3 -m flake8 --statistics check-package: find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \ diff --git a/buildroot/arch/Config.in.arc b/buildroot/arch/Config.in.arc index fdfafda31..f7a6d920b 100644 --- a/buildroot/arch/Config.in.arc +++ b/buildroot/arch/Config.in.arc @@ -39,9 +39,14 @@ config BR2_archs38_full config BR2_archs4x_rel31 bool "ARC HS48 rel 31" + help + Build for HS48 release 3.1 + +config BR2_archs4x + bool "ARC HS48" help Latest release of HS48 processor - - Dual- and quad multiply and MC oprations + - Dual and Quad multiply and MAC operations - Double-precision FPU endchoice @@ -49,7 +54,9 @@ endchoice # Choice of atomic instructions presence config BR2_ARC_ATOMIC_EXT bool "Atomic extension (LLOCK/SCOND instructions)" - default y if BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + default y if BR2_arc770d + default y if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full + default y if BR2_archs4x_rel31 || BR2_archs4x config BR2_ARCH default "arc" if BR2_arcle @@ -70,10 +77,12 @@ config BR2_GCC_TARGET_CPU default "hs38" if BR2_archs38_64mpy default "hs38_linux" if BR2_archs38_full default "hs4x_rel31" if BR2_archs4x_rel31 + default "hs4x" if BR2_archs4x config BR2_READELF_ARCH_NAME default "ARCompact" if BR2_arc750d || BR2_arc770d - default "ARCv2" if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + default "ARCv2" if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full + default "ARCv2" if BR2_archs4x_rel31 || BR2_archs4x choice prompt "MMU Page Size" @@ -93,7 +102,7 @@ choice config BR2_ARC_PAGE_SIZE_4K bool "4KB" - depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + depends on !BR2_arc750d config BR2_ARC_PAGE_SIZE_8K bool "8KB" @@ -103,7 +112,7 @@ config BR2_ARC_PAGE_SIZE_8K config BR2_ARC_PAGE_SIZE_16K bool "16KB" - depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 + depends on !BR2_arc750d endchoice diff --git a/buildroot/arch/Config.in.powerpc b/buildroot/arch/Config.in.powerpc index 56c4b526e..ba56c9c72 100644 --- a/buildroot/arch/Config.in.powerpc +++ b/buildroot/arch/Config.in.powerpc @@ -44,9 +44,6 @@ config BR2_powerpc_476fp config BR2_powerpc_505 bool "505" depends on !BR2_ARCH_IS_64 -config BR2_powerpc_601 - bool "601" - depends on !BR2_ARCH_IS_64 config BR2_powerpc_602 bool "602" depends on !BR2_ARCH_IS_64 @@ -176,7 +173,6 @@ config BR2_GCC_TARGET_CPU default "476" if BR2_powerpc_476 default "476fp" if BR2_powerpc_476fp default "505" if BR2_powerpc_505 - default "601" if BR2_powerpc_601 default "602" if BR2_powerpc_602 default "603" if BR2_powerpc_603 default "603e" if BR2_powerpc_603e diff --git a/buildroot/board/arm/foundation-v8/readme.txt b/buildroot/board/arm/foundation-v8/readme.txt index 1dedf68cb..b5106f015 100644 --- a/buildroot/board/arm/foundation-v8/readme.txt +++ b/buildroot/board/arm/foundation-v8/readme.txt @@ -3,17 +3,18 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=2663527 + https://silver.arm.com/download/download.tm?pv=4807186 Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ - --network=nat + --network=nat \ + --cores 4 You can get network access from within the simulated environment by requesting an IP address using DHCP (run the command 'udhcpc'). diff --git a/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000..5d506b3da --- /dev/null +++ b/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp157c-dk2-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157a-dhcor-avenger96.dtb + append root=/dev/mmcblk1p4 rootwait diff --git a/buildroot/board/arrow/avenger96/readme.txt b/buildroot/board/arrow/avenger96/readme.txt new file mode 100644 index 000000000..19ab09eb8 --- /dev/null +++ b/buildroot/board/arrow/avenger96/readme.txt @@ -0,0 +1,41 @@ +Arrow Avenger96 + +Intro +===== + +This configuration supports the Arrow Avenger96 board: + +https://wiki.dh-electronics.com/index.php/Avenger96 + +How to build +============ + + $ make avenger96_defconfig + $ make + +How to write the microSD card +============================= + +WARNING! This will destroy all the card content. Use with care! + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Configure the boot switches for boot from microsd: 1-0-1 + + (2) Insert the microSD card in the slot + + (3) Plug a serial adapter (beware: 1v8 levels!) to the low speed + expansion connector + + (4) Plug in power cable + + (5) The system will start, with the console on UART, but also visible + on the screen. diff --git a/buildroot/board/atmel/readme.txt b/buildroot/board/atmel/readme.txt index 7ebb5e830..1f21dd15e 100644 --- a/buildroot/board/atmel/readme.txt +++ b/buildroot/board/atmel/readme.txt @@ -21,6 +21,8 @@ This guide covers the following configurations: - atmel_sama5d2_xplained_mmc_dev_defconfig - microchip_sama5d27_wlsom1_ek_mmc_defconfig - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig + - microchip_sam9x60ek_mmc_defconfig + - microchip_sam9x60ek_mmc_dev_defconfig These configurations will use AT91Bootstrap, u-boot and a linux kernel from the git trees maintained by Atmel. diff --git a/buildroot/board/kontron/smarc-sal28/genimage.cfg b/buildroot/board/kontron/smarc-sal28/genimage.cfg index 9ef37de75..f3fb77e00 100644 --- a/buildroot/board/kontron/smarc-sal28/genimage.cfg +++ b/buildroot/board/kontron/smarc-sal28/genimage.cfg @@ -3,6 +3,18 @@ image sdcard-emmc.img { gpt = true } + partition rcw { + offset = 4k + in-partition-table = "no" + image = "rcw.bin" + } + + partition u-boot { + offset = 1M + in-partition-table = "no" + image = "u-boot.rom" + } + partition rootfs { offset = 2M image = rootfs.ext4 diff --git a/buildroot/board/kontron/smarc-sal28/readme.txt b/buildroot/board/kontron/smarc-sal28/readme.txt index 231c751b6..bdf2258b5 100644 --- a/buildroot/board/kontron/smarc-sal28/readme.txt +++ b/buildroot/board/kontron/smarc-sal28/readme.txt @@ -72,9 +72,17 @@ You will see something like this at boot time: [ 4.569596] GPT:266272 != 7864319 [ 4.572925] GPT: Use GNU Parted to correct GPT errors. -What does not work -================== +Updating the bootloader +======================= -For reasons unknown, the network card doesn't work if you use the original -vendor bootloader. Board support patches for upstream u-boot are currently -pending. Stay tuned. +Buildroot will automatically build the u-boot bootloader. The resulting +image is called u-boot.rom and you can find it in the images/ directory. + +To update the bootloader on the board you could either copy it to an +USB thumb drive or you could put it on a TFTP server. The following +example assumes you have the bootloader image copied to the root of +a thumb drive: + + # usb start + # load usb 0:1 $loadaddr u-boot.rom + # sf probe 0 && sf update $fileaddr 0x210000 $filesize diff --git a/buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg b/buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg new file mode 100644 index 000000000..c41581091 --- /dev/null +++ b/buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg @@ -0,0 +1,31 @@ +# Image for SD card boot on Microchip SAM9X60-EK +# +image boot.vfat { + vfat { + files = { + "zImage", + "at91-sam9x60ek.dtb", + "boot.bin", + "u-boot.bin" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 1M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/minnowboard/genimage.cfg b/buildroot/board/minnowboard/genimage.cfg index 6cf787430..c5b07179b 100644 --- a/buildroot/board/minnowboard/genimage.cfg +++ b/buildroot/board/minnowboard/genimage.cfg @@ -19,15 +19,16 @@ image efi-part.vfat { # * the efi-partition created above image sdcard.img { hdimage { + gpt = true } partition boot { - partition-type = 0xEF + partition-type-uuid = U image = "efi-part.vfat" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = L image = "rootfs.ext4" size = 512M } diff --git a/buildroot/board/minnowboard/grub.cfg b/buildroot/board/minnowboard/grub.cfg index 3d6feb702..1f75f4d7c 100644 --- a/buildroot/board/minnowboard/grub.cfg +++ b/buildroot/board/minnowboard/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200 + linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 net.ifnames=0 } diff --git a/buildroot/board/minnowboard/linux.config b/buildroot/board/minnowboard/linux.config index 27077dbcd..928e353c1 100644 --- a/buildroot/board/minnowboard/linux.config +++ b/buildroot/board/minnowboard/linux.config @@ -14,6 +14,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_PCI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_ATA=y diff --git a/buildroot/board/nexbox/a95x/boot.txt b/buildroot/board/nexbox/a95x/boot.txt index f388ba814..eef1c8ca5 100644 --- a/buildroot/board/nexbox/a95x/boot.txt +++ b/buildroot/board/nexbox/a95x/boot.txt @@ -1,4 +1,4 @@ -setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait +setenv bootargs console=ttyAML0,115200 earlyprintk root=PARTUUID=feedc0de-02 rootwait fatload mmc 0:1 0x01080000 uImage diff --git a/buildroot/board/nexbox/a95x/genimage.cfg b/buildroot/board/nexbox/a95x/genimage.cfg index 74e2d3a6f..63b96107c 100644 --- a/buildroot/board/nexbox/a95x/genimage.cfg +++ b/buildroot/board/nexbox/a95x/genimage.cfg @@ -12,6 +12,8 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTUUID support + disk-signature = 0xfeedc0de } partition boot { diff --git a/buildroot/board/orangepi/orangepi-pc/linux.fragment b/buildroot/board/orangepi/orangepi-pc/linux.fragment index 602e42776..b1dda162b 100644 --- a/buildroot/board/orangepi/orangepi-pc/linux.fragment +++ b/buildroot/board/orangepi/orangepi-pc/linux.fragment @@ -1,4 +1,3 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_REGULATOR_SY8106A=y -CONFIG_DRM_SUN8I_DW_HDMI=y CONFIG_SUN8I_DE2_CCU=y diff --git a/buildroot/board/orangepi/orangepi-r1/boot.cmd b/buildroot/board/orangepi/orangepi-r1/boot.cmd index e927b01e8..50745f7e5 100644 --- a/buildroot/board/orangepi/orangepi-r1/boot.cmd +++ b/buildroot/board/orangepi/orangepi-r1/boot.cmd @@ -1,6 +1,6 @@ setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb diff --git a/buildroot/board/orangepi/orangepi-r1/genimage.cfg b/buildroot/board/orangepi/orangepi-r1/genimage.cfg index 01e2c0adc..edda03b3e 100644 --- a/buildroot/board/orangepi/orangepi-r1/genimage.cfg +++ b/buildroot/board/orangepi/orangepi-r1/genimage.cfg @@ -13,13 +13,17 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with spl, move it after + gpt-location = 1M } partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8192 - size = 1040384 # 1MB - 8192 + size = 1056768 # 1MB - 8192 + 16384 (GPT) } partition boot { @@ -28,6 +32,8 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd b/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd index 4772a9be3..aa5162004 100644 --- a/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd +++ b/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd @@ -1,4 +1,4 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait fatload mmc 0 $kernel_addr_r Image fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb diff --git a/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg b/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg index 8091edad6..98ebf5b47 100644 --- a/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -11,6 +11,10 @@ image boot.vfat { image sdcard.img { hdimage { + # for root=PARTLABEL support + gpt = true + # default GPT location conflicts with bootloaders, move it after + gpt-location = 1M } partition spl { @@ -23,7 +27,7 @@ image sdcard.img { in-partition-table = "no" image = "u-boot.itb" offset = 40K - size = 1M # 1MB - 40K + size = 1024000 # 1MB - 40K + 16K(GPT) } partition boot { @@ -32,8 +36,11 @@ image sdcard.img { image = "boot.vfat" } + # 'rootfs' will be used as the partition label, used + # with root=PARTLABEL=rootfs kernel command line partition rootfs { partition-type = 0x83 image = "rootfs.ext4" + size = 256M } } diff --git a/buildroot/board/pine64/rock64/extlinux.conf b/buildroot/board/pine64/rock64/extlinux.conf new file mode 100644 index 000000000..bf71982a9 --- /dev/null +++ b/buildroot/board/pine64/rock64/extlinux.conf @@ -0,0 +1,4 @@ +label rock64-buildroot + kernel /boot/Image + devicetree /boot/rk3328-rock64.dtb + append console=ttyS2,1500000n8 root=/dev/mmcblk0p1 ro rootwait diff --git a/buildroot/board/pine64/rock64/genimage.cfg b/buildroot/board/pine64/rock64/genimage.cfg new file mode 100644 index 000000000..0b5a0d880 --- /dev/null +++ b/buildroot/board/pine64/rock64/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + } + + partition uboot-spl { + in-partition-table = "no" + image = "u-boot-tpl-spl.img" + offset = 32768 # 512 * 0x40 from start of sd card + } + + partition uboot { + in-partition-table = "no" + image = "u-boot.itb" + offset = 262144 # 512 * 0x200 from start of sd card + } + + partition rootfs { + partition-type = 0x83 + bootable = "yes" + image = "rootfs.ext2" + size = 500M + } +} diff --git a/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch new file mode 100644 index 000000000..2d35b78da --- /dev/null +++ b/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch @@ -0,0 +1,32 @@ +From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= +Date: Tue, 5 Feb 2019 22:08:54 +0100 +Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michał Łyszczek +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 8086f3c93e..a6425b5b03 100644 +--- a/Makefile ++++ b/Makefile +@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) + ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom + endif + ++# rk3328 needs itb image to boot properly ++ifeq ($(CONFIG_ROCKCHIP_RK3328),y) ++ALL-y += u-boot.itb ++endif ++ + # enable combined SPL/u-boot/dtb rules for tegra + ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) + ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin +-- +2.18.1 + diff --git a/buildroot/board/pine64/rock64/post-build.sh b/buildroot/board/pine64/rock64/post-build.sh new file mode 100755 index 000000000..26b53cba8 --- /dev/null +++ b/buildroot/board/pine64/rock64/post-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/bin/mkimage +BOARD_DIR="$(dirname $0)" + +$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/buildroot/board/pine64/rock64/readme.txt b/buildroot/board/pine64/rock64/readme.txt new file mode 100644 index 000000000..029c67641 --- /dev/null +++ b/buildroot/board/pine64/rock64/readme.txt @@ -0,0 +1,95 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Rock64. With this default configuration you +can log in into board via uart and look around. + +Board homepage: https://www.pine64.org/?page_id=7147 + +Build +===== + +First, load rock64 config for buildroot + + $ make rock64_defconfig + +Optionally make changes to buildroot config (to install more programs) + + $ make menuconfig + +And then build everything + + $ make + +When completed, following files will be generated in output/images directory: + + . + ├── Image + ├── bl31.bin + ├── bl31.elf + ├── rk3328-rock64.dtb + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot-spl.bin + ├── u-boot-tpl-spl.img + ├── u-boot-tpl.bin + ├── u-boot-tpl.img + ├── u-boot.bin + └── u-boot.itb + +Creating bootable SD card +========================= + +!!! THIS COMMAND MAY WIPE YOUR DISK! +!!! MAKE SURE YOU PASSED CORRECT DEVICE! +!!! OR IT THIS WILL WIPE YOUR DISK! + +Simply invoke (as root) + + # dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device (not partition), of= argument may also be +/dev/mmcblk0 if you are using built-in sd card reader. + +Runtime +======= + +Login +----- + +By default, buildroot has no password, just type 'root' as login user, and +you will be logged in. + +Serial console +-------------- + +Serial console needs to be connected to pins (into 40pin rpi compatible part) + +pin 6: gnd +pin 8: tx +pin 10: rx + +Pin numbers are printed on board. + +Uart configuration is not standard. Rock64 uses 1500000 (1,5M) baudrate +with standard 8n1. + +Ethernet +-------- + +To enable ethernet you need to load modules for it: + +# modprobe stmmac +# modprobe dwmac-rk + +and since by default there is no dhcp installed, you need to configure ip +address, remember to change address to fit your network. + +# ifconfig eth0 up +# ip addr add 10.1.1.180/24 dev eth0 +# ping 10.1.1.1 +PING 10.1.1.1 (10.1.1.1): 56 data bytes +64 bytes from 10.1.1.1: seq=0 ttl=64 time=0.695 ms diff --git a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch index a2c0962f8..956ae5f5f 100644 --- a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch @@ -1,4 +1,4 @@ -From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001 +From 525dd2f3cf4a94837ce6b71d793acb90c25a5654 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 1 Feb 2019 11:36:20 +0100 Subject: [PATCH] arm-versatile-nommu: Linux patch @@ -21,10 +21,10 @@ Signed-off-by: Romain Naour create mode 100644 arch/arm/mach-versatile/Makefile.boot diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index e8cd55a5b04c..fc2dbff70394 100644 +index 002e0cf025f5..c71299b6f91f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M +@@ -343,6 +343,17 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF @@ -43,10 +43,10 @@ index e8cd55a5b04c..fc2dbff70394 100644 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index f6fcb8a79889..92fc637d3db8 100644 +index 8986a91a6f31..69cb6404e8ce 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS +@@ -1943,7 +1943,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ @@ -57,10 +57,10 @@ index f6fcb8a79889..92fc637d3db8 100644 config EARLY_PRINTK diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h -index 9b7c328fb207..b1fe9c8b5c3e 100644 +index 92282558caf7..90bd9c069ffc 100644 --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h -@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, +@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, #else #define iotable_init(map,num) do { } while (0) #define vm_reserve_area_early(a,s,c) do { } while (0) @@ -69,7 +69,7 @@ index 9b7c328fb207..b1fe9c8b5c3e 100644 #endif diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig -index f5c275434d6c..06ad999d5978 100644 +index d88e7725bf99..d38b90157f13 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -1,7 +1,8 @@ @@ -93,10 +93,10 @@ index 000000000000..eacfc3f5c33e +# Patch waits for application at +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c -index 3c8d39c12909..8cfa05a37295 100644 +index 02ba68abe533..835b51bc597b 100644 --- a/arch/arm/mach-versatile/versatile_dt.c +++ b/arch/arm/mach-versatile/versatile_dt.c -@@ -37,7 +37,11 @@ +@@ -22,7 +22,11 @@ #include /* macro to get at MMIO space when running virtually */ @@ -109,5 +109,5 @@ index 3c8d39c12909..8cfa05a37295 100644 /* -- -2.14.5 +2.17.1 diff --git a/buildroot/board/qemu/arm-vexpress-tz/readme.txt b/buildroot/board/qemu/arm-vexpress-tz/readme.txt index b235ba5cd..abce75029 100644 --- a/buildroot/board/qemu/arm-vexpress-tz/readme.txt +++ b/buildroot/board/qemu/arm-vexpress-tz/readme.txt @@ -18,7 +18,7 @@ secure and non-secure worlds. -serial stdio \ -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ -semihosting-config enable,target=native \ - -bios bl1.bin + -bios bl1.bin # qemu_arm_vexpress_tz_defconfig The boot stage traces (if any) followed by the login prompt will appear in the terminal that started QEMU. diff --git a/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch index 801efb5d0..01d78f6ff 100644 --- a/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +++ b/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -1,4 +1,4 @@ -From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 25 Jul 2020 11:46:01 +0200 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 @@ -31,10 +31,10 @@ Signed-off-by: Romain Naour 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3"); @@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3"); @@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3"); @@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3"); @@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3"); @@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1 diff --git a/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch index 801efb5d0..01d78f6ff 100644 --- a/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +++ b/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -1,4 +1,4 @@ -From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001 +From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 25 Jul 2020 11:46:01 +0200 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 @@ -31,10 +31,10 @@ Signed-off-by: Romain Naour 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3"); @@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3"); @@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3"); @@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3"); @@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3"); @@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1 diff --git a/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch index ad2647e62..01d78f6ff 100644 --- a/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +++ b/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -1,4 +1,4 @@ -From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 25 Jul 2020 11:46:01 +0200 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 @@ -31,10 +31,10 @@ Signed-off-by: Romain Naour 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3"); @@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3"); @@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3"); @@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3"); @@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3"); @@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1 diff --git a/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch b/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch index ad2647e62..01d78f6ff 100644 --- a/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch +++ b/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch @@ -1,4 +1,4 @@ -From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001 +From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 25 Jul 2020 11:46:01 +0200 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6 @@ -31,10 +31,10 @@ Signed-off-by: Romain Naour 1 file changed, 45 insertions(+) diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h -index 0ae9b4cbc153..ea600e0ebfe7 100644 +index 2203e2d0ae2a..e28096faecf6 100644 --- a/arch/mips/include/asm/vdso/gettimeofday.h +++ b/arch/mips/include/asm/vdso/gettimeofday.h -@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback( +@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback( register long nr asm("v0") = __NR_gettimeofday; register long error asm("a3"); @@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback( +@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback( #endif register long error asm("a3"); @@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback( +@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback( #endif register long error asm("a3"); @@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback( +@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback( register long nr asm("v0") = __NR_clock_gettime; register long error asm("a3"); @@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback( +@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback( register long nr asm("v0") = __NR_clock_getres; register long error asm("a3"); @@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644 return error ? -ret : ret; } -- -2.25.4 +2.17.1 diff --git a/buildroot/board/qemu/post-image.sh b/buildroot/board/qemu/post-image.sh index 9a4d21627..88f041349 100755 --- a/buildroot/board/qemu/post-image.sh +++ b/buildroot/board/qemu/post-image.sh @@ -19,14 +19,17 @@ if [ -z "${QEMU_CMD_LINE}" ]; then exit 0 fi -# Replace output/images path by ${IMAGE_DIR} since the script -# will be in the same directory as the kernel and the rootfs images. -QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images/\${IMAGE_DIR\}}" +# Remove output/images path since the script will be in +# the same directory as the kernel and the rootfs images. +QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images\//}" # Remove -serial stdio if present, keep it as default args DEFAULT_ARGS="$(sed -r -e '/-serial stdio/!d; s/.*(-serial stdio).*/\1/' <<<"${QEMU_CMD_LINE}")" QEMU_CMD_LINE="${QEMU_CMD_LINE//-serial stdio/}" +# Remove any string before qemu-system-* +QEMU_CMD_LINE="$(sed -r -e 's/^.*(qemu-system-)/\1/' <<<"${QEMU_CMD_LINE}")" + # Disable graphical output and redirect serial I/Os to console case ${DEFCONFIG_NAME} in (qemu_sh4eb_r2d_defconfig|qemu_sh4_r2d_defconfig) @@ -40,7 +43,9 @@ esac cat <<-_EOF_ > "${START_QEMU_SCRIPT}" #!/bin/sh - IMAGE_DIR="\${0%/*}/" + ( + BINARIES_DIR="\${0%/*}/" + cd \${BINARIES_DIR} if [ "\${1}" = "serial-only" ]; then EXTRA_ARGS='${SERIAL_ARGS}' @@ -50,6 +55,7 @@ cat <<-_EOF_ > "${START_QEMU_SCRIPT}" export PATH="${HOST_DIR}/bin:\${PATH}" exec ${QEMU_CMD_LINE} \${EXTRA_ARGS} + ) _EOF_ chmod +x "${START_QEMU_SCRIPT}" diff --git a/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch b/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch index a7bc31bda..b8c8a7258 100644 --- a/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch +++ b/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch @@ -1,4 +1,4 @@ -From 44e3424424b447b00fbe1f10ddba81b55817e970 Mon Sep 17 00:00:00 2001 +From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 26 Dec 2018 00:00:40 +0000 Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler @@ -20,7 +20,7 @@ Signed-off-by: Romain Naour 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 37ac731a556b..5211ea4f48b1 100644 +index 5c8c06215dd4..e3dbea6d7ae0 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -12,7 +12,7 @@ @@ -32,7 +32,7 @@ index 37ac731a556b..5211ea4f48b1 100644 # Set default 32 bits cross compilers for vdso and boot wrapper CROSS32_COMPILE ?= -@@ -166,6 +166,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) +@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) @@ -40,7 +40,7 @@ index 37ac731a556b..5211ea4f48b1 100644 ifdef CONFIG_PPC_BOOK3S_64 ifdef CONFIG_CPU_LITTLE_ENDIAN CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 -@@ -177,6 +178,7 @@ endif +@@ -175,6 +176,7 @@ endif else CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 endif @@ -49,5 +49,5 @@ index 37ac731a556b..5211ea4f48b1 100644 ifdef CONFIG_FUNCTION_TRACER CC_FLAGS_FTRACE := -pg -- -2.25.4 +2.17.1 diff --git a/buildroot/board/qemu/ppc-virtex-ml507/linux.config b/buildroot/board/qemu/ppc-virtex-ml507/linux.config deleted file mode 100644 index ed4eb792b..000000000 --- a/buildroot/board/qemu/ppc-virtex-ml507/linux.config +++ /dev/null @@ -1,36 +0,0 @@ -CONFIG_44x=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_EBONY is not set -CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y -CONFIG_MATH_EMULATION=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_XILINX_SYSACE=y -CONFIG_NETDEVICES=y -CONFIG_SERIO_XILINX_XPS_PS2=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_XILINX_HWICAP=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y -CONFIG_FB=y -CONFIG_FB_XILINX=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_EXT4_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y diff --git a/buildroot/board/qemu/ppc-virtex-ml507/readme.txt b/buildroot/board/qemu/ppc-virtex-ml507/readme.txt deleted file mode 100644 index feb4b2d7d..000000000 --- a/buildroot/board/qemu/ppc-virtex-ml507/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb # qemu_ppc_virtex_ml507_defconfig - -The login prompt will appear in the terminal that started Qemu. diff --git a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch b/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch deleted file mode 100644 index 7543767a5..000000000 --- a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 21 Dec 2019 11:52:04 +0100 -Subject: [PATCH] arch/sh: vmlinux.scr - -Building the kernel using a toolchain built with Binutils 2.33.1 prevent -booting a sh4 system under Qemu. -Apply the patch provided by Alan Modra [2] that fix alignment of rodata. - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e -[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour ---- - arch/sh/boot/compressed/vmlinux.scr | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr -index 862d74808236..dd292b4b9082 100644 ---- a/arch/sh/boot/compressed/vmlinux.scr -+++ b/arch/sh/boot/compressed/vmlinux.scr -@@ -1,6 +1,6 @@ - SECTIONS - { -- .rodata..compressed : { -+ .rodata..compressed : ALIGN(8) { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) --- -2.24.1 - diff --git a/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch b/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch deleted file mode 100644 index 1faffea63..000000000 --- a/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 21 Dec 2019 11:54:07 +0100 -Subject: [PATCH] include/asm-generic: vmlinux.lds.h - -Building the kernel using a toolchain built with Binutils 2.33.1 prevent -booting a sh4 system under Qemu. -Apply the patch provided by Alan Modra [2] that fix alignment of rodata. - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e -[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour ---- - include/asm-generic/vmlinux.lds.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index d7701d466b60..1aa33597e91e 100644 ---- a/include/asm-generic/vmlinux.lds.h -+++ b/include/asm-generic/vmlinux.lds.h -@@ -306,6 +306,7 @@ - */ - #ifndef RO_AFTER_INIT_DATA - #define RO_AFTER_INIT_DATA \ -+ . = ALIGN(8); \ - __start_ro_after_init = .; \ - *(.data..ro_after_init) \ - __end_ro_after_init = .; --- -2.24.1 - diff --git a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch deleted file mode 100644 index 7543767a5..000000000 --- a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 21 Dec 2019 11:52:04 +0100 -Subject: [PATCH] arch/sh: vmlinux.scr - -Building the kernel using a toolchain built with Binutils 2.33.1 prevent -booting a sh4 system under Qemu. -Apply the patch provided by Alan Modra [2] that fix alignment of rodata. - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e -[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour ---- - arch/sh/boot/compressed/vmlinux.scr | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr -index 862d74808236..dd292b4b9082 100644 ---- a/arch/sh/boot/compressed/vmlinux.scr -+++ b/arch/sh/boot/compressed/vmlinux.scr -@@ -1,6 +1,6 @@ - SECTIONS - { -- .rodata..compressed : { -+ .rodata..compressed : ALIGN(8) { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) --- -2.24.1 - diff --git a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch deleted file mode 100644 index 445b71f40..000000000 --- a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 21 Dec 2019 11:54:07 +0100 -Subject: [PATCH] include/asm-generic: vmlinux.lds.h - -https://www.sourceware.org/ml/binutils/2019-12/msg00112.html - -Signed-off-by: Romain Naour ---- - include/asm-generic/vmlinux.lds.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index d7701d466b60..1aa33597e91e 100644 ---- a/include/asm-generic/vmlinux.lds.h -+++ b/include/asm-generic/vmlinux.lds.h -@@ -306,6 +306,7 @@ - */ - #ifndef RO_AFTER_INIT_DATA - #define RO_AFTER_INIT_DATA \ -+ . = ALIGN(8); \ - __start_ro_after_init = .; \ - *(.data..ro_after_init) \ - __end_ro_after_init = .; --- -2.24.1 - diff --git a/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch b/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch deleted file mode 100644 index 615be675a..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Cristian Ciocaltea -Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers -To: Rob Herring , - Andreas Färber , - Manivannan Sadhasivam -Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, - linux-kernel@vger.kernel.org -Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago) -X-Mailer: git-send-email 2.27.0 - -The PPI interrupts for cortex-a9 were incorrectly specified, fix them. - -Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar") -Signed-off-by: Cristian Ciocaltea -Signed-off-by: Peter Korsgaard ---- - arch/arm/boot/dts/owl-s500.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi -index 5ceb6cc4451d..1dbe4e8b38ac 100644 ---- a/arch/arm/boot/dts/owl-s500.dtsi -+++ b/arch/arm/boot/dts/owl-s500.dtsi -@@ -84,21 +84,21 @@ scu: scu@b0020000 { - global_timer: timer@b0020200 { - compatible = "arm,cortex-a9-global-timer"; - reg = <0xb0020200 0x100>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - twd_timer: timer@b0020600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0xb0020600 0x20>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - twd_wdt: wdt@b0020620 { - compatible = "arm,cortex-a9-twd-wdt"; - reg = <0xb0020620 0xe0>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - --- -2.27.0 - - diff --git a/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch b/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch deleted file mode 100644 index 87a6ee245..000000000 --- a/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: Cristian Ciocaltea -Subject: [PATCH 4/4] arm: dts: owl-s500: Add RoseapplePi -To: Rob Herring , - Andreas Färber , - Manivannan Sadhasivam -Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-kernel@lists.infradead.org -Date: Mon, 15 Jun 2020 03:19:11 +0300 (10 weeks, 3 days, 20 hours ago) -X-Mailer: git-send-email 2.27.0 - -Add a Device Tree for the RoseapplePi SBC. - -Signed-off-by: Cristian Ciocaltea -Signed-off-by: Peter Korsgaard ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/owl-s500-roseapplepi.dts | 47 ++++++++++++++++++++++ - 2 files changed, 48 insertions(+) - create mode 100644 arch/arm/boot/dts/owl-s500-roseapplepi.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index e8dd99201397..d0712e7275da 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -856,6 +856,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ - dtb-$(CONFIG_ARCH_ACTIONS) += \ - owl-s500-cubieboard6.dtb \ - owl-s500-guitar-bb-rev-b.dtb \ -+ owl-s500-roseapplepi.dtb \ - owl-s500-sparky.dtb - dtb-$(CONFIG_ARCH_PRIMA2) += \ - prima2-evb.dtb -diff --git a/arch/arm/boot/dts/owl-s500-roseapplepi.dts b/arch/arm/boot/dts/owl-s500-roseapplepi.dts -new file mode 100644 -index 000000000000..c61fbaa3821e ---- /dev/null -+++ b/arch/arm/boot/dts/owl-s500-roseapplepi.dts -@@ -0,0 +1,47 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Roseapple Pi -+ * -+ * Copyright (c) 2020 Cristian Ciocaltea -+ */ -+ -+/dts-v1/; -+ -+#include "owl-s500.dtsi" -+ -+/ { -+ compatible = "roseapplepi,roseapplepi", "actions,s500"; -+ model = "Roseapple Pi"; -+ -+ aliases { -+ serial2 = &uart2; -+ }; -+ -+ chosen { -+ stdout-path = "serial2:115200n8"; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x80000000>; /* 2GB */ -+ }; -+ -+ uart2_clk: uart2-clk { -+ compatible = "fixed-clock"; -+ clock-frequency = <921600>; -+ #clock-cells = <0>; -+ }; -+}; -+ -+&twd_timer { -+ status = "okay"; -+}; -+ -+&timer { -+ clocks = <&hosc>; -+}; -+ -+&uart2 { -+ status = "okay"; -+ clocks = <&uart2_clk>; -+}; --- -2.27.0 - - diff --git a/buildroot/board/sifive/hifive-unleashed/boot.cmd b/buildroot/board/sifive/hifive-unleashed/boot.cmd new file mode 100644 index 000000000..7b5137d22 --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/boot.cmd @@ -0,0 +1,4 @@ +setenv bootargs earlycon=sbi root=/dev/mmcblk0p3 rootwait +load mmc 0:3 ${kernel_addr_r} boot/Image +load mmc 0:3 ${fdt_addr_r} boot/hifive-unleashed-a00.dtb +booti ${kernel_addr_r} - ${fdt_addr_r} diff --git a/buildroot/board/sifive/hifive-unleashed/genimage.cfg b/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg similarity index 51% rename from buildroot/board/sifive/hifive-unleashed/genimage.cfg rename to buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg index 8eebc5235..e7f98a47c 100644 --- a/buildroot/board/sifive/hifive-unleashed/genimage.cfg +++ b/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -3,15 +3,21 @@ image sdcard.img { gpt = true } - partition bootloader { - image = "fw_payload.bin" - offset = 1M - size = 32M + partition u-boot-spl { + image = "u-boot-spl.bin" + offset = 17K + partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + } + + partition u-boot { + image = "u-boot.itb" + offset = 1041K partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 } partition rootfs { image = "rootfs.ext4" partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true } } diff --git a/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg new file mode 100644 index 000000000..2e5d89bfe --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -0,0 +1,19 @@ +image spi-nor.img { + size = 32M + + hdimage { + gpt = true + } + + partition u-boot-spl { + image = "u-boot-spl.bin" + offset = 20K + partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + } + + partition u-boot { + image = "u-boot.itb" + offset = 1044K + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + } +} diff --git a/buildroot/board/sifive/hifive-unleashed/linux.config.fragment b/buildroot/board/sifive/hifive-unleashed/linux.config.fragment index f4f384088..385a961dd 100644 --- a/buildroot/board/sifive/hifive-unleashed/linux.config.fragment +++ b/buildroot/board/sifive/hifive-unleashed/linux.config.fragment @@ -1,16 +1,10 @@ CONFIG_HZ_100=y -CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait" -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_SERIAL_SIFIVE=y -CONFIG_SERIAL_SIFIVE_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_SIFIVE=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SIFIVE=y -CONFIG_MMC=y -CONFIG_MMC_SPI=y -CONFIG_CLK_U54_PRCI=y -CONFIG_CLK_GEMGXL_MGMT=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y CONFIG_PWM=y CONFIG_PWM_SIFIVE=y diff --git a/buildroot/board/sifive/hifive-unleashed/post-build.sh b/buildroot/board/sifive/hifive-unleashed/post-build.sh new file mode 100755 index 000000000..b41812065 --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/post-build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/sifive/hifive-unleashed/readme.txt b/buildroot/board/sifive/hifive-unleashed/readme.txt index 8d3fa6357..3263913e9 100644 --- a/buildroot/board/sifive/hifive-unleashed/readme.txt +++ b/buildroot/board/sifive/hifive-unleashed/readme.txt @@ -28,30 +28,41 @@ Result of the build Once the build has finished you will have the following files: output/images/ + +-- boot.scr + +-- fw_dynamic.bin + +-- fw_dynamic.elf +-- fw_jump.bin +-- fw_jump.elf - +-- fw_payload.bin - +-- fw_payload.elf + +-- hifive-unleashed-a00.dtb +-- Image + +-- rootfs.cpio +-- rootfs.ext2 +-- rootfs.ext4 +-- rootfs.tar +-- sdcard.img + +-- u-boot.bin + +-- u-boot.itb + +-- u-boot-spl.bin Creating a bootable SD card with genimage ========================================= -Buildroot builds a SD card image for you. All you need to do is dd the -image to your SD card, which can be done with the following command: +By default Buildroot builds a SD card image for you. All you need to do +is dd the image to your SD card, which can be done with the following +command on your development host: - $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=4096 + $ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=4096 + +The above example command assumes the SD card is accessed via a USB card +reader and shows up as /dev/sdb on the host. Adjust it accordingly per +your actual setup. Booting the SD card on the board ================================ Make sure that the all DIP switches are set to the off position for -default boot mode (MSEL mode = 1111), insert the SD card and power +default boot mode (MSEL mode = 1011), insert the SD card and power up the board. Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1). @@ -60,16 +71,45 @@ See the 'SiFive HiFive Unleashed Getting Started Guide' for more details (https://www.sifive.com/documentation). You will get a warning reported by fdisk when you examine the SD card. -This is because the genimage.cfg file doesn't specify the SD card size -(as people will naturally have different sized cards), so the +This is because the genimage_sdcard.cfg file doesn't specify the SD card +size (as people will naturally have different sized cards), so the secondary GPT header is placed after the rootfs rather than at the end of the disk where it is expected to be. You will see something like this at boot time: -[ 2.318722] GPT:Primary header thinks Alt. header is not at the end of the disk. -[ 2.325390] GPT:190496 != 122142719 -[ 2.328843] GPT:Alternate GPT header not at the end of the disk. -[ 2.334824] GPT:190496 != 122142719 -[ 2.338302] GPT: Use GNU Parted to correct GPT errors. -[ 2.343456] mmcblk0: p1 p2 +[ 0.989458] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.996772] mmc0: new SDHC card on SPI +[ 1.001634] mmcblk0: mmc0:0000 SD8GB 7.28 GiB +[ 1.038079] GPT:Primary header thinks Alt. header is not at the end of the disk. +[ 1.044759] GPT:52389 != 15264767 +[ 1.048051] GPT:Alternate GPT header not at the end of the disk. +[ 1.054015] GPT:52389 != 15264767 +[ 1.057323] GPT: Use GNU Parted to correct GPT errors. +[ 1.062479] mmcblk0: p1 p2 p3 + + +Creating a bootable SPI flash with genimage +=========================================== + +Adjust Buildroot configuration by: + + $ make menuconfig + +Change "System configuration" -> "Extra arguments passed to custom scripts" +value to "-c board/sifive/hifive-unleashed/genimage_spi-nor.cfg", save the +configuration and build. This creates a output/images/spi-nor.img that can +be programmed to the on-board SPI flash. + +Boot the board from the SD card prepared above, stop the U-Boot auto boot, +and type the following commands to program the whole SPI flash: + + => tftp 82000000 output/images/spi-nor.img + => sf probe + => sf update 82000000 0 2000000 + +Booting the SPI flash on the board +================================== + +Make sure that the all DIP switches are set to the off position for +default boot mode (MSEL mode = 0110) to boot from SPI flash. diff --git a/buildroot/board/sinovoip/m1-plus/boot.cmd b/buildroot/board/sinovoip/m1-plus/boot.cmd new file mode 100644 index 000000000..482999647 --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/boot.cmd @@ -0,0 +1,5 @@ +setenv fdt_high ffffffff +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi-m1-plus.dtb +bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/sinovoip/m1-plus/genimage.cfg b/buildroot/board/sinovoip/m1-plus/genimage.cfg new file mode 100644 index 000000000..3cba774c6 --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/genimage.cfg @@ -0,0 +1,37 @@ +# Minimal SD card image for the Banana Pi M1+ +# Based on the Banana Pro genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun7i-a20-bananapi-m1-plus.dtb", + "boot.scr" + } + } + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment b/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment new file mode 100644 index 000000000..5576d738a --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment @@ -0,0 +1,10 @@ +# Networking support +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_CFG80211_WEXT=y +CONFIG_RFKILL=y + +# Network device support +CONFIG_WLAN=y +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_BRCMFMAC=m diff --git a/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch b/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch new file mode 100644 index 000000000..b01b6b282 --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch @@ -0,0 +1,39 @@ +From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001 +From: Filip Skoneczny +Date: Sun, 10 Jan 2021 19:07:14 +0100 +Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm + wifi module + + Based on 23bc805. + BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 + +Signed-off-by: Filip Skoneczny +--- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts +index 32d5d45a35c0..97f9987f51d7 100644 +--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts ++++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts +@@ -193,9 +193,14 @@ &mmc3 { + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; +- interrupt-parent = <&pio>; +- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; +- interrupt-names = "host-wake"; ++ /* ++ * OOB interrupt support is broken ATM, drv probe failing with: ++ * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 ++ * ++ * interrupt-parent = <&pio>; ++ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; ++ * interrupt-names = "host-wake"; ++ */ + }; + }; + +-- +2.25.1 + diff --git a/buildroot/board/sinovoip/m1-plus/post-build.sh b/buildroot/board/sinovoip/m1-plus/post-build.sh new file mode 100755 index 000000000..4ee6fa3bc --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Remove all but the brcmfmac43362 firmware files +find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete diff --git a/buildroot/board/sinovoip/m1-plus/readme.txt b/buildroot/board/sinovoip/m1-plus/readme.txt new file mode 100644 index 000000000..ae647c21a --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/readme.txt @@ -0,0 +1,64 @@ +Banana Pi M1+ + +Intro +===== + +This default configuration will allow you to start experimenting with the +Buildroot environment for the Banana Pi M1+. With the current configuration +it will bring-up the board, and allow access through the serial console. + +How to build it +=============== + +Configure Buildroot: + + $ make bananapi_m1_plus_defconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ dd if=output/images/sdcard.img of=/dev/sdX + +Notes: + - replace 'sdX' with the actual device with your micro SD card + - you may need to be root to do that (use 'sudo') + +Insert the micro SD card in your Banana Pi M1+ and power it up. The console +is on the debug TTL UART, 115200 8N1. + +Ethernet +========== + + # udhcpc -i eth0 + +Wifi +========== + + # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf + (enter the wifi password and press enter) + # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B + # udhcpc -i wlan0 + +Note: + - replace 'YOUR_SSID' with the actual SSID from your access point + +Audio +========== + +For this example you need package alsa-utils. + +Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+ +has an on-board microphone, too. + + # amixer cset name='Power Amplifier DAC Playback Switch' on + # amixer cset name='Power Amplifier Mute Switch' on + # amixer cset name='Power Amplifier Volume' 42 diff --git a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt new file mode 120000 index 000000000..93947975e --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt @@ -0,0 +1 @@ +brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt new file mode 100644 index 000000000..14a554fdd --- /dev/null +++ b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt @@ -0,0 +1,56 @@ +#AP6210_NVRAM_V1.2_03192013 +manfid=0x2d0 +prodid=0x492 +vendid=0x14e4 +devid=0x4343 +boardtype=0x0598 + +# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same +#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 +boardrev=0x1307 +boardnum=777 +xtalfreq=26000 +boardflags=0x80201 +boardflags2=0x80 +sromrev=3 +wl0id=0x431b +macaddr=00:90:4c:07:71:12 +aa2g=1 +ag0=2 +maxp2ga0=74 +cck2gpo=0x2222 +ofdm2gpo=0x44444444 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 +pa0maxpwr=56 + +#P207 PA params +#pa0b0=5447 +#pa0b1=-658 +#pa0b2=-175 + +#Same PA params for P304,P305, P306, P307 + +pa0b0=5447 +pa0b1=-607 +pa0b2=-160 +pa0itssit=62 +pa1itssit=62 + + +cckPwrOffset=5 +ccode=0 +rssismf2g=0xa +rssismc2g=0x3 +rssisav2g=0x7 +triso2g=0 +noise_cal_enable_2g=0 +noise_cal_po_2g=0 +swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff +temp_add=29767 +temp_mult=425 + +btc_flags=0x6 +btc_params0=5000 +btc_params1=1000 +btc_params6=63 diff --git a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh index eec3cb739..363c3127c 100755 --- a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh @@ -14,6 +14,8 @@ atf_image() echo "tf-a-stm32mp157c-dk2.stm32" elif grep -Eq "DTB_FILE_NAME=stm32mp157a-dk1.dtb" <<< ${ATF_VARIABLES}; then echo "tf-a-stm32mp157a-dk1.stm32" + elif grep -Eq "DTB_FILE_NAME=stm32mp157a-avenger96.dtb" <<< ${ATF_VARIABLES}; then + echo "tf-a-stm32mp157a-avenger96.stm32" fi } diff --git a/buildroot/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in index e505dee9d..c06294040 100644 --- a/buildroot/boot/arm-trusted-firmware/Config.in +++ b/buildroot/boot/arm-trusted-firmware/Config.in @@ -15,7 +15,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.2" + bool "v2.4" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.2" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.4" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 3cd83d78f..970613f38 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911 arm-trusted-firmware-v2.2.tar.gz +sha256 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d arm-trusted-firmware-v2.4.tar.gz sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst diff --git a/buildroot/boot/at91bootstrap3/at91bootstrap3.mk b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk index 5cf865c68..a942afcdc 100644 --- a/buildroot/boot/at91bootstrap3/at91bootstrap3.mk +++ b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk @@ -24,6 +24,9 @@ ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y) AT91BOOTSTRAP3_LICENSE_FILES = main.c endif +AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam +AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap + AT91BOOTSTRAP3_INSTALL_IMAGES = YES AT91BOOTSTRAP3_INSTALL_TARGET = NO diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index 3b354e64d..239c95bf9 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2020.09.0" + bool "2020.11.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2020.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2020.11.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index 77c75b6b5..3644601bb 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.09.0.tar.bz2.md5 -md5 907dc813298fcded06fa9c788d3fb6c8 barebox-2020.09.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2020.11.0.tar.bz2.md5 +md5 1fc2c1a03d7b44dc12fbf4cf1fc6ffe0 barebox-2020.11.0.tar.bz2 # Locally calculated -sha256 aad3b0736aa8d368d185736260d81fb3785251f376897be3cec745182fd51869 barebox-2020.09.0.tar.bz2 +sha256 049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554 barebox-2020.11.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/buildroot/boot/barebox/barebox.mk b/buildroot/boot/barebox/barebox.mk index 77550aaed..8f02f9f9e 100644 --- a/buildroot/boot/barebox/barebox.mk +++ b/buildroot/boot/barebox/barebox.mk @@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git # Override the default value of _SOURCE to 'barebox-*' so that it is not # downloaded a second time for barebox-aux; also alows avoiding the hash # check: -$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz +$(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz else # Handle stable official Barebox versions $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2 diff --git a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 117e11398..3a1af9b02 100644 --- a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7 +BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk index 5fca2315e..9686815f4 100644 --- a/buildroot/boot/grub2/grub2.mk +++ b/buildroot/boot/grub2/grub2.mk @@ -37,6 +37,7 @@ GRUB2_INSTALL_TARGET = YES else GRUB2_INSTALL_TARGET = NO endif +GRUB2_CPE_ID_VENDOR = gnu GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)) GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG)) diff --git a/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch b/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch deleted file mode 100644 index eada18b47..000000000 --- a/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5867fcad6e88af3d843bfa831648d84a53732d57 Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt -Date: Wed, 19 Dec 2018 17:17:13 +0100 -Subject: [PATCH] mv_ddr: mv_ddr4_training_leveling.c: uninitialized variable - -With GCC 8.2 uninitialized variables lead to a build error. - -Signed-off-by: Heinrich Schuchardt -Signed-off-by: Baruch Siach ---- -Upstream status: commit 5867fcad6e8 - - mv_ddr4_training_leveling.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c -index 144e21a03c01..cb95389f5466 100644 ---- a/mv_ddr4_training_leveling.c -+++ b/mv_ddr4_training_leveling.c -@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode - u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE); - u8 compare_result = 0; - u32 orig_phase; -- u32 rd_data, wr_data; -+ u32 rd_data, wr_data = 0; - u32 flag, step; - struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); - u32 ecc_phy_access_id; --- -2.20.1 - diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash index ec2fe6ed3..e1a86008d 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz +sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz sha256 69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78 ddr3_init.c diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk index a4e0c0467..442b6aed5 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This is the commit for mv_ddr-armada-18.12.0 -MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475 +# This is the latest commit on mv-ddr-devel as of 20201207 +MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION)) MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c diff --git a/buildroot/boot/shim/shim.mk b/buildroot/boot/shim/shim.mk index ba5bc5195..e0f01a8a9 100644 --- a/buildroot/boot/shim/shim.mk +++ b/buildroot/boot/shim/shim.mk @@ -8,6 +8,7 @@ SHIM_VERSION = 15 SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION)) SHIM_LICENSE = BSD-2-Clause SHIM_LICENSE_FILES = COPYRIGHT +SHIM_CPE_ID_VENDOR = redhat SHIM_DEPENDENCIES = gnu-efi SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES diff --git a/buildroot/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in index e4a0f48de..d43c85cce 100644 --- a/buildroot/boot/uboot/Config.in +++ b/buildroot/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2020.10" + bool "2021.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2020.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2021.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -229,6 +229,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF endchoice +config BR2_TARGET_UBOOT_NEEDS_OPENSBI + bool "U-Boot needs OpenSBI" + depends on BR2_TARGET_OPENSBI + help + Some RISC-V platforms (such as SiFive HiFive Unleashed) + encapsulate the OpenSBI firmware image inside U-Boot. + This option makes sure OpenSBI gets built prior to U-Boot, + and that the OpenSBI variable pointing to OpenSBI binary, + is passed during the Buildroot build. + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/buildroot/boot/uboot/uboot.hash b/buildroot/boot/uboot/uboot.hash index ba6ea0bfc..7cbd78554 100644 --- a/buildroot/boot/uboot/uboot.hash +++ b/buildroot/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 u-boot-2020.10.tar.bz2 +sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk index d2b4e8dc6..bb4598002 100644 --- a/buildroot/boot/uboot/uboot.mk +++ b/buildroot/boot/uboot/uboot.mk @@ -11,6 +11,8 @@ UBOOT_LICENSE = GPL-2.0+ ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt endif +UBOOT_CPE_ID_VENDOR = denx +UBOOT_CPE_ID_PRODUCT = u-boot UBOOT_INSTALL_IMAGES = YES @@ -161,14 +163,19 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin endif endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) +UBOOT_DEPENDENCIES += opensbi +UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y) -UBOOT_DEPENDENCIES += host-python +UBOOT_DEPENDENCIES += host-python host-python-setuptools else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) -UBOOT_DEPENDENCIES += host-python3 +UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) diff --git a/buildroot/boot/vexpress-firmware/vexpress-firmware.hash b/buildroot/boot/vexpress-firmware/vexpress-firmware.hash index 40f64c752..ac636e151 100644 --- a/buildroot/boot/vexpress-firmware/vexpress-firmware.hash +++ b/buildroot/boot/vexpress-firmware/vexpress-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz +sha256 ea92d686e6e211074fb0f62cb5e011f4cfc294c7f6ec9fb27b7d987db7bf51c5 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3-br1.tar.gz diff --git a/buildroot/configs/aarch64_efi_defconfig b/buildroot/configs/aarch64_efi_defconfig index 2aab6e969..99600575e 100644 --- a/buildroot/configs/aarch64_efi_defconfig +++ b/buildroot/configs/aarch64_efi_defconfig @@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.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 5.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=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="5.9.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/arm_foundationv8_defconfig b/buildroot/configs/arm_foundationv8_defconfig index ea19f3550..363f288b8 100644 --- a/buildroot/configs/arm_foundationv8_defconfig +++ b/buildroot/configs/arm_foundationv8_defconfig @@ -1,15 +1,18 @@ BR2_aarch64=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 5.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y -BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8" +BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw" +BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI=y +BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3=y diff --git a/buildroot/configs/avenger96_defconfig b/buildroot/configs/avenger96_defconfig new file mode 100644 index 000000000..d2c1b9013 --- /dev/null +++ b/buildroot/configs/avenger96_defconfig @@ -0,0 +1,34 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_STM32=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/bananapi_m1_plus_defconfig b/buildroot/configs/bananapi_m1_plus_defconfig new file mode 100644 index 000000000..8f278f932 --- /dev/null +++ b/buildroot/configs/bananapi_m1_plus_defconfig @@ -0,0 +1,44 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_GLOBAL_PATCH_DIR="board/sinovoip/m1-plus/patches" +BR2_TARGET_GENERIC_HOSTNAME="bananapi" +BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pi!" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_OVERLAY="board/sinovoip/m1-plus/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/sinovoip/m1-plus/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m1-plus/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.3" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sinovoip/m1-plus/linux-wifi.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi-m1-plus" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m1_plus" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m1-plus/boot.cmd" diff --git a/buildroot/configs/bananapi_m2_zero_defconfig b/buildroot/configs/bananapi_m2_zero_defconfig index e82814e33..e5c89fce4 100644 --- a/buildroot/configs/bananapi_m2_zero_defconfig +++ b/buildroot/configs/bananapi_m2_zero_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero" @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/freescale_imx6dlsabreauto_defconfig b/buildroot/configs/freescale_imx6dlsabreauto_defconfig index f8659e876..443dc92fb 100644 --- a/buildroot/configs/freescale_imx6dlsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6dlsabreauto_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6dlsabresd_defconfig b/buildroot/configs/freescale_imx6dlsabresd_defconfig index 069bfcbbb..488ceef46 100644 --- a/buildroot/configs/freescale_imx6dlsabresd_defconfig +++ b/buildroot/configs/freescale_imx6dlsabresd_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -39,5 +39,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6qsabreauto_defconfig b/buildroot/configs/freescale_imx6qsabreauto_defconfig index 8ce6e378c..1a0c96d52 100644 --- a/buildroot/configs/freescale_imx6qsabreauto_defconfig +++ b/buildroot/configs/freescale_imx6qsabreauto_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6qsabresd_defconfig b/buildroot/configs/freescale_imx6qsabresd_defconfig index b6cd1c40c..19d717330 100644 --- a/buildroot/configs/freescale_imx6qsabresd_defconfig +++ b/buildroot/configs/freescale_imx6qsabresd_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -40,5 +40,5 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6sxsabresd_defconfig b/buildroot/configs/freescale_imx6sxsabresd_defconfig index dd5283730..1628d7c5a 100644 --- a/buildroot/configs/freescale_imx6sxsabresd_defconfig +++ b/buildroot/configs/freescale_imx6sxsabresd_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -38,6 +38,6 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx6ullevk_defconfig b/buildroot/configs/freescale_imx6ullevk_defconfig index 6306c9720..88d095d40 100644 --- a/buildroot/configs/freescale_imx6ullevk_defconfig +++ b/buildroot/configs/freescale_imx6ullevk_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -17,7 +17,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/freescale_imx7dsabresd_defconfig b/buildroot/configs/freescale_imx7dsabresd_defconfig index d7119ef5a..a8b1df19f 100644 --- a/buildroot/configs/freescale_imx7dsabresd_defconfig +++ b/buildroot/configs/freescale_imx7dsabresd_defconfig @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -27,7 +27,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/freescale_imx8mmevk_defconfig b/buildroot/configs/freescale_imx8mmevk_defconfig index 38cd47063..13117189e 100644 --- a/buildroot/configs/freescale_imx8mmevk_defconfig +++ b/buildroot/configs/freescale_imx8mmevk_defconfig @@ -7,10 +7,10 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y @@ -21,14 +21,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/buildroot/configs/freescale_imx8mnevk_defconfig b/buildroot/configs/freescale_imx8mnevk_defconfig index 8c795fe21..192f5d297 100644 --- a/buildroot/configs/freescale_imx8mnevk_defconfig +++ b/buildroot/configs/freescale_imx8mnevk_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/buildroot/configs/freescale_imx8mqevk_defconfig b/buildroot/configs/freescale_imx8mqevk_defconfig index f0df74846..d5d22dcf2 100644 --- a/buildroot/configs/freescale_imx8mqevk_defconfig +++ b/buildroot/configs/freescale_imx8mqevk_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -21,14 +21,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/buildroot/configs/freescale_imx8qmmek_defconfig b/buildroot/configs/freescale_imx8qmmek_defconfig index 45b4dbd1b..0342c0a20 100644 --- a/buildroot/configs/freescale_imx8qmmek_defconfig +++ b/buildroot/configs/freescale_imx8qmmek_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -22,14 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/freescale_imx8qxpmek_defconfig b/buildroot/configs/freescale_imx8qxpmek_defconfig index 7c4a456c2..e37a7553a 100644 --- a/buildroot/configs/freescale_imx8qxpmek_defconfig +++ b/buildroot/configs/freescale_imx8qxpmek_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -24,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.70_2.3.0" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/hifive_unleashed_defconfig b/buildroot/configs/hifive_unleashed_defconfig index 24576570d..0b87f2588 100644 --- a/buildroot/configs/hifive_unleashed_defconfig +++ b/buildroot/configs/hifive_unleashed_defconfig @@ -12,29 +12,44 @@ BR2_RISCV_ABI_LP64D=y BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/hifive-unleashed/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage_sdcard.cfg" # Filesystem +BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/alistair23/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="hifive-unleashed-5.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" BR2_LINUX_KERNEL_IMAGE=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_PLAT="sifive/fu540" -BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_fu540" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_SPL=y # Host tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sifive/hifive-unleashed/boot.cmd" diff --git a/buildroot/configs/imx6-sabresd_defconfig b/buildroot/configs/imx6-sabresd_defconfig index 574816f7d..c0dce1ce6 100644 --- a/buildroot/configs/imx6-sabresd_defconfig +++ b/buildroot/configs/imx6-sabresd_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index b521f20ee..b23dd9019 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.63" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/kontron_smarc_sal28_defconfig b/buildroot/configs/kontron_smarc_sal28_defconfig index d4b2387e3..4a72bf3ec 100644 --- a/buildroot/configs/kontron_smarc_sal28_defconfig +++ b/buildroot/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,15 +9,27 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_RCW_SMARC_SAL28=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_sl28" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.rom" BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/lafrite_defconfig b/buildroot/configs/lafrite_defconfig index 5496bbc30..b3326f6b4 100644 --- a/buildroot/configs/lafrite_defconfig +++ b/buildroot/configs/lafrite_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" diff --git a/buildroot/configs/linksprite_pcduino_defconfig b/buildroot/configs/linksprite_pcduino_defconfig index 5a00e5728..b58f97049 100644 --- a/buildroot/configs/linksprite_pcduino_defconfig +++ b/buildroot/configs/linksprite_pcduino_defconfig @@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -38,11 +38,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/buildroot/configs/microchip_sam9x60ek_mmc_defconfig b/buildroot/configs/microchip_sam9x60ek_mmc_defconfig new file mode 100644 index 000000000..b389320e4 --- /dev/null +++ b/buildroot/configs/microchip_sam9x60ek_mmc_defconfig @@ -0,0 +1,27 @@ +BR2_arm=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" +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 +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.04)/linux-linux4sam-2020.04.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sam9x60ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +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_DEFCONFIG="sam9x60eksd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.04)/u-boot-at91-linux4sam-2020.04.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sam9x60ek_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig b/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig new file mode 100644 index 000000000..6c3fcc6b3 --- /dev/null +++ b/buildroot/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -0,0 +1,77 @@ +BR2_arm=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" +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 +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.04)/linux-linux4sam-2020.04.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sam9x60ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_ALSA_UTILS=y +BR2_PACKAGE_ALSA_UTILS_ALSACONF=y +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_FFMPEG=y +BR2_PACKAGE_FFMPEG_GPL=y +BR2_PACKAGE_FFMPEG_SWSCALE=y +BR2_PACKAGE_MPG123=y +BR2_PACKAGE_BZIP2=y +BR2_PACKAGE_GZIP=y +BR2_PACKAGE_UNZIP=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_ZIP=y +BR2_PACKAGE_GDB=y +BR2_PACKAGE_LMBENCH=y +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y +BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y +BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y +BR2_PACKAGE_MMC_UTILS=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_EVTEST=y +BR2_PACKAGE_I2C_TOOLS=y +BR2_PACKAGE_SETSERIAL=y +BR2_PACKAGE_SPI_TOOLS=y +BR2_PACKAGE_USBUTILS=y +BR2_PACKAGE_LIBSYSFS=y +BR2_PACKAGE_LIBDRM=y +BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y +BR2_PACKAGE_ARGP_STANDALONE=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BRIDGE_UTILS=y +BR2_PACKAGE_CAN_UTILS=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_IPERF=y +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_LRZSZ=y +BR2_PACKAGE_MII_DIAG=y +BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_WGET=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_BASH=y +BR2_PACKAGE_HTOP=y +BR2_PACKAGE_VIM=y +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_DEFCONFIG="sam9x60eksd_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.04)/u-boot-at91-linux4sam-2020.04.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sam9x60ek_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/minnowboard_max-graphical_defconfig b/buildroot/configs/minnowboard_max-graphical_defconfig index 910c324e2..3b769ca6e 100644 --- a/buildroot/configs/minnowboard_max-graphical_defconfig +++ b/buildroot/configs/minnowboard_max-graphical_defconfig @@ -3,7 +3,7 @@ BR2_x86_64=y BR2_x86_silvermont=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # needed for TARGET_GRUB2 @@ -24,7 +24,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Linux BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" diff --git a/buildroot/configs/minnowboard_max_defconfig b/buildroot/configs/minnowboard_max_defconfig index fef597c35..1270f2395 100644 --- a/buildroot/configs/minnowboard_max_defconfig +++ b/buildroot/configs/minnowboard_max_defconfig @@ -8,8 +8,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for grub2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -24,7 +24,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" diff --git a/buildroot/configs/mx51evk_defconfig b/buildroot/configs/mx51evk_defconfig index 0cb8f476c..a4bebdec9 100644 --- a/buildroot/configs/mx51evk_defconfig +++ b/buildroot/configs/mx51evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx51evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" diff --git a/buildroot/configs/mx53loco_defconfig b/buildroot/configs/mx53loco_defconfig index 69a94e071..18785aa0c 100644 --- a/buildroot/configs/mx53loco_defconfig +++ b/buildroot/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx53loco" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" diff --git a/buildroot/configs/nexbox_a95x_defconfig b/buildroot/configs/nexbox_a95x_defconfig index 4820d47d5..69f8b9078 100644 --- a/buildroot/configs/nexbox_a95x_defconfig +++ b/buildroot/configs/nexbox_a95x_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-s905x-nexbox-a95x" diff --git a/buildroot/configs/nitrogen6sx_defconfig b/buildroot/configs/nitrogen6sx_defconfig index d51ebcd10..8f1f7d7f6 100644 --- a/buildroot/configs/nitrogen6sx_defconfig +++ b/buildroot/configs/nitrogen6sx_defconfig @@ -24,8 +24,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -35,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen6x_defconfig b/buildroot/configs/nitrogen6x_defconfig index 13c14e6d2..b3b69fd34 100644 --- a/buildroot/configs/nitrogen6x_defconfig +++ b/buildroot/configs/nitrogen6x_defconfig @@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -34,8 +34,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen7_defconfig b/buildroot/configs/nitrogen7_defconfig index ddefe7cd0..156089ba3 100644 --- a/buildroot/configs/nitrogen7_defconfig +++ b/buildroot/configs/nitrogen7_defconfig @@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Last version of branch boundary-v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Last version of branch boundary-v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y @@ -34,8 +34,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Last version of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen8m_defconfig b/buildroot/configs/nitrogen8m_defconfig index 6e104ce84..0aa913aa5 100644 --- a/buildroot/configs/nitrogen8m_defconfig +++ b/buildroot/configs/nitrogen8m_defconfig @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.98_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +# Latest revision of branch boundary-imx_5.4.47_2.2.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/515fb041.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,18 +38,19 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Latest revision of branch boundary-imx_v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/buildroot/configs/nitrogen8mm_defconfig b/buildroot/configs/nitrogen8mm_defconfig index 2560b36c7..1767490d8 100644 --- a/buildroot/configs/nitrogen8mm_defconfig +++ b/buildroot/configs/nitrogen8mm_defconfig @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.98_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +# Latest revision of branch boundary-imx_5.4.47_2.2.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/515fb041.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,18 +38,19 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Latest revision of branch boundary-imx_v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/buildroot/configs/nitrogen8mn_defconfig b/buildroot/configs/nitrogen8mn_defconfig index cb5cc2480..cd5c4d928 100644 --- a/buildroot/configs/nitrogen8mn_defconfig +++ b/buildroot/configs/nitrogen8mn_defconfig @@ -28,8 +28,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.14.98_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/99e07a29.tar.gz" +# Latest revision of branch boundary-imx_5.4.47_2.2.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/515fb041.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,18 +38,19 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2018.07 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f9c6c45b.tar.gz" +# Latest revision of branch boundary-imx_v2020.10 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/e27d3240.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.x_2.1.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/62335a04.tar.gz" +# Latest revision of branch boundary-imx_5.4.x_2.2.0 +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/388bebee.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/buildroot/configs/orangepi_pc_defconfig b/buildroot/configs/orangepi_pc_defconfig index c1afb8566..44ea9b95c 100644 --- a/buildroot/configs/orangepi_pc_defconfig +++ b/buildroot/configs/orangepi_pc_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/buildroot/configs/orangepi_r1_defconfig b/buildroot/configs/orangepi_r1_defconfig index 7c3ec637e..bad1f9400 100644 --- a/buildroot/configs/orangepi_r1_defconfig +++ b/buildroot/configs/orangepi_r1_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1" @@ -19,9 +19,10 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" diff --git a/buildroot/configs/orangepi_zero_defconfig b/buildroot/configs/orangepi_zero_defconfig index 37d3d8dc7..b008523c8 100644 --- a/buildroot/configs/orangepi_zero_defconfig +++ b/buildroot/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/buildroot/configs/orangepi_zero_plus2_defconfig b/buildroot/configs/orangepi_zero_plus2_defconfig index 222736423..aa4c5c941 100644 --- a/buildroot/configs/orangepi_zero_plus2_defconfig +++ b/buildroot/configs/orangepi_zero_plus2_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -18,9 +18,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y @@ -34,7 +35,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" diff --git a/buildroot/configs/qemu_aarch64_virt_defconfig b/buildroot/configs/qemu_aarch64_virt_defconfig index 67dccc604..aa00ddf83 100644 --- a/buildroot/configs/qemu_aarch64_virt_defconfig +++ b/buildroot/configs/qemu_aarch64_virt_defconfig @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_arm_versatile_defconfig b/buildroot/configs/qemu_arm_versatile_defconfig index 6dc212397..10dd9e52b 100644 --- a/buildroot/configs/qemu_arm_versatile_defconfig +++ b/buildroot/configs/qemu_arm_versatile_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/buildroot/configs/qemu_arm_versatile_nommu_defconfig index 4108e706c..fa783f929 100644 --- a/buildroot/configs/qemu_arm_versatile_nommu_defconfig +++ b/buildroot/configs/qemu_arm_versatile_nommu_defconfig @@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/qemu_arm_vexpress_defconfig b/buildroot/configs/qemu_arm_vexpress_defconfig index a106530ec..20fdbb406 100644 --- a/buildroot/configs/qemu_arm_vexpress_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_defconfig @@ -19,13 +19,13 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. BR2_TARGET_ROOTFS_EXT2_SIZE="64M" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/buildroot/configs/qemu_arm_vexpress_tz_defconfig b/buildroot/configs/qemu_arm_vexpress_tz_defconfig index 5aeb6b429..3e37024de 100644 --- a/buildroot/configs/qemu_arm_vexpress_tz_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_tz_defconfig @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -43,6 +43,10 @@ BR2_PACKAGE_OPTEE_BENCHMARK=y BR2_PACKAGE_OPTEE_EXAMPLES=y BR2_PACKAGE_OPTEE_TEST=y +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + # U-boot for booting the dear Linux kernel BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/buildroot/configs/qemu_m68k_mcf5208_defconfig b/buildroot/configs/qemu_m68k_mcf5208_defconfig index 0806dc0ac..c45a77555 100644 --- a/buildroot/configs/qemu_m68k_mcf5208_defconfig +++ b/buildroot/configs/qemu_m68k_mcf5208_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_m68k_q800_defconfig b/buildroot/configs/qemu_m68k_q800_defconfig index b54d502be..abd0560cb 100644 --- a/buildroot/configs/qemu_m68k_q800_defconfig +++ b/buildroot/configs/qemu_m68k_q800_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_microblazebe_mmu_defconfig b/buildroot/configs/qemu_microblazebe_mmu_defconfig index a989e555b..638c6629d 100644 --- a/buildroot/configs/qemu_microblazebe_mmu_defconfig +++ b/buildroot/configs/qemu_microblazebe_mmu_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/buildroot/configs/qemu_microblazeel_mmu_defconfig b/buildroot/configs/qemu_microblazeel_mmu_defconfig index ccd679fd9..6e62cc330 100644 --- a/buildroot/configs/qemu_microblazeel_mmu_defconfig +++ b/buildroot/configs/qemu_microblazeel_mmu_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/buildroot/configs/qemu_mips32r2_malta_defconfig b/buildroot/configs/qemu_mips32r2_malta_defconfig index f56e95b14..434e3d953 100644 --- a/buildroot/configs/qemu_mips32r2_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r2el_malta_defconfig b/buildroot/configs/qemu_mips32r2el_malta_defconfig index 9548a8218..2b8b2e8df 100644 --- a/buildroot/configs/qemu_mips32r2el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2el_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r6_malta_defconfig b/buildroot/configs/qemu_mips32r6_malta_defconfig index 935fc4c2a..bf1306a2b 100644 --- a/buildroot/configs/qemu_mips32r6_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips32r6el_malta_defconfig b/buildroot/configs/qemu_mips32r6el_malta_defconfig index dfaf11afb..5edf591bc 100644 --- a/buildroot/configs/qemu_mips32r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6el_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64_malta_defconfig b/buildroot/configs/qemu_mips64_malta_defconfig index 4a0531947..ec841b5a0 100644 --- a/buildroot/configs/qemu_mips64_malta_defconfig +++ b/buildroot/configs/qemu_mips64_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64el_malta_defconfig b/buildroot/configs/qemu_mips64el_malta_defconfig index 06e80b339..680ccbbd6 100644 --- a/buildroot/configs/qemu_mips64el_malta_defconfig +++ b/buildroot/configs/qemu_mips64el_malta_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64r6_malta_defconfig b/buildroot/configs/qemu_mips64r6_malta_defconfig index 035c664fe..53c5c0978 100644 --- a/buildroot/configs/qemu_mips64r6_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6_malta_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_mips64r6el_malta_defconfig b/buildroot/configs/qemu_mips64r6el_malta_defconfig index 26e945853..8230b1a9f 100644 --- a/buildroot/configs/qemu_mips64r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6el_malta_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_nios2_10m50_defconfig b/buildroot/configs/qemu_nios2_10m50_defconfig index cfb83ff66..d562e941b 100644 --- a/buildroot/configs/qemu_nios2_10m50_defconfig +++ b/buildroot/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -10,8 +10,8 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/qemu_or1k_defconfig b/buildroot/configs/qemu_or1k_defconfig index 4ccb58ef1..21d86e22c 100644 --- a/buildroot/configs/qemu_or1k_defconfig +++ b/buildroot/configs/qemu_or1k_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/buildroot/configs/qemu_ppc64_e5500_defconfig b/buildroot/configs/qemu_ppc64_e5500_defconfig index 1e030f5c7..dace0af8e 100644 --- a/buildroot/configs/qemu_ppc64_e5500_defconfig +++ b/buildroot/configs/qemu_ppc64_e5500_defconfig @@ -10,12 +10,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_ppc64_pseries_defconfig b/buildroot/configs/qemu_ppc64_pseries_defconfig index 91d0c528f..4ce116e26 100644 --- a/buildroot/configs/qemu_ppc64_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64_pseries_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc64le_pseries_defconfig b/buildroot/configs/qemu_ppc64le_pseries_defconfig index effc3cf8f..3be9de74a 100644 --- a/buildroot/configs/qemu_ppc64le_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64le_pseries_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_g3beige_defconfig b/buildroot/configs/qemu_ppc_g3beige_defconfig index c04260cf9..6e41afe8d 100644 --- a/buildroot/configs/qemu_ppc_g3beige_defconfig +++ b/buildroot/configs/qemu_ppc_g3beige_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_mac99_defconfig b/buildroot/configs/qemu_ppc_mac99_defconfig index 33e819426..a1e9c1a5a 100644 --- a/buildroot/configs/qemu_ppc_mac99_defconfig +++ b/buildroot/configs/qemu_ppc_mac99_defconfig @@ -5,13 +5,13 @@ BR2_powerpc_7400=y # System BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig index 9ec94a483..55e6db5a0 100644 --- a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig +++ b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig deleted file mode 100644 index 6425e1a8b..000000000 --- a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig +++ /dev/null @@ -1,34 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_440=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Use soft float -BR2_POWERPC_SOFT_FLOAT=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig index 5447342dd..104208898 100644 --- a/buildroot/configs/qemu_riscv32_virt_defconfig +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.61" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index 01633d5ad..93d38b1ec 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/buildroot/configs/qemu_s390x_defconfig b/buildroot/configs/qemu_s390x_defconfig index b3c2641d1..9b3821f04 100644 --- a/buildroot/configs/qemu_s390x_defconfig +++ b/buildroot/configs/qemu_s390x_defconfig @@ -11,13 +11,13 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/qemu_sh4_r2d_defconfig b/buildroot/configs/qemu_sh4_r2d_defconfig index a465547c8..a14277dd0 100644 --- a/buildroot/configs/qemu_sh4_r2d_defconfig +++ b/buildroot/configs/qemu_sh4_r2d_defconfig @@ -3,7 +3,6 @@ BR2_sh=y BR2_sh4=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4-r2d/patches" BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" @@ -15,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sh4eb_r2d_defconfig b/buildroot/configs/qemu_sh4eb_r2d_defconfig index 24a9f2169..4911ba035 100644 --- a/buildroot/configs/qemu_sh4eb_r2d_defconfig +++ b/buildroot/configs/qemu_sh4eb_r2d_defconfig @@ -3,7 +3,6 @@ BR2_sh=y BR2_sh4eb=y # System -BR2_GLOBAL_PATCH_DIR="board/qemu/sh4eb-r2d/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" # Filesystem @@ -14,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/buildroot/configs/qemu_sparc64_sun4u_defconfig b/buildroot/configs/qemu_sparc64_sun4u_defconfig index 254f2d924..cff0c2968 100644 --- a/buildroot/configs/qemu_sparc64_sun4u_defconfig +++ b/buildroot/configs/qemu_sparc64_sun4u_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/buildroot/configs/qemu_sparc_ss10_defconfig b/buildroot/configs/qemu_sparc_ss10_defconfig index 1fdebfced..0181f1684 100644 --- a/buildroot/configs/qemu_sparc_ss10_defconfig +++ b/buildroot/configs/qemu_sparc_ss10_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" diff --git a/buildroot/configs/qemu_x86_64_defconfig b/buildroot/configs/qemu_x86_64_defconfig index 60b446861..25e0d43f4 100644 --- a/buildroot/configs/qemu_x86_64_defconfig +++ b/buildroot/configs/qemu_x86_64_defconfig @@ -15,13 +15,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" diff --git a/buildroot/configs/qemu_x86_defconfig b/buildroot/configs/qemu_x86_defconfig index ef38d98dd..bcd325b7e 100644 --- a/buildroot/configs/qemu_x86_defconfig +++ b/buildroot/configs/qemu_x86_defconfig @@ -16,13 +16,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/buildroot/configs/qemu_xtensa_lx60_defconfig b/buildroot/configs/qemu_xtensa_lx60_defconfig index 79ae11d8f..50c1c4ccf 100644 --- a/buildroot/configs/qemu_xtensa_lx60_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_defconfig @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig index 09a388868..baf72da9b 100644 --- a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig @@ -19,13 +19,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/buildroot/configs/raspberrypi0_defconfig b/buildroot/configs/raspberrypi0_defconfig index 930d7d9e5..c06d6dfcb 100644 --- a/buildroot/configs/raspberrypi0_defconfig +++ b/buildroot/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/buildroot/configs/raspberrypi0w_defconfig b/buildroot/configs/raspberrypi0w_defconfig index 08d6ec2e2..b54bb34ad 100644 --- a/buildroot/configs/raspberrypi0w_defconfig +++ b/buildroot/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/buildroot/configs/raspberrypi2_defconfig b/buildroot/configs/raspberrypi2_defconfig index 406e7c946..5104422cb 100644 --- a/buildroot/configs/raspberrypi2_defconfig +++ b/buildroot/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_64_defconfig b/buildroot/configs/raspberrypi3_64_defconfig index 51bd88eed..65c1291e6 100644 --- a/buildroot/configs/raspberrypi3_64_defconfig +++ b/buildroot/configs/raspberrypi3_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_defconfig b/buildroot/configs/raspberrypi3_defconfig index cbe3daaf6..96eca54f0 100644 --- a/buildroot/configs/raspberrypi3_defconfig +++ b/buildroot/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi3_qt5we_defconfig b/buildroot/configs/raspberrypi3_qt5we_defconfig index 222d29952..8015288ac 100644 --- a/buildroot/configs/raspberrypi3_qt5we_defconfig +++ b/buildroot/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi4_64_defconfig b/buildroot/configs/raspberrypi4_64_defconfig index b80cf4117..94ac5cf5e 100644 --- a/buildroot/configs/raspberrypi4_64_defconfig +++ b/buildroot/configs/raspberrypi4_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi4_defconfig b/buildroot/configs/raspberrypi4_defconfig index b652c7b10..c2ed5e73c 100644 --- a/buildroot/configs/raspberrypi4_defconfig +++ b/buildroot/configs/raspberrypi4_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/buildroot/configs/raspberrypi_defconfig b/buildroot/configs/raspberrypi_defconfig index edff12dd4..2d3bb536b 100644 --- a/buildroot/configs/raspberrypi_defconfig +++ b/buildroot/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ff93994fb3f92070d8521d709ad04675ecaa5817)/linux-ff93994fb3f92070d8521d709ad04675ecaa5817.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,967d45b29ca2902f031b867809d72e3b3d623e7a)/linux-967d45b29ca2902f031b867809d72e3b3d623e7a.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/buildroot/configs/rock64_defconfig b/buildroot/configs/rock64_defconfig new file mode 100644 index 000000000..a9d29a424 --- /dev/null +++ b/buildroot/configs/rock64_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rock64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rock64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.19" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-rock64" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/*.elf" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-mainline-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="release-2020-07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin tpl/u-boot-tpl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/roseapplepi_defconfig b/buildroot/configs/roseapplepi_defconfig index 45c42ec0f..2af94d010 100644 --- a/buildroot/configs/roseapplepi_defconfig +++ b/buildroot/configs/roseapplepi_defconfig @@ -3,15 +3,15 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y diff --git a/buildroot/configs/snps_archs38_hsdk_defconfig b/buildroot/configs/snps_archs38_hsdk_defconfig index 9a9d57b32..4a1ac3fcf 100644 --- a/buildroot/configs/snps_archs38_hsdk_defconfig +++ b/buildroot/configs/snps_archs38_hsdk_defconfig @@ -1,33 +1,23 @@ -# Architecture BR2_arcle=y BR2_archs38_full=y - -# Linux headers same as kernel, a 5.6 series +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y - -# System +BR2_PACKAGE_GLIBC_UTILS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_OPTIMIZATION="-mfpu=fpud_all" BR2_TARGET_GENERIC_HOSTNAME="hsdk" BR2_TARGET_GENERIC_ISSUE="Welcome to the HSDK Platform" BR2_SYSTEM_DHCP="eth0" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/synopsys/hsdk/genimage.cfg" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -35,7 +25,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_ELF=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/synopsys/hsdk/uboot.env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" diff --git a/buildroot/configs/solidrun_clearfog_gt_8k_defconfig b/buildroot/configs/solidrun_clearfog_gt_8k_defconfig index 8804ce047..bec4a7dac 100644 --- a/buildroot/configs/solidrun_clearfog_gt_8k_defconfig +++ b/buildroot/configs/solidrun_clearfog_gt_8k_defconfig @@ -1,17 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="clearfog-gt-8k" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" -# This commit corresponds to release armada-18.12.2 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y @@ -19,7 +18,7 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog_gt_8k" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-fragment.config" @@ -27,7 +26,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-frag # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config" @@ -38,6 +37,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" diff --git a/buildroot/configs/solidrun_macchiatobin_defconfig b/buildroot/configs/solidrun_macchiatobin_defconfig index f1ca7764b..7d06313b0 100644 --- a/buildroot/configs/solidrun_macchiatobin_defconfig +++ b/buildroot/configs/solidrun_macchiatobin_defconfig @@ -1,17 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" -# This commit corresponds to release armada-18.12.2 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y @@ -19,7 +18,7 @@ BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040" @@ -28,7 +27,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragme # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" diff --git a/buildroot/configs/wandboard_defconfig b/buildroot/configs/wandboard_defconfig index 4882042a1..8f9e30a1a 100644 --- a/buildroot/configs/wandboard_defconfig +++ b/buildroot/configs/wandboard_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -14,13 +14,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index b8bfcb4af..75af18b70 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -502,6 +502,45 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 LIBFOO_IGNORE_CVES += CVE-2020-54321 ---------------------- +* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the + package to define its https://nvd.nist.gov/products/cpe[CPE + identifier]. The available variables are: ++ +-- +** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier, + i.e the first three fields. When not defined, the default value is + +cpe:2.3:a+. + +** +LIBFOO_CPE_ID_VENDOR+, specifies the vendor part of the CPE + identifier. When not defined, the default value is + +_project+. + +** +LIBFOO_CPE_ID_PRODUCT+, specifies the product part of the CPE + identifier. When not defined, the default value is ++. + +** +LIBFOO_CPE_ID_VERSION+, specifies the version part of the CPE + identifier. When not defined the default value is + +$(LIBFOO_VERSION)+. + +** +LIBFOO_CPE_ID_UPDATE+ specifies the _update_ part of the CPE + identifier. When not defined the default value is +*+. +-- ++ +If any of those variables is defined, then the generic package +infrastructure assumes the package provides valid CPE information. In +this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic +package infrastructure will define +LIBFOO_CPE_ID+. ++ +Alternatively, a package can also explicitly set +LIBFOO_CPE_ID_VALID += YES+ if the default values for +LIBFOO_CPE_ID_PREFIX+, ++LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_PRODUCT+, ++LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_UPDATE+ are all correct for +this package and don't need to be explicitly overridden. ++ +For a host package, if its +LIBFOO_CPE_ID_*+ variables are not +defined, it inherits the value of those variables from the +corresponding target package. + The recommended way to define these variables is to use the following syntax: diff --git a/buildroot/docs/manual/adding-packages-qmake.txt b/buildroot/docs/manual/adding-packages-qmake.txt index e1621e914..c7e6ff354 100644 --- a/buildroot/docs/manual/adding-packages-qmake.txt +++ b/buildroot/docs/manual/adding-packages-qmake.txt @@ -79,3 +79,7 @@ also be defined. * +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional targets to pass to the +make+ command during the target installation step. By default, +install+. + +* +LIBFOO_SYNC_HEADERS+, to run syncqt.pl before qmake. Some packages + need this to have a properly populated include directory before + running the build. diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index d2c5c57c0..96c29da0b 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2020.11.2 manual generated on 2021-01-31 -20:36:50 UTC from git revision 551cb63007

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

The Buildroot user manual

Table of Contents

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

List of Examples

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

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

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

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -3322,7 +3322,38 @@ If the package is dual licensed, then separate licenses with the 

# 0001-fix-cve-2020-12345.patch
 LIBFOO_IGNORE_CVES += CVE-2020-12345
 # only when built with libbaz, which Buildroot doesn't support
-LIBFOO_IGNORE_CVES += CVE-2020-54321

The recommended way to define these variables is to use the following +LIBFOO_IGNORE_CVES += CVE-2020-54321

  • +LIBFOO_CPE_ID_* variables is a set of variables that allows the + package to define its CPE + identifier. The available variables are: +

    • +LIBFOO_CPE_ID_PREFIX, specifies the prefix of the CPE identifier, + i.e the first three fields. When not defined, the default value is + cpe:2.3:a. +
    • +LIBFOO_CPE_ID_VENDOR, specifies the vendor part of the CPE + identifier. When not defined, the default value is + <pkgname>_project. +
    • +LIBFOO_CPE_ID_PRODUCT, specifies the product part of the CPE + identifier. When not defined, the default value is <pkgname>. +
    • +LIBFOO_CPE_ID_VERSION, specifies the version part of the CPE + identifier. When not defined the default value is + $(LIBFOO_VERSION). +
    • +LIBFOO_CPE_ID_UPDATE specifies the update part of the CPE + identifier. When not defined the default value is *. +

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

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

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

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

LIBFOO_VERSION = 2.32

Now, the variables that define what should be performed at the different steps of the build process.

  • LIBFOO_EXTRACT_CMDS lists the actions to be performed to extract @@ -4524,6 +4555,10 @@ also be defined.

      LIBFOO_INSTALL_TARGET_OPTS, to specify additional targets to pass to the make command during the target installation step. By default, install. +
    • +LIBFOO_SYNC_HEADERS, to run syncqt.pl before qmake. Some packages + need this to have a properly populated include directory before + running the build.

18.19. Infrastructure for packages building kernel modules

Buildroot offers a helper infrastructure to make it easy to write packages that build and install Linux kernel modules. Some packages only contain a kernel module, other packages contain programs and libraries in addition to kernel @@ -5387,7 +5422,7 @@ large number of commits in the series;

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

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

    Chapter 23. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +

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

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

    Chapter 23. DEVELOPERS file and get-developers

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

    + +
    +
    Public training course
    +
    + The next online public training course on Buildroot + organized + by Bootlin will + take place on March 8-11, 2021, with Thomas Petazzoni as + trainer. Infos + and registration. +
    +
    diff --git a/buildroot/docs/website/download.html b/buildroot/docs/website/download.html index b971db39b..1bc7104a4 100644 --- a/buildroot/docs/website/download.html +++ b/buildroot/docs/website/download.html @@ -8,108 +8,108 @@
    Download
    -

    Latest long term support release: 2020.02.8

    +

    Latest long term support release: 2020.02.11

    - +
    - +
    -

    buildroot-2020.02.8.tar.gz

    -

    PGP signature

    +

    buildroot-2020.02.11.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2020.02.8.tar.bz2

    -

    PGP signature

    +

    buildroot-2020.02.11.tar.bz2

    +

    PGP signature

    -

    Latest stable release: 2020.11

    +

    Latest stable release: 2020.11.3

    - +
    - +
    -

    buildroot-2020.11.tar.gz

    -

    PGP signature

    +

    buildroot-2020.11.3.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2020.11.tar.bz2

    -

    PGP signature

    +

    buildroot-2020.11.3.tar.bz2

    +

    PGP signature

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

    News

      +
    • +
      +
      +
      +

      2021.02-rc3 released

      +

      27 February 2021

      +
      +
      +

      2021.02-rc3 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.02-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.11 released

      +

      17 February 2021

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.11.3 released

      +

      17 February 2021

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2021.02-rc2 released

      +

      17 February 2021

      +
      +
      +

      2021.02-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.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2021.02-rc1 released

      +

      9 February 2021

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2021.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.10 released

      +

      31 January 2021

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.11.2 released

      +

      31 January 2021

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.02.9 released

      +

      27 December 2020

      +
      +
      +

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

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.08.3 released, 2020.08.x series EOL

      +

      27 December 2020

      +
      +
      +

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

      + +

      Notice that the 2020.08.x series is now end of life. Please migrate to + the 2020.11 series instead which will be supported until March 2021.

      +
      +
      +
      • + +
    • +
      +
      +
      +

      2020.11.1 released

      +

      27 December 2020

      +
      +
      +

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

      +
      +
      +
      • +
    • @@ -20,7 +219,8 @@

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

      diff --git a/buildroot/fs/common.mk b/buildroot/fs/common.mk index 84e13d1b7..afab7b50f 100644 --- a/buildroot/fs/common.mk +++ b/buildroot/fs/common.mk @@ -154,6 +154,11 @@ ifeq ($(BR2_REPRODUCIBLE),) ROOTFS_$(2)_COMPRESS_CMD += -T $(PARALLEL_JOBS) endif endif +ifeq ($(BR2_TARGET_ROOTFS_$(2)_ZSTD),y) +ROOTFS_$(2)_DEPENDENCIES += host-zstd +ROOTFS_$(2)_COMPRESS_EXT = .zst +ROOTFS_$(2)_COMPRESS_CMD = zstd -19 -z -f -T$(PARALLEL_JOBS) +endif $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2) $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot diff --git a/buildroot/fs/cpio/Config.in b/buildroot/fs/cpio/Config.in index 83a7fa582..c1151a288 100644 --- a/buildroot/fs/cpio/Config.in +++ b/buildroot/fs/cpio/Config.in @@ -51,6 +51,11 @@ config BR2_TARGET_ROOTFS_CPIO_XZ help Do compress the cpio filesystem with xz. +config BR2_TARGET_ROOTFS_CPIO_ZSTD + bool "zstd" + help + Do compress the cpio filesystem with zstd. + endchoice config BR2_TARGET_ROOTFS_CPIO_UIMAGE diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index a856f5a74..f0515632e 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -28,7 +28,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.9)" + bool "Latest version (5.10)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (4.19.152-cip37)" @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.9.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ @@ -263,6 +263,10 @@ config BR2_LINUX_KERNEL_IMAGE bool "Image" depends on BR2_aarch64 || BR2_riscv +config BR2_LINUX_KERNEL_IMAGEGZ + bool "Image.gz" + depends on BR2_aarch64 || BR2_riscv + config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" depends on BR2_microblaze diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index c18240d8b..5200c53a3 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,12 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86 linux-5.9.16.tar.xz -sha256 4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534 linux-5.8.18.tar.xz -sha256 d37449403664cc3b1bac96d0d9a199dbe619885cd899c0ae3108843f42e3d522 linux-5.4.93.tar.xz +sha256 06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2 linux-5.10.13.tar.xz +sha256 030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449 linux-5.4.95.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 661e98b9448cbac948c705fd44cd7d30200422ee1cb02950d142aa99a1b3985a linux-4.4.253.tar.xz -sha256 9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18 linux-4.9.253.tar.xz -sha256 62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11 linux-4.14.217.tar.xz -sha256 f4e352fe0eb986e5b532b99d9b0725a67046cbb3e5f53fcd5b098cbaeb2ac60a linux-4.19.171.tar.xz +sha256 2f3830ed4767b27dc6ead9af5c802eed7258b28c527efe90ce188cc6bd668550 linux-4.4.255.tar.xz +sha256 afdf2d03c920f6b12f4e207ab18e45fbe2d7f4a61c066eff0d9916fc5d00c118 linux-4.9.255.tar.xz +sha256 75eecaa731c091fcf3bc2ec914b01d299a447d78041cb66a11a2ab169eb801dd linux-4.14.219.tar.xz +sha256 d2fdd236e6f31aa8e939f4a686c95417d8571bde3d091fc6a2535937c144195f linux-4.19.173.tar.xz # Locally computed sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk index e07e014d1..a212f42c2 100644 --- a/buildroot/linux/linux.mk +++ b/buildroot/linux/linux.mk @@ -12,6 +12,9 @@ LINUX_LICENSE_FILES = \ LICENSES/preferred/GPL-2.0 \ LICENSES/exceptions/Linux-syscall-note endif +LINUX_CPE_ID_VENDOR = linux +LINUX_CPE_ID_PRODUCT = linux_kernel +LINUX_CPE_ID_PREFIX = cpe:2.3:o define LINUX_HELP_CMDS @echo ' linux-menuconfig - Run Linux kernel menuconfig' @@ -201,6 +204,8 @@ else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y) LINUX_IMAGE_NAME = simpleImage.$(firstword $(LINUX_DTS_NAME)) else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y) LINUX_IMAGE_NAME = Image +else ifeq ($(BR2_LINUX_KERNEL_IMAGEGZ),y) +LINUX_IMAGE_NAME = Image.gz else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y) LINUX_IMAGE_NAME = linux.bin else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y) diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in index 645481f4d..5304ab141 100644 --- a/buildroot/package/Config.in +++ b/buildroot/package/Config.in @@ -87,7 +87,10 @@ menu "Debugging, profiling and benchmark" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/coremark/Config.in" + source "package/coremark-pro/Config.in" source "package/dacapo/Config.in" + source "package/delve/Config.in" source "package/dhrystone/Config.in" source "package/dieharder/Config.in" source "package/dmalloc/Config.in" @@ -122,6 +125,7 @@ menu "Debugging, profiling and benchmark" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" source "package/piglit/Config.in" + source "package/ply/Config.in" source "package/ptm2human/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" @@ -240,6 +244,7 @@ comment "Fonts" source "package/ghostscript-fonts/Config.in" source "package/inconsolata/Config.in" source "package/liberation/Config.in" + source "package/wqy-zenhei/Config.in" comment "Icons" source "package/adwaita-icon-theme/Config.in" @@ -261,6 +266,7 @@ menu "Games" source "package/doom-wad/Config.in" source "package/flare-engine/Config.in" source "package/flare-game/Config.in" + source "package/frotz/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" @@ -276,6 +282,7 @@ menu "Games" source "package/stella/Config.in" source "package/supertux/Config.in" source "package/supertuxkart/Config.in" + source "package/xorcurses/Config.in" endmenu menu "Graphic libraries and applications (graphic/text)" @@ -402,6 +409,8 @@ menu "Firmware" source "package/linux-firmware/Config.in" source "package/murata-cyw-fw/Config.in" source "package/odroidc2-firmware/Config.in" + source "package/qcom-db410c-firmware/Config.in" + source "package/rcw-smarc-sal28/Config.in" source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/rpi-wifi-firmware/Config.in" @@ -478,6 +487,7 @@ endmenu source "package/iucode-tool/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" + source "package/libiec61850/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" @@ -502,6 +512,7 @@ endmenu source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" + source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" @@ -553,7 +564,6 @@ endmenu source "package/ti-gfx/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" - source "package/ti-sgx-libgbm/Config.in" source "package/ti-sgx-um/Config.in" source "package/ti-uim/Config.in" source "package/ti-utils/Config.in" @@ -683,6 +693,7 @@ menu "Lua libraries/modules" source "package/luaexpatutils/Config.in" source "package/luafilesystem/Config.in" source "package/luajson/Config.in" + source "package/lualdap/Config.in" source "package/lualogging/Config.in" source "package/luaossl/Config.in" source "package/luaposix/Config.in" @@ -739,7 +750,9 @@ menu "Perl libraries/modules" source "package/perl-datetime-tiny/Config.in" source "package/perl-dbd-mysql/Config.in" source "package/perl-dbi/Config.in" + source "package/perl-devel-cycle/Config.in" source "package/perl-devel-globaldestruction/Config.in" + source "package/perl-devel-size/Config.in" source "package/perl-devel-stacktrace/Config.in" source "package/perl-devel-stacktrace-ashtml/Config.in" source "package/perl-device-serialport/Config.in" @@ -781,6 +794,7 @@ menu "Perl libraries/modules" source "package/perl-lwp-protocol-https/Config.in" source "package/perl-mail-dkim/Config.in" source "package/perl-mailtools/Config.in" + source "package/perl-math-int64/Config.in" source "package/perl-math-prime-util/Config.in" source "package/perl-mime-base64-urlsafe/Config.in" source "package/perl-mime-tools/Config.in" @@ -896,6 +910,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" + source "package/python-bleak/Config.in" source "package/python-bluezero/Config.in" source "package/python-boto3/Config.in" source "package/python-botocore/Config.in" @@ -942,6 +957,7 @@ menu "External python modules" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" source "package/python-decorator/Config.in" + source "package/python-defusedxml/Config.in" source "package/python-dialog/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" @@ -1097,6 +1113,7 @@ menu "External python modules" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycryptodomex/Config.in" + source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" source "package/python-pyelftools/Config.in" @@ -1131,6 +1148,7 @@ menu "External python modules" source "package/python-pytablereader/Config.in" source "package/python-pytablewriter/Config.in" source "package/python-pytest/Config.in" + source "package/python-pytest-asyncio/Config.in" source "package/python-pytrie/Config.in" source "package/python-pytz/Config.in" source "package/python-pyudev/Config.in" @@ -1207,6 +1225,7 @@ menu "External python modules" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" source "package/python-typing/Config.in" + source "package/python-typing-extensions/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" source "package/python-ujson/Config.in" @@ -1245,6 +1264,7 @@ menu "External python modules" source "package/python-zope-interface/Config.in" endmenu endif + source "package/quickjs/Config.in" source "package/ruby/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL @@ -1261,7 +1281,6 @@ menu "Audio/Sound" source "package/alsa-lib/Config.in" source "package/alure/Config.in" source "package/aubio/Config.in" - source "package/audiofile/Config.in" source "package/bcg729/Config.in" source "package/caps/Config.in" source "package/fdk-aac/Config.in" @@ -1358,6 +1377,7 @@ menu "Crypto" source "package/pkcs11-helper/Config.in" source "package/rhash/Config.in" source "package/tinydtls/Config.in" + source "package/tpm2-pkcs11/Config.in" source "package/tpm2-tss/Config.in" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" @@ -1372,6 +1392,7 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libgit2/Config.in" + source "package/libmdbx/Config.in" source "package/libodb/Config.in" source "package/libodb-boost/Config.in" source "package/libodb-mysql/Config.in" @@ -1568,6 +1589,10 @@ endmenu endif source "package/bootstrap/Config.in" source "package/chartjs/Config.in" + source "package/datatables/Config.in" + source "package/datatables-buttons/Config.in" + source "package/datatables-fixedcolumns/Config.in" + source "package/datatables-responsive/Config.in" source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" @@ -1586,7 +1611,9 @@ endmenu endif source "package/jsmin/Config.in" source "package/json-javascript/Config.in" + source "package/jszip/Config.in" source "package/openlayers/Config.in" + source "package/popperjs/Config.in" source "package/spidermonkey/Config.in" source "package/vuejs/Config.in" endmenu @@ -1783,6 +1810,7 @@ menu "Networking" source "package/nss-myhostname/Config.in" source "package/nss-pam-ldapd/Config.in" source "package/omniorb/Config.in" + source "package/open62541/Config.in" source "package/openldap/Config.in" source "package/openmpi/Config.in" source "package/openpgm/Config.in" @@ -1874,6 +1902,7 @@ menu "Other" source "package/libevent/Config.in" source "package/libffi/Config.in" source "package/libgee/Config.in" + source "package/libgeos/Config.in" source "package/libglib2/Config.in" source "package/libglob/Config.in" source "package/libical/Config.in" @@ -1953,6 +1982,7 @@ menu "Text and terminal handling" source "package/fmt/Config.in" source "package/fstrcmp/Config.in" source "package/icu/Config.in" + source "package/inih/Config.in" source "package/libcli/Config.in" source "package/libedit/Config.in" source "package/libenca/Config.in" @@ -2037,7 +2067,6 @@ menu "Networking applications" source "package/bluez-tools/Config.in" source "package/bluez5_utils/Config.in" source "package/bmon/Config.in" - source "package/boa/Config.in" source "package/boinc/Config.in" source "package/brcm-patchram-plus/Config.in" source "package/bridge-utils/Config.in" @@ -2046,6 +2075,7 @@ menu "Networking applications" source "package/c-icap-modules/Config.in" source "package/can-utils/Config.in" source "package/cannelloni/Config.in" + source "package/casync/Config.in" source "package/chrony/Config.in" source "package/civetweb/Config.in" source "package/connman/Config.in" @@ -2110,7 +2140,6 @@ menu "Networking applications" source "package/iperf/Config.in" source "package/iperf3/Config.in" source "package/iproute2/Config.in" - source "package/ipsec-tools/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" source "package/iptraf-ng/Config.in" @@ -2239,6 +2268,7 @@ endif source "package/spice/Config.in" source "package/spice-protocol/Config.in" source "package/squid/Config.in" + source "package/ssdp-responder/Config.in" source "package/sshguard/Config.in" source "package/sshpass/Config.in" source "package/sslh/Config.in" @@ -2351,12 +2381,14 @@ comment "Utilities" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" source "package/logsurfer/Config.in" + source "package/neofetch/Config.in" source "package/pdmenu/Config.in" source "package/pinentry/Config.in" source "package/qprint/Config.in" source "package/ranger/Config.in" source "package/rtty/Config.in" source "package/screen/Config.in" + source "package/screenfetch/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" @@ -2375,6 +2407,7 @@ menu "System tools" source "package/atop/Config.in" source "package/attr/Config.in" source "package/audit/Config.in" + source "package/balena-engine/Config.in" source "package/bubblewrap/Config.in" source "package/cgroupfs-mount/Config.in" source "package/circus/Config.in" @@ -2396,6 +2429,7 @@ menu "System tools" source "package/emlog/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" + source "package/gkrellm/Config.in" source "package/htop/Config.in" source "package/ibm-sw-tpm2/Config.in" source "package/initscripts/Config.in" diff --git a/buildroot/package/Config.in.host b/buildroot/package/Config.in.host index c69c756f3..ba6a68c72 100644 --- a/buildroot/package/Config.in.host +++ b/buildroot/package/Config.in.host @@ -1,5 +1,6 @@ menu "Host utilities" + source "package/abootimg/Config.in.host" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" source "package/asn1c/Config.in.host" @@ -69,9 +70,9 @@ menu "Host utilities" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" + source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" - source "package/rcw/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/buildroot/package/abootimg/Config.in.host b/buildroot/package/abootimg/Config.in.host new file mode 100644 index 000000000..65dc47987 --- /dev/null +++ b/buildroot/package/abootimg/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_ABOOTIMG + bool "host abootimg" + select BR2_PACKAGE_HOST_UTIL_LINUX + help + Tool to manipulate Android Boot Images, either on files + or directly on /dev block devices. + + https://github.com/ggrandou/abootimg diff --git a/buildroot/package/abootimg/abootimg.mk b/buildroot/package/abootimg/abootimg.mk index e90654694..ab6c70931 100644 --- a/buildroot/package/abootimg/abootimg.mk +++ b/buildroot/package/abootimg/abootimg.mk @@ -11,6 +11,7 @@ ABOOTIMG_LICENSE_FILES = LICENSE # depends on libblkid from util-linux ABOOTIMG_DEPENDENCIES = util-linux +HOST_ABOOTIMG_DEPENDENCIES = host-util-linux define ABOOTIMG_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) @@ -20,4 +21,13 @@ define ABOOTIMG_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/abootimg $(TARGET_DIR)/usr/bin/abootimg endef +define HOST_ABOOTIMG_BUILD_CMDS + $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) +endef + +define HOST_ABOOTIMG_INSTALL_CMDS + $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/acsccid/Config.in b/buildroot/package/acsccid/Config.in index 74dd6de29..a926be6e1 100644 --- a/buildroot/package/acsccid/Config.in +++ b/buildroot/package/acsccid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_ACSCCID bool "acsccid" depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -14,7 +15,7 @@ config BR2_PACKAGE_ACSCCID http://acsccid.sourceforge.net/ -comment "acsccid needs a toolchain w/ threads, dynamic library" +comment "acsccid needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/aer-inject/aer-inject.hash b/buildroot/package/aer-inject/aer-inject.hash index ee097c873..6259bb905 100644 --- a/buildroot/package/aer-inject/aer-inject.hash +++ b/buildroot/package/aer-inject/aer-inject.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz +sha256 2dd2bd73aa738c1cc26ba04b6e502329778d18c2cc873c0bd00e6b2d38e9477c aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41-br1.tar.gz sha256 659a191d8775e05c6c6a9a4ba66b3577c577342bb83f20d393135eb6633c8973 README diff --git a/buildroot/package/aircrack-ng/aircrack-ng.mk b/buildroot/package/aircrack-ng/aircrack-ng.mk index baa1fad9e..ff87766d6 100644 --- a/buildroot/package/aircrack-ng/aircrack-ng.mk +++ b/buildroot/package/aircrack-ng/aircrack-ng.mk @@ -8,6 +8,7 @@ AIRCRACK_NG_VERSION = 1.6 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE +AIRCRACK_NG_CPE_ID_VENDOR = aircrack-ng AIRCRACK_NG_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CMOCKA),cmocka) \ $(if $(BR2_PACKAGE_LIBNL),libnl) \ diff --git a/buildroot/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk index 728aec31a..b1bfaf30e 100644 --- a/buildroot/package/alsa-lib/alsa-lib.mk +++ b/buildroot/package/alsa-lib/alsa-lib.mk @@ -9,6 +9,7 @@ ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING +ALSA_LIB_CPE_ID_VENDOR = alsa-project ALSA_LIB_INSTALL_STAGING = YES ALSA_LIB_CFLAGS = $(TARGET_CFLAGS) ALSA_LIB_AUTORECONF = YES diff --git a/buildroot/package/am33x-cm3/am33x-cm3.hash b/buildroot/package/am33x-cm3/am33x-cm3.hash index a63ba64a3..2210e8ac6 100644 --- a/buildroot/package/am33x-cm3/am33x-cm3.hash +++ b/buildroot/package/am33x-cm3/am33x-cm3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz +sha256 c0b11d7ed2300172354f2948e858ddb5cae19d084bd1ab6d48cfa7b6bfa13261 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365-br1.tar.gz sha256 e136e6949a1d3ca144374375af8b9387faa11d2eee7debff8cf22ca8fe7bf7e9 License.txt diff --git a/buildroot/package/angularjs/angularjs.mk b/buildroot/package/angularjs/angularjs.mk index a9bee0216..d393c82c1 100644 --- a/buildroot/package/angularjs/angularjs.mk +++ b/buildroot/package/angularjs/angularjs.mk @@ -10,6 +10,8 @@ ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) ANGULARJS_LICENSE = MIT # There's no separate license file in the archive, so use angular.js instead. ANGULARJS_LICENSE_FILES = angular.js +ANGULARJS_CPE_ID_VENDOR = angularjs +ANGULARJS_CPE_ID_PRODUCT = angular.js define ANGULARJS_EXTRACT_CMDS unzip $(ANGULARJS_DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk index 203d637fb..6b9d18ac0 100644 --- a/buildroot/package/apache/apache.mk +++ b/buildroot/package/apache/apache.mk @@ -9,6 +9,8 @@ APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE +APACHE_CPE_ID_VENDOR = apache +APACHE_CPE_ID_PRODUCT = http_server # Needed for mod_php APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, diff --git a/buildroot/package/apcupsd/Config.in b/buildroot/package/apcupsd/Config.in index 4bc523eed..2a00d43d6 100644 --- a/buildroot/package/apcupsd/Config.in +++ b/buildroot/package/apcupsd/Config.in @@ -28,14 +28,16 @@ config BR2_PACKAGE_APCUPSD_MODBUS config BR2_PACKAGE_APCUPSD_MODBUS_USB bool "modbus usb" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT select BR2_PACKAGE_APCUPSD_MODBUS help Compile MODBUS/USB driver code -comment "modbus usb support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "modbus usb support needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_APCUPSD_NET bool "net" @@ -55,13 +57,15 @@ config BR2_PACKAGE_APCUPSD_SNMP config BR2_PACKAGE_APCUPSD_USB bool "usb" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help Compile USB UPS code -comment "usb support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usb support needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 endif diff --git a/buildroot/package/apparmor/3.0.0 b/buildroot/package/apparmor/3.0.0 deleted file mode 120000 index eb1e43a57..000000000 --- a/buildroot/package/apparmor/3.0.0 +++ /dev/null @@ -1 +0,0 @@ -../libapparmor/3.0.0/ \ No newline at end of file diff --git a/buildroot/package/apparmor/apparmor.hash b/buildroot/package/apparmor/apparmor.hash index 394bfb81a..ddbe87c56 100644 --- a/buildroot/package/apparmor/apparmor.hash +++ b/buildroot/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 66fd751fe51eb427d2aa864ee035b12d01d212fd595579275219b0148c43755e apparmor-3.0.0.tar.gz +sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/buildroot/package/apparmor/apparmor.mk b/buildroot/package/apparmor/apparmor.mk index 7ea0fabd9..6c23e1bb8 100644 --- a/buildroot/package/apparmor/apparmor.mk +++ b/buildroot/package/apparmor/apparmor.mk @@ -6,11 +6,12 @@ # When updating the version here, please also update the libapparmor package APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).0 -APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION_MAJOR)/+download +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1 +APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL +APPARMOR_CPE_ID_VENDOR = canonical APPARMOR_DEPENDENCIES = libapparmor diff --git a/buildroot/package/armbian-firmware/armbian-firmware.hash b/buildroot/package/armbian-firmware/armbian-firmware.hash index edbc9c828..ceefafd97 100644 --- a/buildroot/package/armbian-firmware/armbian-firmware.hash +++ b/buildroot/package/armbian-firmware/armbian-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 975bc377728496006f058317cccc88e2d3c4ab172ee3df08cfd085cf13221752 armbian-firmware-70a08503ac9e765f5d1ccf4fa3e825db0751e53e.tar.gz +sha256 a370a6aeb30f12a17f8d47c81a4d81aa822b9408589305a4d6a67d544280520d armbian-firmware-70a08503ac9e765f5d1ccf4fa3e825db0751e53e-br1.tar.gz diff --git a/buildroot/package/asn1c/asn1c.mk b/buildroot/package/asn1c/asn1c.mk index 314462a92..e76a9f84f 100644 --- a/buildroot/package/asn1c/asn1c.mk +++ b/buildroot/package/asn1c/asn1c.mk @@ -8,5 +8,6 @@ ASN1C_VERSION = 0.9.28 ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) ASN1C_LICENSE = BSD-2-Clause ASN1C_LICENSE_FILES = LICENSE +ASN1C_CPE_ID_VALID = YES $(eval $(host-autotools-package)) diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk index fb3eb6ec8..b220b5418 100644 --- a/buildroot/package/asterisk/asterisk.mk +++ b/buildroot/package/asterisk/asterisk.mk @@ -21,6 +21,9 @@ ASTERISK_LICENSE_FILES = \ codecs/speex/speex_resampler.h \ utils/db1-ast/include/db.h +ASTERISK_CPE_ID_VENDOR = asterisk +ASTERISK_CPE_ID_PRODUCT = open_source + # For patches 0002, 0003 and 0005 ASTERISK_AUTORECONF = YES ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson diff --git a/buildroot/package/at-spi2-atk/at-spi2-atk.mk b/buildroot/package/at-spi2-atk/at-spi2-atk.mk index 69d11f66b..232b57723 100644 --- a/buildroot/package/at-spi2-atk/at-spi2-atk.mk +++ b/buildroot/package/at-spi2-atk/at-spi2-atk.mk @@ -11,6 +11,7 @@ AT_SPI2_ATK_SITE = \ http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) AT_SPI2_ATK_LICENSE = LGPL-2.1+ AT_SPI2_ATK_LICENSE_FILES = COPYING +AT_SPI2_ATK_CPE_ID_VENDOR = gnome AT_SPI2_ATK_INSTALL_STAGING = YES AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf AT_SPI2_ATK_CONF_OPTS = -Dtests=false diff --git a/buildroot/package/at/at.hash b/buildroot/package/at/at.hash index e20c00b3c..c5daf4ef8 100644 --- a/buildroot/package/at/at.hash +++ b/buildroot/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9ae5761a1fb897cda3a6f14439bed33cda33c0eedfcee6866e3d2ebad67fbd2f at-7c74fa1aece6bc6db351763dc012193d5d634b7e.tar.gz +sha256 62123a6fcf02b2606673afca80c2874358b83880c12db7f276a7c6cc70068cb2 at-upstream-3.2.1.tar.bz2 -sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING +sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/at/at.mk b/buildroot/package/at/at.mk index dbf649c0b..6ac82e2de 100644 --- a/buildroot/package/at/at.mk +++ b/buildroot/package/at/at.mk @@ -4,9 +4,9 @@ # ################################################################################ -AT_VERSION = 7c74fa1aece6bc6db351763dc012193d5d634b7e -AT_SITE = https://salsa.debian.org/debian/at.git -AT_SITE_METHOD = git +AT_VERSION = 3.2.1 +AT_SOURCE = at-upstream-$(AT_VERSION).tar.bz2 +AT_SITE = https://salsa.debian.org/debian/at/-/archive/upstream/$(AT_VERSION) AT_AUTORECONF = YES AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC diff --git a/buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch b/buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch deleted file mode 100644 index e879df5b3..000000000 --- a/buildroot/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch +++ /dev/null @@ -1,26 +0,0 @@ -Makefile.am: link against libpthread for atftp - -atftp client needs to link against libpthread as static builds do not -work otherwise. - -Signed-off-by: Ryan Barnett ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index e59592f..200829a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,7 @@ noinst_HEADERS = argz.h logger.h options.h stats.h tftp.h tftp_def.h tftp_io.h - tftpd.h tftpd_pcre.h tftpd_mtftp.h - - bin_PROGRAMS = atftp --atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) -+atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) $(LIBPTHREAD) - atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ - argz.c tftp_mtftp.c - --- -1.9.1 - diff --git a/buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch b/buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index 0679ef3b4..000000000 --- a/buildroot/package/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 485e71a84..000000000 --- a/buildroot/package/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/buildroot/package/atftp/atftp.hash b/buildroot/package/atftp/atftp.hash index 3e5e783cf..158e9e3b3 100644 --- a/buildroot/package/atftp/atftp.hash +++ b/buildroot/package/atftp/atftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041 atftp-0.7.2.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE +sha256 d3c9cd0d971dfc786d7a5f4055c35d4e66aafc8102ac03473ef225bdf7edb26a atftp-0.7.4.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE diff --git a/buildroot/package/atftp/atftp.mk b/buildroot/package/atftp/atftp.mk index cbe05ba7e..de67a4c68 100644 --- a/buildroot/package/atftp/atftp.mk +++ b/buildroot/package/atftp/atftp.mk @@ -4,12 +4,11 @@ # ################################################################################ -ATFTP_VERSION = 0.7.2 +ATFTP_VERSION = 0.7.4 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am -ATFTP_AUTORECONF = YES +ATFTP_CPE_ID_VALID = YES ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp # For static we need to explicitly link against libpthread ATFTP_LIBS = -lpthread diff --git a/buildroot/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch b/buildroot/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch new file mode 100644 index 000000000..0dfe4f430 --- /dev/null +++ b/buildroot/package/atop/0001-ifprop.c-fix-build-with-kernel-4.6.patch @@ -0,0 +1,51 @@ +From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Dec 2020 12:23:33 +0100 +Subject: [PATCH] ifprop.c: fix build with kernel < 4.6 + +Build fails with kernel headers < 4.6 since version 2.6.0 and +https://github.com/Atoptool/atop/commit/08c622ecaa5bb0bb260984ceaddc4730d1b312a7 + +Indeed, ethtool_link_settings and ETHTOOL_GLINKSETTINGS are only +available since +https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Atoptool/atop/pull/142] +--- + ifprop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ifprop.c b/ifprop.c +index 60fa3fa..63fce5a 100644 +--- a/ifprop.c ++++ b/ifprop.c +@@ -104,7 +104,9 @@ initifprop(void) + char *cp, linebuf[2048]; + int i=0, sockfd; + ++#ifdef ETHTOOL_GLINKSETTINGS + struct ethtool_link_settings ethlink; // preferred! ++#endif + struct ethtool_cmd ethcmd; // deprecated + + struct ifreq ifreq; +@@ -153,6 +155,7 @@ initifprop(void) + strncpy((void *)&ifreq.ifr_ifrn.ifrn_name, ifprops[i].name, + sizeof ifreq.ifr_ifrn.ifrn_name-1); + ++#ifdef ETHTOOL_GLINKSETTINGS + ethlink.cmd = ETHTOOL_GLINKSETTINGS; + ifreq.ifr_ifru.ifru_data = (void *)ðlink; + +@@ -164,6 +167,7 @@ initifprop(void) + phy_addr = ethlink.phy_address; + } + else ++#endif + { + ethcmd.cmd = ETHTOOL_GSET; + ifreq.ifr_ifru.ifru_data = (void *)ðcmd; +-- +2.29.2 + diff --git a/buildroot/package/atop/0002-photosyst.c-fix-build-on-musl.patch b/buildroot/package/atop/0002-photosyst.c-fix-build-on-musl.patch new file mode 100644 index 000000000..8573d59d6 --- /dev/null +++ b/buildroot/package/atop/0002-photosyst.c-fix-build-on-musl.patch @@ -0,0 +1,38 @@ +From 34996ad1eb6d295382e7737ef34bd362abdd4944 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Jan 2021 22:15:45 +0100 +Subject: [PATCH] photosyst.c: fix build on musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Build on musl is broken since version 2.6.0 and +https://github.com/Atoptool/atop/commit/e889c66fbe1d0b7ae38fbcbaa46cea749257f486 +because limits.h is not included: + +photosyst.c: In function ‘lvmmapname’: +photosyst.c:1624:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean ‘AF_MAX’? + char path[PATH_MAX]; + ^~~~~~~~ + AF_MAX + +Signed-off-by: Fabrice Fontaine +--- + photosyst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/photosyst.c b/photosyst.c +index 3de874b..67ae92f 100644 +--- a/photosyst.c ++++ b/photosyst.c +@@ -165,6 +165,7 @@ + #include + #include + #include ++#include + + #define SCALINGMAXCPU 8 // threshold for scaling info per CPU + +-- +2.29.2 + diff --git a/buildroot/package/atop/Config.in b/buildroot/package/atop/Config.in index 9e42eddb5..b8ee30c30 100644 --- a/buildroot/package/atop/Config.in +++ b/buildroot/package/atop/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_ATOP bool "atop" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # ncurses wchar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # PERF_FLAG_FD_CLOEXEC select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB help Atop is an ASCII full-screen performance monitor for Linux @@ -18,6 +20,7 @@ config BR2_PACKAGE_ATOP http://www.atoptool.nl -comment "atop needs a toolchain w/ headers >= 3.14" +comment "atop needs a toolchain w/ wchar, headers >= 3.14" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 diff --git a/buildroot/package/atop/atop.hash b/buildroot/package/atop/atop.hash index f404ed5d1..65148b857 100644 --- a/buildroot/package/atop/atop.hash +++ b/buildroot/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33 atop-2.5.0.tar.gz +sha256 9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72 atop-2.6.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/atop/atop.mk b/buildroot/package/atop/atop.mk index 46baff8f7..acbaf2995 100644 --- a/buildroot/package/atop/atop.mk +++ b/buildroot/package/atop/atop.mk @@ -4,10 +4,11 @@ # ################################################################################ -ATOP_VERSION = 2.5.0 +ATOP_VERSION = 2.6.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING +ATOP_CPE_ID_VALID = YES ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS) diff --git a/buildroot/package/attr/attr.mk b/buildroot/package/attr/attr.mk index ba77e802d..13f3f0db3 100644 --- a/buildroot/package/attr/attr.mk +++ b/buildroot/package/attr/attr.mk @@ -8,6 +8,7 @@ ATTR_VERSION = 2.4.48 ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL +ATTR_CPE_ID_VALID = YES ATTR_INSTALL_STAGING = YES diff --git a/buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch b/buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch deleted file mode 100644 index 54757abbd..000000000 --- a/buildroot/package/audiofile/0001-Fix-pkg-config-for-static-linking.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2abf7d2e5c533bf4d7407c2c8057a329cd49a3cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 24 Nov 2015 21:57:27 +0100 -Subject: [PATCH 1/1] Fix pkg-config for static linking -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Static linking userspace programs such as MPD against libaudiofile fails if -FLAC is available, because libaudiofile is linked against FLAC, but this isn't -expressed in the pkg-config file: - -[..] -arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::reset2()': -FLAC.cpp:(.text+0x58): undefined reference to `FLAC__stream_decoder_seek_absolute' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACEncoder::sync2()': -FLAC.cpp:(.text+0x88): undefined reference to `FLAC__stream_encoder_finish' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::~FLACDecoder()': -FLAC.cpp:(.text+0xc4): undefined reference to `FLAC__stream_decoder_delete' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACEncoder::~FLACEncoder()': -FLAC.cpp:(.text+0x164): undefined reference to `FLAC__stream_encoder_delete' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::runPull()': -[..] - -The Libs.private field is specifically designed for such usage: - -From pkg-config documentation: - - Libs.private: - - This line should list any private libraries in use. Private - libraries are libraries which are not exposed through your - library, but are needed in the case of static linking. - -Therefore, this patch adds a reference to FLAC as well as to lcov in the -Libs.private field of the pkg-config file. - -Signed-off-by: Jörg Krause ---- - audiofile.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/audiofile.pc.in b/audiofile.pc.in -index ad5956a..d6055ef 100644 ---- a/audiofile.pc.in -+++ b/audiofile.pc.in -@@ -8,5 +8,5 @@ Description: audiofile - Requires: - Version: @VERSION@ - Libs: -L${libdir} -laudiofile --Libs.private: -lm -+Libs.private: @FLAC_LIBS@ @COVERAGE_LIBS@ -lm - Cflags: -I${includedir} --- -2.6.2 - diff --git a/buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch b/buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch deleted file mode 100644 index 01baeb5e6..000000000 --- a/buildroot/package/audiofile/0002-cast-to-unsigned-gcc6.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001 -From: Hodorgasm -Date: Wed, 11 May 2016 21:42:07 -0400 -Subject: [PATCH] Cast to unsigned while left bit-shifting - -GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting. - -Downloaded from upstream PR: -https://github.com/mpruett/audiofile/pull/28 - -Signed-off-by: Bernd Kuhls ---- - libaudiofile/modules/SimpleModule.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h -index 03c6c69..4014fb2 100644 ---- a/libaudiofile/modules/SimpleModule.h -+++ b/libaudiofile/modules/SimpleModule.h -@@ -123,7 +123,7 @@ struct signConverter - typedef typename IntTypes::UnsignedType UnsignedType; - - static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; -- static const int kMinSignedValue = -1 << kScaleBits; -+ static const int kMinSignedValue = static_cast(static_cast(-1) << kScaleBits);; - - struct signedToUnsigned : public std::unary_function - { diff --git a/buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch b/buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch deleted file mode 100644 index 5c99c3cd7..000000000 --- a/buildroot/package/audiofile/0003-Always-check-the-number-of-coefficients.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c48e4c6503f7dabd41f11d4c9c7b7f8960e7f2c0 Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 12:51:22 +0100 -Subject: [PATCH] Always check the number of coefficients - -When building the library with NDEBUG, asserts are eliminated -so it's better to always check that the number of coefficients -is inside the array range. - -This fixes the 00191-audiofile-indexoob issue in #41 - -Signed-off-by: Peter Korsgaard ---- - libaudiofile/WAVE.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp -index 0e81cf7..61f9541 100644 ---- a/libaudiofile/WAVE.cpp -+++ b/libaudiofile/WAVE.cpp -@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) - - /* numCoefficients should be at least 7. */ - assert(numCoefficients >= 7 && numCoefficients <= 255); -+ if (numCoefficients < 7 || numCoefficients > 255) -+ { -+ _af_error(AF_BAD_HEADER, -+ "Bad number of coefficients"); -+ return AF_FAIL; -+ } - - m_msadpcmNumCoefficients = numCoefficients; - --- -2.11.0 - diff --git a/buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch b/buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch deleted file mode 100644 index 21f899a46..000000000 --- a/buildroot/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 18:02:31 +0100 -Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp - -This fixes #33 -(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981 -and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/) - -Signed-off-by: Peter Korsgaard ---- - libaudiofile/modules/IMA.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp -index 7476d44..df4aad6 100644 ---- a/libaudiofile/modules/IMA.cpp -+++ b/libaudiofile/modules/IMA.cpp -@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded) - if (encoded[1] & 0x80) - m_adpcmState[c].previousValue -= 0x10000; - -- m_adpcmState[c].index = encoded[2]; -+ m_adpcmState[c].index = clamp(encoded[2], 0, 88); - - *decoded++ = m_adpcmState[c].previousValue; - -@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded) - predictor -= 0x10000; - - state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16); -- state.index = encoded[1] & 0x7f; -+ state.index = clamp(encoded[1] & 0x7f, 0, 88); - encoded += 2; - - for (int n=0; n -Date: Mon, 6 Mar 2017 13:54:52 +0100 -Subject: [PATCH] Check for multiplication overflow in sfconvert - -Checks that a multiplication doesn't overflow when -calculating the buffer size, and if it overflows, -reduce the buffer size instead of failing. - -This fixes the 00192-audiofile-signintoverflow-sfconvert case -in #41 - -Signed-off-by: Peter Korsgaard ---- - sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++-- - 1 file changed, 32 insertions(+), 2 deletions(-) - -diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c -index 80a1bc4..970a3e4 100644 ---- a/sfcommands/sfconvert.c -+++ b/sfcommands/sfconvert.c -@@ -45,6 +45,33 @@ void printusage (void); - void usageerror (void); - bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid); - -+int firstBitSet(int x) -+{ -+ int position=0; -+ while (x!=0) -+ { -+ x>>=1; -+ ++position; -+ } -+ return position; -+} -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+int multiplyCheckOverflow(int a, int b, int *result) -+{ -+#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) -+ return __builtin_mul_overflow(a, b, result); -+#else -+ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits -+ return true; -+ *result = a * b; -+ return false; -+#endif -+} -+ - int main (int argc, char **argv) - { - if (argc == 2) -@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid) - { - int frameSize = afGetVirtualFrameSize(infile, trackid, 1); - -- const int kBufferFrameCount = 65536; -- void *buffer = malloc(kBufferFrameCount * frameSize); -+ int kBufferFrameCount = 65536; -+ int bufferSize; -+ while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize)) -+ kBufferFrameCount /= 2; -+ void *buffer = malloc(bufferSize); - - AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK); - AFframecount totalFramesWritten = 0; --- -2.11.0 - diff --git a/buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch b/buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch deleted file mode 100644 index 0c6be2a2c..000000000 --- a/buildroot/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a2e9eab8ea87c4ffc494d839ebb4ea145eb9f2e6 Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 18:59:26 +0100 -Subject: [PATCH] Actually fail when error occurs in parseFormat - -When there's an unsupported number of bits per sample or an invalid -number of samples per block, don't only print an error message using -the error handler, but actually stop parsing the file. - -This fixes #35 (also reported at -https://bugzilla.opensuse.org/show_bug.cgi?id=1026983 and -https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp/ -) - -Signed-off-by: Peter Korsgaard ---- - libaudiofile/WAVE.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp -index 0e81cf7..d762249 100644 ---- a/libaudiofile/WAVE.cpp -+++ b/libaudiofile/WAVE.cpp -@@ -326,6 +326,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) - { - _af_error(AF_BAD_NOT_IMPLEMENTED, - "IMA ADPCM compression supports only 4 bits per sample"); -+ return AF_FAIL; - } - - int bytesPerBlock = (samplesPerBlock + 14) / 8 * 4 * channelCount; -@@ -333,6 +334,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) - { - _af_error(AF_BAD_CODEC_CONFIG, - "Invalid samples per block for IMA ADPCM compression"); -+ return AF_FAIL; - } - - track->f.sampleWidth = 16; --- -2.11.0 - diff --git a/buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch b/buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch deleted file mode 100644 index 5411f13bb..000000000 --- a/buildroot/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch +++ /dev/null @@ -1,122 +0,0 @@ -From beacc44eb8cdf6d58717ec1a5103c5141f1b37f9 Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 13:43:53 +0100 -Subject: [PATCH] Check for multiplication overflow in MSADPCM decodeSample - -Check for multiplication overflow (using __builtin_mul_overflow -if available) in MSADPCM.cpp decodeSample and return an empty -decoded block if an error occurs. - -This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41 - -Signed-off-by: Peter Korsgaard ---- - libaudiofile/modules/BlockCodec.cpp | 5 ++-- - libaudiofile/modules/MSADPCM.cpp | 47 +++++++++++++++++++++++++++++++++---- - 2 files changed, 46 insertions(+), 6 deletions(-) - -diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp -index 45925e8..4731be1 100644 ---- a/libaudiofile/modules/BlockCodec.cpp -+++ b/libaudiofile/modules/BlockCodec.cpp -@@ -52,8 +52,9 @@ void BlockCodec::runPull() - // Decompress into m_outChunk. - for (int i=0; i(m_inChunk->buffer) + i * m_bytesPerPacket, -- static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount); -+ if (decodeBlock(static_cast(m_inChunk->buffer) + i * m_bytesPerPacket, -+ static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0) -+ break; - - framesRead += m_framesPerPacket; - } -diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp -index 8ea3c85..ef9c38c 100644 ---- a/libaudiofile/modules/MSADPCM.cpp -+++ b/libaudiofile/modules/MSADPCM.cpp -@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] = - 768, 614, 512, 409, 307, 230, 230, 230 - }; - -+int firstBitSet(int x) -+{ -+ int position=0; -+ while (x!=0) -+ { -+ x>>=1; -+ ++position; -+ } -+ return position; -+} -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+int multiplyCheckOverflow(int a, int b, int *result) -+{ -+#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) -+ return __builtin_mul_overflow(a, b, result); -+#else -+ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits -+ return true; -+ *result = a * b; -+ return false; -+#endif -+} -+ -+ - // Compute a linear PCM value from the given differential coded value. - static int16_t decodeSample(ms_adpcm_state &state, -- uint8_t code, const int16_t *coefficient) -+ uint8_t code, const int16_t *coefficient, bool *ok=NULL) - { - int linearSample = (state.sample1 * coefficient[0] + - state.sample2 * coefficient[1]) >> 8; -+ int delta; - - linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta; - - linearSample = clamp(linearSample, MIN_INT16, MAX_INT16); - -- int delta = (state.delta * adaptationTable[code]) >> 8; -+ if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta)) -+ { -+ if (ok) *ok=false; -+ _af_error(AF_BAD_COMPRESSION, "Error decoding sample"); -+ return 0; -+ } -+ delta >>= 8; - if (delta < 16) - delta = 16; - - state.delta = delta; - state.sample2 = state.sample1; - state.sample1 = linearSample; -+ if (ok) *ok=true; - - return static_cast(linearSample); - } -@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded) - { - uint8_t code; - int16_t newSample; -+ bool ok; - - code = *encoded >> 4; -- newSample = decodeSample(*state[0], code, coefficient[0]); -+ newSample = decodeSample(*state[0], code, coefficient[0], &ok); -+ if (!ok) return 0; - *decoded++ = newSample; - - code = *encoded & 0x0f; -- newSample = decodeSample(*state[1], code, coefficient[1]); -+ newSample = decodeSample(*state[1], code, coefficient[1], &ok); -+ if (!ok) return 0; - *decoded++ = newSample; - - encoded++; --- -2.11.0 - diff --git a/buildroot/package/audiofile/0008-CVE-2015-7747.patch b/buildroot/package/audiofile/0008-CVE-2015-7747.patch deleted file mode 100644 index 13256123c..000000000 --- a/buildroot/package/audiofile/0008-CVE-2015-7747.patch +++ /dev/null @@ -1,161 +0,0 @@ -Description: fix buffer overflow when changing both sample format and - number of channels -Origin: https://github.com/mpruett/audiofile/pull/25 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audiofile/+bug/1502721 -Bug-Debian: https://bugs.debian.org/801102 - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch - -Signed-off-by: Bernd Kuhls - ---- a/libaudiofile/modules/ModuleState.cpp -+++ b/libaudiofile/modules/ModuleState.cpp -@@ -402,7 +402,7 @@ status ModuleState::arrange(AFfilehandle - addModule(new Transform(outfc, in.pcm, out.pcm)); - - if (in.channelCount != out.channelCount) -- addModule(new ApplyChannelMatrix(infc, isReading, -+ addModule(new ApplyChannelMatrix(outfc, isReading, - in.channelCount, out.channelCount, - in.pcm.minClip, in.pcm.maxClip, - track->channelMatrix)); ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -26,6 +26,7 @@ TESTS = \ - VirtualFile \ - floatto24 \ - query2 \ -+ sixteen-stereo-to-eight-mono \ - sixteen-to-eight \ - testchannelmatrix \ - testdouble \ -@@ -139,6 +140,7 @@ printmarkers_SOURCES = printmarkers.c - printmarkers_LDADD = $(LIBAUDIOFILE) -lm - - sixteen_to_eight_SOURCES = sixteen-to-eight.c TestUtilities.cpp TestUtilities.h -+sixteen_stereo_to_eight_mono_SOURCES = sixteen-stereo-to-eight-mono.c TestUtilities.cpp TestUtilities.h - - testchannelmatrix_SOURCES = testchannelmatrix.c TestUtilities.cpp TestUtilities.h - ---- /dev/null -+++ b/test/sixteen-stereo-to-eight-mono.c -@@ -0,0 +1,118 @@ -+/* -+ Audio File Library -+ -+ Copyright 2000, Silicon Graphics, Inc. -+ -+ This program 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 2 of the License, or -+ (at your option) any later version. -+ -+ This program 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 this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+*/ -+ -+/* -+ sixteen-stereo-to-eight-mono.c -+ -+ This program tests the conversion from 2-channel 16-bit integers to -+ 1-channel 8-bit integers. -+*/ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include "TestUtilities.h" -+ -+int main (int argc, char **argv) -+{ -+ AFfilehandle file; -+ AFfilesetup setup; -+ int16_t frames16[] = {14298, 392, 3923, -683, 958, -1921}; -+ int8_t frames8[] = {28, 6, -2}; -+ int i, frameCount = 3; -+ int8_t byte; -+ AFframecount result; -+ -+ setup = afNewFileSetup(); -+ -+ afInitFileFormat(setup, AF_FILE_WAVE); -+ -+ afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); -+ afInitChannels(setup, AF_DEFAULT_TRACK, 2); -+ -+ char *testFileName; -+ if (!createTemporaryFile("sixteen-to-eight", &testFileName)) -+ { -+ fprintf(stderr, "Could not create temporary file.\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ file = afOpenFile(testFileName, "w", setup); -+ if (file == AF_NULL_FILEHANDLE) -+ { -+ fprintf(stderr, "could not open file for writing\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ afFreeFileSetup(setup); -+ -+ afWriteFrames(file, AF_DEFAULT_TRACK, frames16, frameCount); -+ -+ afCloseFile(file); -+ -+ file = afOpenFile(testFileName, "r", AF_NULL_FILESETUP); -+ if (file == AF_NULL_FILEHANDLE) -+ { -+ fprintf(stderr, "could not open file for reading\n"); -+ exit(EXIT_FAILURE); -+ } -+ -+ afSetVirtualSampleFormat(file, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 8); -+ afSetVirtualChannels(file, AF_DEFAULT_TRACK, 1); -+ -+ for (i=0; i -Date: Sat, 27 May 2017 17:53:33 +0200 -Subject: [PATCH 1/1] Fix static linking with libsndfile - -libsndfile and audiofile both contain mixXX functions in their alac -code which lead to symbol name clashes when apps like mpd try to -statically link to both audiofile and libsndfile at the same time. - -This patch renames these functions to avoid the problem which was -detected by the buildroot autobuilders: -http://autobuild.buildroot.net/results/799/7997ccd698f03885f98d00bd150dc3a578e4b161/ - -Patch sent upstream: https://github.com/mpruett/audiofile/pull/45 - -Signed-off-by: Bernd Kuhls ---- - libaudiofile/alac/ALACEncoder.cpp | 28 ++++++++++++++-------------- - libaudiofile/alac/matrix_enc.c | 8 ++++---- - libaudiofile/alac/matrixlib.h | 8 ++++---- - 3 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/libaudiofile/alac/ALACEncoder.cpp b/libaudiofile/alac/ALACEncoder.cpp -index da922c2..3d088cc 100644 ---- a/libaudiofile/alac/ALACEncoder.cpp -+++ b/libaudiofile/alac/ALACEncoder.cpp -@@ -332,19 +332,19 @@ int32_t ALACEncoder::EncodeStereo( BitBuffer * bitstream, void * inputBuffer, ui - switch ( mBitDepth ) - { - case 16: -- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); -+ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); - break; - case 20: -- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); -+ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); - break; - case 24: - // includes extraction of shifted-off bytes -- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, -+ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - case 32: - // includes extraction of shifted-off bytes -- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, -+ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - } -@@ -379,19 +379,19 @@ int32_t ALACEncoder::EncodeStereo( BitBuffer * bitstream, void * inputBuffer, ui - switch ( mBitDepth ) - { - case 16: -- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); -+ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); - break; - case 20: -- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); -+ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); - break; - case 24: - // also extracts the shifted off bytes into the shift buffers -- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, -+ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - case 32: - // also extracts the shifted off bytes into the shift buffers -- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, -+ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - } -@@ -605,19 +605,19 @@ int32_t ALACEncoder::EncodeStereoFast( BitBuffer * bitstream, void * inputBuffer - switch ( mBitDepth ) - { - case 16: -- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); -+ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); - break; - case 20: -- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); -+ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); - break; - case 24: - // also extracts the shifted off bytes into the shift buffers -- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, -+ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - case 32: - // also extracts the shifted off bytes into the shift buffers -- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, -+ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, - mixBits, mixRes, mShiftBufferUV, bytesShifted ); - break; - } -@@ -756,7 +756,7 @@ int32_t ALACEncoder::EncodeStereoEscape( BitBuffer * bitstream, void * inputBuff - break; - case 20: - // mix20() with mixres param = 0 means de-interleave so use it to simplify things -- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0 ); -+ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0 ); - for ( index = 0; index < numSamples; index++ ) - { - BitBufferWrite( bitstream, mMixBufferU[index], 20 ); -@@ -765,7 +765,7 @@ int32_t ALACEncoder::EncodeStereoEscape( BitBuffer * bitstream, void * inputBuff - break; - case 24: - // mix24() with mixres param = 0 means de-interleave so use it to simplify things -- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0, mShiftBufferUV, 0 ); -+ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0, mShiftBufferUV, 0 ); - for ( index = 0; index < numSamples; index++ ) - { - BitBufferWrite( bitstream, mMixBufferU[index], 24 ); -diff --git a/libaudiofile/alac/matrix_enc.c b/libaudiofile/alac/matrix_enc.c -index e194330..8abd556 100644 ---- a/libaudiofile/alac/matrix_enc.c -+++ b/libaudiofile/alac/matrix_enc.c -@@ -57,7 +57,7 @@ - - // 16-bit routines - --void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) -+void audiofile_alac_mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) - { - int16_t * ip = in; - int32_t j; -@@ -95,7 +95,7 @@ void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num - // 20-bit routines - // - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers - --void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) -+void audiofile_alac_mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) - { - int32_t l, r; - uint8_t * ip = in; -@@ -140,7 +140,7 @@ void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num - // 24-bit routines - // - the 24 bits of data are right-justified in the input/output predictor buffers - --void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, -+void audiofile_alac_mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ) - { - int32_t l, r; -@@ -240,7 +240,7 @@ void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num - // - otherwise, the calculations might overflow into the 33rd bit and be lost - // - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers - --void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, -+void audiofile_alac_mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ) - { - int32_t * ip = in; -diff --git a/libaudiofile/alac/matrixlib.h b/libaudiofile/alac/matrixlib.h -index 0a4f371..5728b6d 100644 ---- a/libaudiofile/alac/matrixlib.h -+++ b/libaudiofile/alac/matrixlib.h -@@ -38,17 +38,17 @@ extern "C" { - #endif - - // 16-bit routines --void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); -+void audiofile_alac_mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); - void unmix16( int32_t * u, int32_t * v, int16_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres ); - - // 20-bit routines --void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); -+void audiofile_alac_mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); - void unmix20( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres ); - - // 24-bit routines - // - 24-bit data sometimes compresses better by shifting off the bottom byte so these routines deal with - // the specified "unused lower bytes" in the combined "shift" buffer --void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, -+void audiofile_alac_mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); - void unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); -@@ -57,7 +57,7 @@ void unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t - // - note that these really expect the internal data width to be < 32-bit but the arrays are 32-bit - // - otherwise, the calculations might overflow into the 33rd bit and be lost - // - therefore, these routines deal with the specified "unused lower" bytes in the combined "shift" buffer --void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, -+void audiofile_alac_mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); - void unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, - int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); --- -2.11.0 - diff --git a/buildroot/package/audiofile/Config.in b/buildroot/package/audiofile/Config.in deleted file mode 100644 index 4aa8d69c8..000000000 --- a/buildroot/package/audiofile/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_AUDIOFILE - bool "audiofile" - depends on BR2_INSTALL_LIBSTDCPP - help - The Audio File Library handles reading and writing audio files - in many common formats. - - http://www.68k.org/~michael/audiofile/ - -comment "audiofile needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/audiofile/audiofile.hash b/buildroot/package/audiofile/audiofile.hash deleted file mode 100644 index f4028f9a6..000000000 --- a/buildroot/package/audiofile/audiofile.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965 audiofile-0.3.6.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL diff --git a/buildroot/package/audiofile/audiofile.mk b/buildroot/package/audiofile/audiofile.mk deleted file mode 100644 index bb46436d8..000000000 --- a/buildroot/package/audiofile/audiofile.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# audiofile -# -################################################################################ - -AUDIOFILE_VERSION = 0.3.6 -AUDIOFILE_SITE = http://audiofile.68k.org -AUDIOFILE_INSTALL_STAGING = YES -AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -AUDIOFILE_CONF_OPTS = --disable-examples -AUDIOFILE_DEPENDENCIES = host-pkgconf -# configure is outdated and has old bugs because of it -AUDIOFILE_AUTORECONF = YES -AUDIOFILE_LICENSE = GPL-2.0+, LGPL-2.1+ -AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL - -# 0003-Always-check-the-number-of-coefficients.patch -AUDIOFILE_IGNORE_CVES += \ - CVE-2017-6827 CVE-2017-6828 CVE-2017-6832 \ - CVE-2017-6833 CVE-2017-6835 CVE-2017-6837 -# 0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch -AUDIOFILE_IGNORE_CVES += CVE-2017-6829 -# 0005-Check-for-multiplication-overflow-in-sfconvert.patch -AUDIOFILE_IGNORE_CVES += \ - CVE-2017-6830 CVE-2017-6834 CVE-2017-6836 CVE-2017-6838 -# 0006-Actually-fail-when-error-occurs-in-parseFormat.patch -AUDIOFILE_IGNORE_CVES += CVE-2017-6831 -# 0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch -AUDIOFILE_IGNORE_CVES += CVE-2017-6839 -# 0008-CVE-2015-7747.patch -AUDIOFILE_IGNORE_CVES += CVE-2015-7747 - -ifeq ($(BR2_PACKAGE_FLAC),y) -AUDIOFILE_DEPENDENCIES += flac -AUDIOFILE_CONF_OPTS += --enable-flac -else -AUDIOFILE_CONF_OPTS += --disable-flac -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/audit/audit.mk b/buildroot/package/audit/audit.mk index 652e0fcd5..05a16e6e3 100644 --- a/buildroot/package/audit/audit.mk +++ b/buildroot/package/audit/audit.mk @@ -10,6 +10,8 @@ AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB # 0002-Add-substitue-functions-for-strndupa-rawmemchr.patch AUDIT_AUTORECONF = YES +AUDIT_CPE_ID_VENDOR = linux_audit_project +AUDIT_CPE_ID_PRODUCT = linux_audit AUDIT_INSTALL_STAGING = YES diff --git a/buildroot/package/augeas/augeas.mk b/buildroot/package/augeas/augeas.mk index cf369d691..a0bc29456 100644 --- a/buildroot/package/augeas/augeas.mk +++ b/buildroot/package/augeas/augeas.mk @@ -9,6 +9,7 @@ AUGEAS_SITE = http://download.augeas.net AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING +AUGEAS_CPE_ID_VENDOR = augeas AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 AUGEAS_CONF_OPTS = --disable-gnulib-tests diff --git a/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch b/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch deleted file mode 100644 index 26f22653c..000000000 --- a/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Wed, 13 Mar 2013 16:17:08 +0100 -Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h - -Fixes compile error with uclibc. Glibc's nfs/nfs.h contains -nothing but "#include linux/nfs.h". rpc_subs.h already includes -other linux/nfs*.h files directly. - -Signed-off-by: Andreas Oberritter -Signed-off-by: Thomas Petazzoni -Upstream-Status: Pending ---- - include/rpc_subs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rpc_subs.h b/include/rpc_subs.h -index b6d59f9..a2d9648 100644 ---- a/include/rpc_subs.h -+++ b/include/rpc_subs.h -@@ -18,7 +18,7 @@ - - #include - #include --#include -+#include - #include - #include - --- -1.7.10.4 - diff --git a/buildroot/package/autofs/autofs.hash b/buildroot/package/autofs/autofs.hash index 07432bf76..10ca42ebe 100644 --- a/buildroot/package/autofs/autofs.hash +++ b/buildroot/package/autofs/autofs.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef autofs-5.1.6.tar.xz +sha256 a36b268611b79b07051749870ba540b139938efc84bc0293244c483e94f9ced7 autofs-5.1.7.tar.xz # Hash for license files -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING -sha256 2ac2e352a92629e3abcdddbd3eeec64e7c2f5b58b6e819ff2c1444fb6e249fa3 COPYRIGHT +sha256 458028929f712b4795bc5adc31a1d6a2151364ce1b372ac43f613f56c8448fed COPYING +sha256 26c826658dfa9e5ce5f182fbfbadf3fda2d184e78dba3d99da34c60113b2ce54 COPYRIGHT diff --git a/buildroot/package/autofs/autofs.mk b/buildroot/package/autofs/autofs.mk index e9b374ec0..4c5200584 100644 --- a/buildroot/package/autofs/autofs.mk +++ b/buildroot/package/autofs/autofs.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOFS_VERSION = 5.1.6 +AUTOFS_VERSION = 5.1.7 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ diff --git a/buildroot/package/avahi/avahi.mk b/buildroot/package/avahi/avahi.mk index eef05f0d2..e2b27328c 100644 --- a/buildroot/package/avahi/avahi.mk +++ b/buildroot/package/avahi/avahi.mk @@ -8,6 +8,7 @@ AVAHI_VERSION = 0.8 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPL-2.1+ AVAHI_LICENSE_FILES = LICENSE +AVAHI_CPE_ID_VENDOR = avahi AVAHI_INSTALL_STAGING = YES AVAHI_CONF_ENV = \ diff --git a/buildroot/package/avrdude/Config.in b/buildroot/package/avrdude/Config.in index a5680b002..fba4253ad 100644 --- a/buildroot/package/avrdude/Config.in +++ b/buildroot/package/avrdude/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_AVRDUDE depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT @@ -14,6 +15,7 @@ config BR2_PACKAGE_AVRDUDE https://github.com/kcuzner/avrdude -comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ +comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR \ + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/buildroot/package/axel/axel.hash b/buildroot/package/axel/axel.hash index 66d56b658..552f94065 100644 --- a/buildroot/package/axel/axel.hash +++ b/buildroot/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 f1364d9b55d435efc6d32218097a50a63be7b1300138e698133cf19ad3aa3a54 axel-2.17.9.tar.xz +sha256 46eb4f10a11c4e50320ae6a034ef03ffe59dc11c3c6542a9867a3e4dc0c4b44e axel-2.17.10.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/axel/axel.mk b/buildroot/package/axel/axel.mk index 0d5fc2a3c..8dbf277b8 100644 --- a/buildroot/package/axel/axel.mk +++ b/buildroot/package/axel/axel.mk @@ -4,11 +4,12 @@ # ################################################################################ -AXEL_VERSION = 2.17.9 +AXEL_VERSION = 2.17.10 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING +AXEL_CPE_ID_VALID = YES AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index 8e547963e..124c7a110 100644 --- a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 6f5ce8a81ed941e525a0265844082e4c641e9ac5cdac8b00bc92492700512a43 azure-iot-sdk-c-LTS_07_2020_Ref01.tar.gz +sha256 61874790b66c7e120550fdffff88cb1e3cbfbfebcf324e41982f04461f8793a0 azure-iot-sdk-c-LTS_07_2020_Ref02-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 19f0812f8..c664ad83a 100644 --- a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_07_2020_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_07_2020_Ref02 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES diff --git a/buildroot/package/babeltrace2/babeltrace2.mk b/buildroot/package/babeltrace2/babeltrace2.mk index eb29a5928..1e03f5fdd 100644 --- a/buildroot/package/babeltrace2/babeltrace2.mk +++ b/buildroot/package/babeltrace2/babeltrace2.mk @@ -27,5 +27,9 @@ else BABELTRACE2_CONF_OPTS += --disable-debug-info endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +BABELTRACE2_CONF_ENV += LIBS=-latomic +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/balena-engine/Config.in b/buildroot/package/balena-engine/Config.in new file mode 100644 index 000000000..f48f361dc --- /dev/null +++ b/buildroot/package/balena-engine/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_BALENA_ENGINE + bool "balena-engine" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_IPTABLES # runtime + select BR2_PACKAGE_SQLITE # runtime + select BR2_PACKAGE_UTIL_LINUX # runtime + select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime + select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT # runtime + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT # runtime + help + balenaEngine is a new container engine purpose-built for + embedded and IoT use cases and compatible with Docker + containers. + + https://github.com/balena-os/balena-engine + +comment "balena-engine needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/buildroot/package/balena-engine/balena-engine.hash b/buildroot/package/balena-engine/balena-engine.hash new file mode 100644 index 000000000..3f632ef38 --- /dev/null +++ b/buildroot/package/balena-engine/balena-engine.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/balena-engine/balena-engine.mk b/buildroot/package/balena-engine/balena-engine.mk new file mode 100644 index 000000000..b3eb2ca75 --- /dev/null +++ b/buildroot/package/balena-engine/balena-engine.mk @@ -0,0 +1,109 @@ +################################################################################ +# +# balena-engine +# +################################################################################ + +BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) + +BALENA_ENGINE_LICENSE = Apache-2.0 +BALENA_ENGINE_LICENSE_FILES = LICENSE + +BALENA_ENGINE_DEPENDENCIES = host-pkgconf +BALENA_ENGINE_GOMOD = github.com/docker/docker + +BALENA_ENGINE_LDFLAGS = \ + -X github.com/docker/cli/cli/version.Version=N/A \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/opencontainers/runc.version=N/A + +BALENA_ENGINE_TAGS = \ + cgo \ + exclude_graphdriver_zfs \ + autogen \ + no_buildkit \ + no_btrfs \ + no_cri \ + no_devmapper \ + no_zfs \ + exclude_disk_quota \ + exclude_graphdriver_btrfs \ + exclude_graphdriver_devicemapper + +BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine + +ifeq ($(BR2_INIT_SYSTEMD),y) +BALENA_ENGINE_DEPENDENCIES += systemd +BALENA_ENGINE_TAGS += journald +endif + +define BALENA_ENGINE_RUN_AUTOGEN + cd $(@D) && \ + VERSION=$(BALENA_ENGINE_VERSION) \ + PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ + $(TARGET_MAKE_ENV) \ + $(SHELL) hack/make/.go-autogen +endef + +BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN + +define BALENA_ENGINE_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ + $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service + $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.socket +endef + +define BALENA_ENGINE_USERS + - - balena-engine -1 * - - - balenaEngine daemon +endef + +define BALENA_ENGINE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) + $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) +endef + +define BALENA_ENGINE_INSTALL_SYMLINK + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-daemon + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-containerd + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-containerd-shim + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-containerd-ctr + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-runc + ln -f -s balena-engine $(TARGET_DIR)/usr/bin/balena-engine-proxy + $(if $(BR2_PACKAGE_TINI),ln -f -s tini $(TARGET_DIR)/usr/bin/balena-engine-init) +endef +BALENA_ENGINE_POST_INSTALL_TARGET_HOOKS += BALENA_ENGINE_INSTALL_SYMLINK + +$(eval $(golang-package)) diff --git a/buildroot/package/bash/bash.mk b/buildroot/package/bash/bash.mk index 1843862e4..b4681c108 100644 --- a/buildroot/package/bash/bash.mk +++ b/buildroot/package/bash/bash.mk @@ -10,6 +10,7 @@ BASH_DEPENDENCIES = ncurses readline host-bison BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc BASH_LICENSE = GPL-3.0+ BASH_LICENSE_FILES = COPYING +BASH_CPE_ID_VENDOR = gnu BASH_CONF_ENV += \ ac_cv_rl_prefix="$(STAGING_DIR)" \ diff --git a/buildroot/package/bats-core/bats-core.hash b/buildroot/package/bats-core/bats-core.hash index becc1aeca..b50543a26 100644 --- a/buildroot/package/bats-core/bats-core.hash +++ b/buildroot/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c74ea5517d9381c044e8e87427de0113be6ad591213d489aeaa28146daf1c723 bats-core-1.2.0.tar.gz +sha256 91c49b1fe6f0656c46491929ed728f8dfa9a96df0cce294963e8c6082bff87a2 bats-core-1.2.1.tar.gz # License files sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/buildroot/package/bats-core/bats-core.mk b/buildroot/package/bats-core/bats-core.mk index 2bcfca70d..fc8ac674a 100644 --- a/buildroot/package/bats-core/bats-core.mk +++ b/buildroot/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.2.0 +BATS_CORE_VERSION = 1.2.1 BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) BATS_CORE_LICENSE = MIT BATS_CORE_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash index 1f4f5f33b..b1e87d7a3 100644 --- a/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash +++ b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1a84dcf6557c2017ebe258502f60575e0971511c548fc88aee5ab68ca0bb268a bayer2rgb-neon-bef3ecafe290d61a50fd27da3e5d0df6f4b88045.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d2e3e97bb9da218f223c03b2f080c5da727224e6e4cb99979398971110dfae04 bayer2rgb-neon-bef3ecafe290d61a50fd27da3e5d0df6f4b88045-br1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/bc/bc.mk b/buildroot/package/bc/bc.mk index fdfacb6c8..06b6feae4 100644 --- a/buildroot/package/bc/bc.mk +++ b/buildroot/package/bc/bc.mk @@ -9,6 +9,7 @@ BC_SITE = http://ftp.gnu.org/gnu/bc BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB +BC_CPE_ID_VENDOR = gnu BC_CONF_ENV = MAKEINFO=true # 0001-bc-use-MAKEINFO-variable-for-docs.patch and 0004-no-gen-libmath.patch diff --git a/buildroot/package/bcm2835/bcm2835.hash b/buildroot/package/bcm2835/bcm2835.hash index 8317e1025..e366f1903 100644 --- a/buildroot/package/bcm2835/bcm2835.hash +++ b/buildroot/package/bcm2835/bcm2835.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 62955cc8506cc6506d729da3138442beb9763f1ffd536e925aeb0dc223492874 bcm2835-1.65.tar.gz +sha256 b7eda59fd7bc3cb97fdac14e8455e86ddad75006d69270358ac8d00108e369a9 bcm2835-1.68.tar.gz sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b COPYING diff --git a/buildroot/package/bcm2835/bcm2835.mk b/buildroot/package/bcm2835/bcm2835.mk index 2ef6d94b3..1ddd03581 100644 --- a/buildroot/package/bcm2835/bcm2835.mk +++ b/buildroot/package/bcm2835/bcm2835.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCM2835_VERSION = 1.65 +BCM2835_VERSION = 1.68 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835 BCM2835_LICENSE = GPL-3.0 BCM2835_LICENSE_FILES = COPYING diff --git a/buildroot/package/bctoolbox/bctoolbox.hash b/buildroot/package/bctoolbox/bctoolbox.hash index 7d64c3201..9b1f9e821 100644 --- a/buildroot/package/bctoolbox/bctoolbox.hash +++ b/buildroot/package/bctoolbox/bctoolbox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz -sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING +sha256 446b60e81a79b11e8212c44e312aeb0ce46e9ecf0269a35c492ecdca3e7428c3 bctoolbox-4.4.8.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/bctoolbox/bctoolbox.mk b/buildroot/package/bctoolbox/bctoolbox.mk index f9d740820..ac9361026 100644 --- a/buildroot/package/bctoolbox/bctoolbox.mk +++ b/buildroot/package/bctoolbox/bctoolbox.mk @@ -4,10 +4,10 @@ # ################################################################################ -BCTOOLBOX_VERSION = 4.3.1 +BCTOOLBOX_VERSION = 4.4.8 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) -BCTOOLBOX_LICENSE = GPL-2.0+ -BCTOOLBOX_LICENSE_FILES = COPYING +BCTOOLBOX_LICENSE = GPL-3.0+ +BCTOOLBOX_LICENSE_FILES = LICENSE.txt BCTOOLBOX_INSTALL_STAGING = YES # Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to @@ -17,7 +17,6 @@ BCTOOLBOX_CONF_OPTS = \ -DENABLE_STRICT=OFF \ -DENABLE_TESTS_COMPONENT=OFF \ -DENABLE_TESTS=OFF \ - -DGIT_EXECUTABLE=OFF \ -DCMAKE_SKIP_RPATH=ON ifeq ($(BR2_PACKAGE_LIBICONV),y) diff --git a/buildroot/package/bdwgc/bdwgc.mk b/buildroot/package/bdwgc/bdwgc.mk index 6ae9627a6..4a720dbfd 100644 --- a/buildroot/package/bdwgc/bdwgc.mk +++ b/buildroot/package/bdwgc/bdwgc.mk @@ -10,6 +10,7 @@ BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK +BDWGC_CPE_ID_VALID = YES BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf diff --git a/buildroot/package/beecrypt/beecrypt.mk b/buildroot/package/beecrypt/beecrypt.mk index f13f72c8a..20e1a122d 100644 --- a/buildroot/package/beecrypt/beecrypt.mk +++ b/buildroot/package/beecrypt/beecrypt.mk @@ -10,6 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB +BEECRYPT_CPE_ID_VALID = YES BEECRYPT_CONF_OPTS = \ --disable-expert-mode \ diff --git a/buildroot/package/belle-sip/belle-sip.hash b/buildroot/package/belle-sip/belle-sip.hash index 889ad2be7..670ce0062 100644 --- a/buildroot/package/belle-sip/belle-sip.hash +++ b/buildroot/package/belle-sip/belle-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3ac7051ea6ac758cccbf1483a5dd6cda4293b5cde1370a3f0d298e3a6f0ee032 belle-sip-4.3.1.tar.gz +sha256 eabba615c97080572c1b9d3c76f8f9cf6a7432eedf37482672e5fa178a688f72 belle-sip-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/belle-sip/belle-sip.mk b/buildroot/package/belle-sip/belle-sip.mk index 1daef1d2d..b5169be48 100644 --- a/buildroot/package/belle-sip/belle-sip.mk +++ b/buildroot/package/belle-sip/belle-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -BELLE_SIP_VERSION = 4.3.1 +BELLE_SIP_VERSION = 4.4.8 BELLE_SIP_SITE = \ https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION) BELLE_SIP_LICENSE = GPL-3.0+ diff --git a/buildroot/package/belr/belr.hash b/buildroot/package/belr/belr.hash index 42cf50697..00c733c7d 100644 --- a/buildroot/package/belr/belr.hash +++ b/buildroot/package/belr/belr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d6575c36c32828edcaf39df2775070b187019b21fe5fe274e7a85caf54284f05 belr-4.3.1.tar.gz +sha256 6358aa680193d972c831d677da1652c7f57d7e00649b971d4d9fbdebf4331b48 belr-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/belr/belr.mk b/buildroot/package/belr/belr.mk index 8855f94fd..f243830a8 100644 --- a/buildroot/package/belr/belr.mk +++ b/buildroot/package/belr/belr.mk @@ -4,7 +4,7 @@ # ################################################################################ -BELR_VERSION = 4.3.1 +BELR_VERSION = 4.4.8 BELR_SITE = https://gitlab.linphone.org/BC/public/belr/-/archive/$(BELR_VERSION) BELR_LICENSE = GPL-3.0+ BELR_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/berkeleydb/berkeleydb.mk b/buildroot/package/berkeleydb/berkeleydb.mk index e077eb464..36b1894f3 100644 --- a/buildroot/package/berkeleydb/berkeleydb.mk +++ b/buildroot/package/berkeleydb/berkeleydb.mk @@ -15,6 +15,8 @@ BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz BERKELEYDB_SUBDIR = build_unix BERKELEYDB_LICENSE = BerkeleyDB License BERKELEYDB_LICENSE_FILES = LICENSE +BERKELEYDB_CPE_ID_VENDOR = oracle +BERKELEYDB_CPE_ID_PRODUCT = berkeley_db BERKELEYDB_INSTALL_STAGING = YES BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \ diff --git a/buildroot/package/bind/0001-cross.patch b/buildroot/package/bind/0001-cross.patch index d3e7cc68a..f39be2f83 100644 --- a/buildroot/package/bind/0001-cross.patch +++ b/buildroot/package/bind/0001-cross.patch @@ -1,15 +1,24 @@ -Use host compiler to build 'gen' since it's run when building. +From 505cc9fcadda5607dc4c5bacb03928c0b35162a8 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 4 Nov 2020 17:51:38 +0100 +Subject: [PATCH] Use host compiler to build 'gen' since it's run when + building. Signed-off-by: Gustavo Zacarias [Fabrice: updated for 9.11.10] Signed-off-by: Fabrice Fontaine +Signed-off-by: Petr Vorel +--- + lib/dns/Makefile.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) -diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in ---- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300 -+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200 -@@ -160,10 +160,8 @@ +diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in +index 8fc4e94f26..4ac92857e0 100644 +--- a/lib/dns/Makefile.in ++++ b/lib/dns/Makefile.in +@@ -184,10 +184,8 @@ code.h: gen ./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; } - + gen: gen.c - ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ - ${LFS_CFLAGS} ${LFS_LDFLAGS} \ @@ -17,7 +26,9 @@ diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Make - ${BUILD_LIBS} ${LFS_LIBS} + ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \ + ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c - + timestamp: include libdns.@A@ touch timestamp +-- +2.29.1 diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash index 4ba0182b1..369d2f5fb 100644 --- a/buildroot/package/bind/bind.hash +++ b/buildroot/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.22/bind-9.11.22.tar.gz.asc -# with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38 -sha256 afc6d8015006f1cabf699ff19f517bb8fd9c1811e5231f26baf51c3550262ac9 bind-9.11.22.tar.gz -sha256 da2aec2b7f6f0feb16bcb080e2c587375fd3195145f047e4d92d112f5b9db501 COPYRIGHT +# Verified from https://ftp.isc.org/isc/bind9/9.11.28/bind-9.11.28.tar.gz.asc +# with key 2455774D42FDFE6B9C383EB8FE1002BC5970811F +sha256 1090cbe6caba37c404d1075887da7e5282ae9a2bc6172d722df15cd480975e74 bind-9.11.28.tar.gz +sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index 18fc4845f..8e8896f3c 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.22 +BIND_VERSION = 9.11.28 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) @@ -12,6 +12,7 @@ BIND_INSTALL_STAGING = YES BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT +BIND_CPE_ID_VENDOR = isc BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom @@ -30,7 +31,8 @@ BIND_CONF_OPTS = \ --with-randomdev=/dev/urandom \ --enable-epoll \ --with-gssapi=no \ - --enable-filter-aaaa + --enable-filter-aaaa \ + --disable-backtrace ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr @@ -47,7 +49,7 @@ BIND_CONF_OPTS += --disable-linux-caps endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats +BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr BIND_DEPENDENCIES += libxml2 else BIND_CONF_OPTS += --with-libxml2=no diff --git a/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch deleted file mode 100644 index f499426b7..000000000 --- a/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 4 Mar 2020 14:54:27 -0800 -Subject: [PATCH] bfd: xtensa: fix PR ld/25630 - -bfd/ -2020-03-05 Max Filippov - - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic - relocation sections for any removed reference to a dynamic symbol. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 12ff9f772aaf..65e14d87940c 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - - if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) - && (input_section->flags & SEC_ALLOC) != 0 -- && (dynamic_symbol || bfd_link_pic (info)) -- && (!h || h->root.type != bfd_link_hash_undefweak -- || (dynamic_symbol -- && (bfd_link_dll (info) || info->export_dynamic)))) -+ && (dynamic_symbol -+ || (bfd_link_pic (info) -+ && (!h || h->root.type != bfd_link_hash_undefweak)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.20.1 - diff --git a/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch deleted file mode 100644 index 2df46c652..000000000 --- a/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch +++ /dev/null @@ -1,432 +0,0 @@ -From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 19 Apr 2020 19:04:41 -0700 -Subject: [PATCH] xtensa: fix PR ld/25861 - -Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences -(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} -for negative differences (subtracted symbol follows diminished symbol). -Don't generate XTENSA_DIFF relocations in the assembler, generate -XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. - -Handle XTENSA_DIFF in BFD for compatibility with old object files. -Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value -as unsigned. - -2020-04-22 Max Filippov -bfd/ - * bfd-in2.h: Regenerated. - * elf32-xtensa.c (elf_howto_table): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) - (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and - R_XTENSA_NDIFF{8,16,32}. - * libbfd.h (bfd_reloc_code_real_names): Add names for - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} - and BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -binutils/ - * readelf.c (is_none_reloc): Recognize - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -gas/ - * config/tc-xtensa.c (md_apply_fix): Replace - BFD_RELOC_XTENSA_DIFF{8,16,32} generation with - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. - * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 - with BFD_RELOC_XTENSA_PDIFF16 in the expected output. - -include/ - * elf/xtensa.h (elf_xtensa_reloc_type): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - -ld/ - * testsuite/ld-xtensa/relax-loc.d: New test definition. - * testsuite/ld-xtensa/relax-loc.s: New test source. - * testsuite/ld-xtensa/xtensa.exp (relax-loc): New test. - -Signed-off-by: Max Filippov ---- -Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 - - bfd/bfd-in2.h | 20 ++++++- - bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- - bfd/libbfd.h | 6 ++ - bfd/reloc.c | 24 ++++++++ - binutils/readelf.c | 8 ++- - gas/config/tc-xtensa.c | 12 +++- - gas/testsuite/gas/xtensa/loc.d | 2 +- - include/elf/xtensa.h | 6 ++ - ld/testsuite/ld-xtensa/relax-loc.d | 7 +++ - ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++ - ld/testsuite/ld-xtensa/xtensa.exp | 1 + - 11 files changed, 183 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d - create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 37114607b515..be6a30f57955 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ - PLT entries. Otherwise, this is just a generic 32-bit relocation. */ - BFD_RELOC_XTENSA_PLT, - --/* Xtensa relocations to mark the difference of two local symbols. -+/* Xtensa relocations for backward compatibility. These have been replaced -+by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. -+Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference - assuming no relaxation. The relocation encodes the position of the -@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ - BFD_RELOC_XTENSA_TLS_ARG, - BFD_RELOC_XTENSA_TLS_CALL, - -+/* Xtensa relocations to mark the difference of two local symbols. -+These are only needed to support linker relaxation and can be ignored -+when not relaxing. The field is set to the value of the difference -+assuming no relaxation. The relocation encodes the position of the -+subtracted symbol so the linker can determine whether to adjust the field -+value. PDIFF relocations are used for positive differences, NDIFF -+relocations are used for negative differences. The difference value -+is treated as unsigned with these relocation types, giving full -+8/16 value ranges. */ -+ BFD_RELOC_XTENSA_PDIFF8, -+ BFD_RELOC_XTENSA_PDIFF16, -+ BFD_RELOC_XTENSA_PDIFF32, -+ BFD_RELOC_XTENSA_NDIFF8, -+ BFD_RELOC_XTENSA_NDIFF16, -+ BFD_RELOC_XTENSA_NDIFF32, -+ - /* 8 bit signed offset in (ix+d) or (iy+d). */ - BFD_RELOC_Z80_DISP8, - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 473a9d76f289..fded42d52a9a 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = - HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, - bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", - FALSE, 0, 0, FALSE), -+ -+ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), -+ -+ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), - }; - - #if DEBUG_GEN_RELOC -@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - TRACE ("BFD_RELOC_XTENSA_DIFF32"); - return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; - -+ case BFD_RELOC_XTENSA_PDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; -+ - case BFD_RELOC_XTENSA_RTLD: - TRACE ("BFD_RELOC_XTENSA_RTLD"); - return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; -@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, - case R_XTENSA_DIFF8: - case R_XTENSA_DIFF16: - case R_XTENSA_DIFF32: -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF8: -+ case R_XTENSA_NDIFF16: -+ case R_XTENSA_NDIFF32: - case R_XTENSA_TLS_FUNC: - case R_XTENSA_TLS_ARG: - case R_XTENSA_TLS_CALL: -@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - if (r_type == R_XTENSA_DIFF8 - || r_type == R_XTENSA_DIFF16 -- || r_type == R_XTENSA_DIFF32) -+ || r_type == R_XTENSA_DIFF32 -+ || r_type == R_XTENSA_PDIFF8 -+ || r_type == R_XTENSA_PDIFF16 -+ || r_type == R_XTENSA_PDIFF32 -+ || r_type == R_XTENSA_NDIFF8 -+ || r_type == R_XTENSA_NDIFF16 -+ || r_type == R_XTENSA_NDIFF32) - { - bfd_signed_vma diff_value = 0; - bfd_vma new_end_offset, diff_mask = 0; -@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_value = -+ bfd_get_8 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_value = -+ bfd_get_16 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_value = -+ bfd_get_32 (abfd, &contents[old_source_offset]); -+ break; - } - -+ if (r_type >= R_XTENSA_NDIFF8 -+ && r_type <= R_XTENSA_NDIFF32) -+ diff_value = -diff_value; -+ - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, - r_rel.target_offset + diff_value); -@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; -+ bfd_put_8 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; -+ bfd_put_16 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; -+ bfd_put_32 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; - } - - /* Check for overflow. Sign bits must be all zeroes or all ones */ -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 3c184fcadadf..989f4bc0b595 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_XTENSA_TLS_FUNC", - "BFD_RELOC_XTENSA_TLS_ARG", - "BFD_RELOC_XTENSA_TLS_CALL", -+ "BFD_RELOC_XTENSA_PDIFF8", -+ "BFD_RELOC_XTENSA_PDIFF16", -+ "BFD_RELOC_XTENSA_PDIFF32", -+ "BFD_RELOC_XTENSA_NDIFF8", -+ "BFD_RELOC_XTENSA_NDIFF16", -+ "BFD_RELOC_XTENSA_NDIFF32", - "BFD_RELOC_Z80_DISP8", - "BFD_RELOC_Z80_BYTE0", - "BFD_RELOC_Z80_BYTE1", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index c4dec86d1d46..f5df8e2ab3eb 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6556,6 +6556,8 @@ ENUMX - ENUMX - BFD_RELOC_XTENSA_DIFF32 - ENUMDOC -+ Xtensa relocations for backward compatibility. These have been replaced -+ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. - Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference -@@ -6668,6 +6670,28 @@ ENUMX - BFD_RELOC_XTENSA_TLS_CALL - ENUMDOC - Xtensa TLS relocations. -+ENUM -+ BFD_RELOC_XTENSA_PDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF32 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF32 -+ENUMDOC -+ Xtensa relocations to mark the difference of two local symbols. -+ These are only needed to support linker relaxation and can be ignored -+ when not relaxing. The field is set to the value of the difference -+ assuming no relaxation. The relocation encodes the position of the -+ subtracted symbol so the linker can determine whether to adjust the field -+ value. PDIFF relocations are used for positive differences, NDIFF -+ relocations are used for negative differences. The difference value -+ is treated as unsigned with these relocation types, giving full -+ 8/16 value ranges. - - ENUM - BFD_RELOC_Z80_DISP8 -diff --git a/binutils/readelf.c b/binutils/readelf.c -index d4756c93b345..800918f901c8 100644 ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 17 /* R_XTENSA_DIFF8. */ - || reloc_type == 18 /* R_XTENSA_DIFF16. */ -- || reloc_type == 19 /* R_XTENSA_DIFF32. */); -+ || reloc_type == 19 /* R_XTENSA_DIFF32. */ -+ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ -+ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ -+ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ -+ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ -+ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ -+ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); - } - return FALSE; - } -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 71d4d94a8d7d..ee75c13548ff 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - case BFD_RELOC_8: - if (fixP->fx_subsy) - { -+ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset -+ < S_GET_VALUE (fixP->fx_subsy); -+ - switch (fixP->fx_r_type) - { - case BFD_RELOC_8: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; - fixP->fx_signed = 0; - break; - case BFD_RELOC_16: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; - fixP->fx_signed = 0; - break; - case BFD_RELOC_32: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; - fixP->fx_signed = 0; - break; - default: -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -index 71983cc90055..8fb3425999d5 100644 ---- a/gas/testsuite/gas/xtensa/loc.d -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -6,5 +6,5 @@ - - RELOCATION RECORDS FOR \[\.debug_line\]: - #... --.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 - #... -diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h -index 2eb5e4e52941..bd5c80d13777 100644 ---- a/include/elf/xtensa.h -+++ b/include/elf/xtensa.h -@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) - RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) - RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) - RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) -+ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) -+ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) -+ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) -+ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) -+ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) -+ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) - END_RELOC_NUMBERS (R_XTENSA_max) - - /* Processor-specific flags for the ELF header e_flags field. */ -diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d -new file mode 100644 -index 000000000000..3c8d673732ff ---- /dev/null -+++ b/ld/testsuite/ld-xtensa/relax-loc.d -@@ -0,0 +1,7 @@ -+#as: --text-section-literals -+#ld: -+#objdump: --dwarf=decodedline -+#... -+relax-loc.s[ ]+1[ ]+0x400054[ ]+.* -+relax-loc.s[ ]+2[ ]+0x40005c[ ]+.* -+#... -diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s -new file mode 100644 -index 000000000000..d768470e287a ---- /dev/null -+++ b/ld/testsuite/ld-xtensa/relax-loc.s -@@ -0,0 +1,15 @@ -+ .file 1 "relax-loc.s" -+ .globl _start -+ .globl _ResetVector -+ .text -+_ResetVector: -+_start: -+ .loc 1 1 -+ j 1f -+ .literal_position -+1: -+ .loc 1 2 -+ -+ .rep 10000 -+ movi a2, 0x12345678 -+ .endr -diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp -index 9b2235b2151b..de39887936ad 100644 ---- a/ld/testsuite/ld-xtensa/xtensa.exp -+++ b/ld/testsuite/ld-xtensa/xtensa.exp -@@ -27,6 +27,7 @@ run_dump_test "call_overflow" - run_dump_test "coalesce" - run_dump_test "diff_overflow" - run_dump_test "lcall" -+run_dump_test "relax-loc" - - run_dump_test "relax-static-pie" - run_dump_test "relax-static-local-pie" --- -2.20.1 - diff --git a/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch deleted file mode 100644 index 28f17d7c5..000000000 --- a/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 25 Apr 2020 00:40:25 -0700 -Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 - -Fields marked with XTENSA_NDIFF relocations are not negated, they only -have sign bits removed. Don't negate their values when relaxation is -performed. Don't add sign bits when the value is zero. Report overflow -when the result has negative sign but all significant bits are zero. - -2020-04-29 Max Filippov -bfd/ - * elf32-xtensa.c (relax_section): Don't negate diff_value for - XTENSA_NDIFF relocations. Don't add sign bits whe diff_value - equals 0. Report overflow when the result has negative sign but - all significant bits are zero. - -Signed-off-by: Max Filippov -Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 ---- - - bfd/elf32-xtensa.c | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index fded42d52a9a..4327b027911f 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -+ diff_mask = 0x7f; - diff_value = - bfd_get_signed_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -+ diff_mask = 0x7fff; - diff_value = - bfd_get_signed_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -+ diff_mask = 0x7fffffff; - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; - diff_value = - bfd_get_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; - diff_value = - bfd_get_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; - diff_value = - bfd_get_32 (abfd, &contents[old_source_offset]); - break; - } - - if (r_type >= R_XTENSA_NDIFF8 -- && r_type <= R_XTENSA_NDIFF32) -- diff_value = -diff_value; -+ && r_type <= R_XTENSA_NDIFF32 -+ && diff_value) -+ diff_value |= ~diff_mask; - - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, -@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -- diff_mask = 0x7f; - bfd_put_signed_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -- diff_mask = 0x7fff; - bfd_put_signed_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -- diff_mask = 0x7fffffff; - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -- diff_mask = 0xff; - bfd_put_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -- diff_mask = 0xffff; - bfd_put_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -- diff_mask = 0xffffffff; - bfd_put_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - } - -- /* Check for overflow. Sign bits must be all zeroes or all ones */ -- if ((diff_value & ~diff_mask) != 0 && -- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) -+ /* Check for overflow. Sign bits must be all zeroes or -+ all ones. When sign bits are all ones diff_value -+ may not be zero. */ -+ if (((diff_value & ~diff_mask) != 0 -+ && (diff_value & ~diff_mask) != ~diff_mask) -+ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) - { - (*link_info->callbacks->reloc_dangerous) - (link_info, _("overflow after relaxation"), --- -2.20.1 - diff --git a/buildroot/package/binutils/2.35.1/0001-sh-conf.patch b/buildroot/package/binutils/2.35.2/0001-sh-conf.patch similarity index 100% rename from buildroot/package/binutils/2.35.1/0001-sh-conf.patch rename to buildroot/package/binutils/2.35.2/0001-sh-conf.patch diff --git a/buildroot/package/binutils/2.35.1/0002-poison-system-directories.patch b/buildroot/package/binutils/2.35.2/0002-poison-system-directories.patch similarity index 100% rename from buildroot/package/binutils/2.35.1/0002-poison-system-directories.patch rename to buildroot/package/binutils/2.35.2/0002-poison-system-directories.patch diff --git a/buildroot/package/binutils/2.33.1/0001-sh-conf.patch b/buildroot/package/binutils/2.36.1/0001-sh-conf.patch similarity index 84% rename from buildroot/package/binutils/2.33.1/0001-sh-conf.patch rename to buildroot/package/binutils/2.36.1/0001-sh-conf.patch index 035100db8..0070e582f 100644 --- a/buildroot/package/binutils/2.33.1/0001-sh-conf.patch +++ b/buildroot/package/binutils/2.36.1/0001-sh-conf.patch @@ -1,4 +1,4 @@ -From 3220c7e65ccfe41eceaaa6f1707f7f5775d9a4b0 Mon Sep 17 00:00:00 2001 +From f88f4c77266b9669b285ab64386cf39e183661bb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:38:13 +0100 Subject: [PATCH] sh-conf @@ -18,10 +18,10 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 6a9719f6091..796641b6aa3 100755 +index 68779feb42b..8b4333b2c15 100755 --- a/configure +++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in +@@ -3887,7 +3887,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -31,10 +31,10 @@ index 6a9719f6091..796641b6aa3 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index 7433badc217..dce082fb58e 100644 +index d16a2757689..035854759ed 100644 --- a/configure.ac +++ b/configure.ac -@@ -1158,7 +1158,7 @@ case "${target}" in +@@ -1177,7 +1177,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -44,5 +44,5 @@ index 7433badc217..dce082fb58e 100644 sh*-*-elf) ;; -- -2.23.0 +2.29.2 diff --git a/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch b/buildroot/package/binutils/2.36.1/0002-poison-system-directories.patch similarity index 87% rename from buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch rename to buildroot/package/binutils/2.36.1/0002-poison-system-directories.patch index 9eafcbe18..071b67ac7 100644 --- a/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch +++ b/buildroot/package/binutils/2.36.1/0002-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 276cba370773e8f12dc8b186b71827a01d5c9097 Mon Sep 17 00:00:00 2001 +From a9652a60af6254d07066f08377415f05e3a9462e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:45:38 +0100 Subject: [PATCH] poison-system-directories @@ -78,10 +78,10 @@ Signed-off-by: Scott Garman 9 files changed, 89 insertions(+) diff --git a/ld/config.in b/ld/config.in -index d93c9b08300..5da2742beac 100644 +index 7b60d778587..37b8e9b6f6c 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -31,6 +31,9 @@ +@@ -40,6 +40,9 @@ language is requested. */ #undef ENABLE_NLS @@ -92,10 +92,10 @@ index d93c9b08300..5da2742beac 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index b532ef94fa2..65d12cbf883 100755 +index a8d248eab58..f52e1f3c18f 100755 --- a/ld/configure +++ b/ld/configure -@@ -823,6 +823,7 @@ with_lib_path +@@ -828,6 +828,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -103,7 +103,7 @@ index b532ef94fa2..65d12cbf883 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1487,6 +1488,8 @@ Optional Features: +@@ -1496,6 +1497,8 @@ Optional Features: --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -112,7 +112,7 @@ index b532ef94fa2..65d12cbf883 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15804,7 +15807,18 @@ else +@@ -15841,7 +15844,18 @@ else fi @@ -132,7 +132,7 @@ index b532ef94fa2..65d12cbf883 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index ee62d10ac58..bc3e14e729d 100644 +index c9c69ab9245..59dab0a6ac4 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -153,10 +153,10 @@ index ee62d10ac58..bc3e14e729d 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 55078a9637b..511e9bc34b7 100644 +index 93f5af92c7d..ff7f71a7b66 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bfd_boolean force_group_allocation; @@ -172,10 +172,10 @@ index 55078a9637b..511e9bc34b7 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index b3447050ed2..efd50edd85c 100644 +index 7a602b9c6ab..cccbfbab3bb 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked file does not change. +@@ -2810,6 +2810,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -195,10 +195,10 @@ index b3447050ed2..efd50edd85c 100644 @c man end diff --git a/ld/ldfile.c b/ld/ldfile.c -index 7f60319390e..0bcc06db964 100644 +index 81cb86d51e2..cd5c2752679 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) +@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -223,23 +223,23 @@ index 7f60319390e..0bcc06db964 100644 /* Try to open a BFD for a lang_input_statement. */ diff --git a/ld/ldlex.h b/ld/ldlex.h -index 32a7a6409e8..c02b64bf92f 100644 +index b0101028321..77f5accb5d9 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -150,6 +150,8 @@ enum option_values - OPTION_FORCE_GROUP_ALLOCATION, - OPTION_PRINT_MAP_DISCARDED, - OPTION_NO_PRINT_MAP_DISCARDED, +@@ -161,6 +161,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c -index e24194ef87d..2d683cb6c5a 100644 +index 863df0293ea..f06f2546ef5 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -323,6 +323,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -249,12 +249,12 @@ index e24194ef87d..2d683cb6c5a 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the diff --git a/ld/lexsup.c b/ld/lexsup.c -index 1c15ac29c0c..8b714e10a40 100644 +index f005a58a045..eb383d3755b 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), +@@ -591,6 +591,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, @@ -267,7 +267,7 @@ index 1c15ac29c0c..8b714e10a40 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -561,6 +569,7 @@ parse_args (unsigned argc, char **argv) +@@ -603,6 +611,7 @@ parse_args (unsigned argc, char **argv) int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -275,7 +275,7 @@ index 1c15ac29c0c..8b714e10a40 100644 struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1549,6 +1558,14 @@ parse_args (unsigned argc, char **argv) +@@ -1633,6 +1642,14 @@ parse_args (unsigned argc, char **argv) } break; @@ -290,7 +290,7 @@ index 1c15ac29c0c..8b714e10a40 100644 case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1600,6 +1617,10 @@ parse_args (unsigned argc, char **argv) +@@ -1778,6 +1795,10 @@ parse_args (unsigned argc, char **argv) command_line.soname = NULL; } @@ -302,5 +302,5 @@ index 1c15ac29c0c..8b714e10a40 100644 { einfo (_("%P: missing --end-group; added as last command line option\n")); -- -2.23.0 +2.29.2 diff --git a/buildroot/package/binutils/Config.in.host b/buildroot/package/binutils/Config.in.host index 89c6894a1..d6909617c 100644 --- a/buildroot/package/binutils/Config.in.host +++ b/buildroot/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_34_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_35_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc default BR2_BINUTILS_VERSION_CSKY if BR2_csky help @@ -17,13 +17,6 @@ config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32" depends on !BR2_csky -config BR2_BINUTILS_VERSION_2_33_X - bool "binutils 2.33.1" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_34_X bool "binutils 2.34" depends on !BR2_csky @@ -32,7 +25,14 @@ config BR2_BINUTILS_VERSION_2_34_X depends on !BR2_BINFMT_FLAT config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.1" + bool "binutils 2.35.2" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT + +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.1" depends on !BR2_csky # https://github.com/uclinux-dev/elf2flt/pull/16 # https://github.com/uclinux-dev/elf2flt/issues/12 @@ -53,9 +53,9 @@ config BR2_BINUTILS_VERSION default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.33.1" if BR2_BINUTILS_VERSION_2_33_X default "2.34" if BR2_BINUTILS_VERSION_2_34_X - default "2.35.1" if BR2_BINUTILS_VERSION_2_35_X + default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X + default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/buildroot/package/binutils/binutils.hash b/buildroot/package/binutils/binutils.hash index ce5b0cdca..20462b380 100644 --- a/buildroot/package/binutils/binutils.hash +++ b/buildroot/package/binutils/binutils.hash @@ -1,8 +1,8 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac binutils-2.33.1.tar.xz sha512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd binutils-2.34.tar.xz -sha512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb binutils-2.35.1.tar.xz +sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz +sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz diff --git a/buildroot/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk index d978b424b..e469febbb 100644 --- a/buildroot/package/binutils/binutils.mk +++ b/buildroot/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.34 +BINUTILS_VERSION = 2.35.2 endif endif # BINUTILS_VERSION @@ -35,6 +35,7 @@ BINUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) BINUTILS_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB +BINUTILS_CPE_ID_VENDOR = gnu ifeq ($(BINUTILS_FROM_GIT),y) BINUTILS_DEPENDENCIES += host-flex host-bison diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk index 70111a8d6..efd75afd6 100644 --- a/buildroot/package/bison/bison.mk +++ b/buildroot/package/bison/bison.mk @@ -9,6 +9,7 @@ BISON_SOURCE = bison-$(BISON_VERSION).tar.xz BISON_SITE = $(BR2_GNU_MIRROR)/bison BISON_LICENSE = GPL-3.0+ BISON_LICENSE_FILES = COPYING +BISON_CPE_ID_VENDOR = gnu # parallel build issue in examples/c/reccalc/ BISON_MAKE = $(MAKE1) HOST_BISON_DEPENDENCIES = host-m4 diff --git a/buildroot/package/bitcoin/bitcoin.hash b/buildroot/package/bitcoin/bitcoin.hash index d39eb38e9..3c65c3d73 100644 --- a/buildroot/package/bitcoin/bitcoin.hash +++ b/buildroot/package/bitcoin/bitcoin.hash @@ -1,5 +1,5 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.20.1/SHA256SUMS.asc -sha256 4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978 bitcoin-0.20.1.tar.gz +# From https://bitcoincore.org/bin/bitcoin-core-0.21.0/SHA256SUMS.asc +sha256 1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37 bitcoin-0.21.0.tar.gz # Hash for license file sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING diff --git a/buildroot/package/bitcoin/bitcoin.mk b/buildroot/package/bitcoin/bitcoin.mk index 9d2094c02..5f1684879 100644 --- a/buildroot/package/bitcoin/bitcoin.mk +++ b/buildroot/package/bitcoin/bitcoin.mk @@ -4,11 +4,13 @@ # ################################################################################ -BITCOIN_VERSION = 0.20.1 +BITCOIN_VERSION = 0.21.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT BITCOIN_LICENSE_FILES = COPYING +BITCOIN_CPE_ID_VENDOR = bitcoin +BITCOIN_CPE_ID_PRODUCT = bitcoin_core BITCOIN_DEPENDENCIES = host-pkgconf boost libevent BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 BITCOIN_CONF_OPTS = \ diff --git a/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch b/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch deleted file mode 100644 index b0b1f7272..000000000 --- a/buildroot/package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 72324e9415d2757a5f0f028865f841de70e1d0c4 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Sun, 12 Jul 2020 14:18:09 +0200 -Subject: [PATCH] fix build issue with gcc 10 - -This patch is created on top of tagged version v2.1.0. -An upstream fix commit [1] for this issue is already in upstream master but -does not apply on current used version in buildroot. - -[1] https://github.com/Arkq/bluez-alsa/commit/30a23dd7ce9b00c702fa48545f6b03038f9e17c6 - -Signed-off-by: Heiko Thiery -[Fabrice: also update src/ofono-iface.h] -Signed-off-by: Fabrice Fontaine ---- - src/bluealsa-dbus.c | 4 ++++ - src/bluealsa-iface.c | 2 ++ - src/bluealsa-iface.h | 4 ---- - src/bluealsa.c | 3 +++ - src/bluez-a2dp.h | 3 --- - src/bluez-iface.h | 3 --- - src/bluez.c | 3 +++ - 7 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/bluealsa-dbus.c b/src/bluealsa-dbus.c -index 5e748e3..4c9cd3d 100644 ---- a/src/bluealsa-dbus.c -+++ b/src/bluealsa-dbus.c -@@ -33,6 +33,10 @@ - #include "shared/defs.h" - #include "shared/log.h" - -+extern const GDBusInterfaceInfo bluealsa_iface_manager; -+extern const GDBusInterfaceInfo bluealsa_iface_pcm; -+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm; -+ - static GVariant *ba_variant_new_device_path(const struct ba_device *d) { - return g_variant_new_object_path(d->bluez_dbus_path); - } -diff --git a/src/bluealsa-iface.c b/src/bluealsa-iface.c -index 71810c7..55b79c9 100644 ---- a/src/bluealsa-iface.c -+++ b/src/bluealsa-iface.c -@@ -10,6 +10,8 @@ - - #include "bluealsa-iface.h" - -+#define BLUEALAS_IFACE_C -+ - static const GDBusArgInfo arg_codec = { - -1, "codec", "q", NULL - }; -diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h -index 262fb76..4f3e85b 100644 ---- a/src/bluealsa-iface.h -+++ b/src/bluealsa-iface.h -@@ -32,8 +32,4 @@ - #define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG" - #define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS" - --const GDBusInterfaceInfo bluealsa_iface_manager; --const GDBusInterfaceInfo bluealsa_iface_pcm; --const GDBusInterfaceInfo bluealsa_iface_rfcomm; -- - #endif -diff --git a/src/bluealsa.c b/src/bluealsa.c -index 929f9ed..690c407 100644 ---- a/src/bluealsa.c -+++ b/src/bluealsa.c -@@ -20,6 +20,9 @@ - #include "bluez-a2dp.h" - #include "hfp.h" - -+/* NULL-terminated list of available A2DP codecs */ -+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs; -+ - /* Initialize global configuration variable. */ - struct ba_config config = { - -diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h -index 7c0e33b..127dbd9 100644 ---- a/src/bluez-a2dp.h -+++ b/src/bluez-a2dp.h -@@ -57,7 +57,4 @@ struct bluez_a2dp_codec { - size_t samplings_size; - }; - --/* NULL-terminated list of available A2DP codecs */ --const struct bluez_a2dp_codec **bluez_a2dp_codecs; -- - #endif -diff --git a/src/bluez-iface.h b/src/bluez-iface.h -index 34269c5..250267e 100644 ---- a/src/bluez-iface.h -+++ b/src/bluez-iface.h -@@ -27,7 +27,4 @@ - #define BLUEZ_TRANSPORT_STATE_PENDING "pending" - #define BLUEZ_TRANSPORT_STATE_ACTIVE "active" - --const GDBusInterfaceInfo bluez_iface_endpoint; --const GDBusInterfaceInfo bluez_iface_profile; -- - #endif -diff --git a/src/bluez.c b/src/bluez.c -index cfdbff8..190101e 100644 ---- a/src/bluez.c -+++ b/src/bluez.c -@@ -45,6 +45,9 @@ - # define G_DBUS_ERROR_UNKNOWN_OBJECT G_DBUS_ERROR_FAILED - #endif - -+extern const GDBusInterfaceInfo bluez_iface_endpoint; -+extern const GDBusInterfaceInfo bluez_iface_profile; -+ - /** - * Structure describing registered D-Bus object. */ - struct dbus_object_data { - diff --git a/src/ofono-iface.h b/src/ofono-iface.h -index d5a6715..d5b9065 100644 ---- a/src/ofono-iface.h -+++ b/src/ofono-iface.h -@@ -1,6 +1,6 @@ - /* - * BlueALSA - ofono-iface.h -- * Copyright (c) 2016-2019 Arkadiusz Bokowy -+ * Copyright (c) 2016-2020 Arkadiusz Bokowy - * 2018 Thierry Bultel - * - * This file is a part of bluez-alsa. -@@ -27,6 +27,6 @@ - #define OFONO_AUDIO_CODEC_CVSD 0x01 - #define OFONO_AUDIO_CODEC_MSBC 0x02 - --const GDBusInterfaceInfo ofono_iface_hf_audio_agent; -+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent; - - #endif --- -2.20.1 - diff --git a/buildroot/package/bluez-alsa/bluez-alsa.hash b/buildroot/package/bluez-alsa/bluez-alsa.hash index 603a501d4..6be93bc04 100644 --- a/buildroot/package/bluez-alsa/bluez-alsa.hash +++ b/buildroot/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 6459f70e47e70b4c04a85acf148381e6c8a2e86bd638aff21870afc6c14b85b0 bluez-alsa-2.1.0.tar.gz +sha256 8b9bc36be922c10c6628ddf84b13dfadfeb3ab0bcf72bad842c66f3120abc6b2 bluez-alsa-3.0.0.tar.gz sha256 60253922a459245128c34eb379cbda7c76936636d4c10edc576663a0f560dd4d LICENSE diff --git a/buildroot/package/bluez-alsa/bluez-alsa.mk b/buildroot/package/bluez-alsa/bluez-alsa.mk index d5cb3ed67..9262a7f66 100644 --- a/buildroot/package/bluez-alsa/bluez-alsa.mk +++ b/buildroot/package/bluez-alsa/bluez-alsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = 2.1.0 +BLUEZ_ALSA_VERSION = 3.0.0 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT BLUEZ_ALSA_LICENSE_FILES = LICENSE @@ -14,6 +14,7 @@ BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf BLUEZ_ALSA_AUTORECONF = YES BLUEZ_ALSA_CONF_OPTS = \ + --enable-a2dpconf \ --enable-aplay \ --disable-debug-time \ --with-alsaplugindir=/usr/lib/alsa-lib \ diff --git a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk index 589978c8c..a2e22148a 100644 --- a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -11,6 +11,8 @@ BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils BLUEZ5_UTILS_HEADERS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_HEADERS_LICENSE_FILES = COPYING COPYING.LIB +BLUEZ5_UTILS_HEADERS_CPE_ID_VENDOR = bluez +BLUEZ5_UTILS_HEADERS_CPE_ID_PRODUCT = bluez BLUEZ5_UTILS_HEADERS_INSTALL_STAGING = YES BLUEZ5_UTILS_HEADERS_INSTALL_TARGET = NO diff --git a/buildroot/package/bluez5_utils/S40bluetooth b/buildroot/package/bluez5_utils/S40bluetooth new file mode 100755 index 000000000..ee4abe8b6 --- /dev/null +++ b/buildroot/package/bluez5_utils/S40bluetooth @@ -0,0 +1,61 @@ +#!/bin/sh + +DAEMON="bluetoothd" +PIDFILE="/var/run/$DAEMON.pid" + +BLUETOOTHD_ARGS="-n" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/libexec/bluetooth/$DAEMON" \ + -- $BLUETOOTHD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/bluez5_utils/bluez5_utils.mk b/buildroot/package/bluez5_utils/bluez5_utils.mk index f2c8cabcf..2fd3016b5 100644 --- a/buildroot/package/bluez5_utils/bluez5_utils.mk +++ b/buildroot/package/bluez5_utils/bluez5_utils.mk @@ -11,6 +11,8 @@ BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB +BLUEZ5_UTILS_CPE_ID_VENDOR = bluez +BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -133,4 +135,9 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif +define BLUEZ5_UTILS_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetooth \ + $(TARGET_DIR)/etc/init.d/S40bluetooth +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/boa/0001-use-name-max.patch b/buildroot/package/boa/0001-use-name-max.patch deleted file mode 100644 index 055e56c3e..000000000 --- a/buildroot/package/boa/0001-use-name-max.patch +++ /dev/null @@ -1,21 +0,0 @@ -Use NAME_MAX instead of MAXNAMLEN - -NAME_MAX is POSIX, and available in all C libraries, generally in -, while MAXNAMLEN is BSD-specific, and only available in -musl in . So let's use NAME_MAX instead of MAXNAMLEN. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/index_dir.c -=================================================================== ---- a/src/index_dir.c -+++ b/src/index_dir.c -@@ -29,7 +29,7 @@ - #include - #include "compat.h" - --#define MAX_FILE_LENGTH MAXNAMLEN -+#define MAX_FILE_LENGTH NAME_MAX - #define MAX_PATH_LENGTH PATH_MAX - - #define INT_TO_HEX(x) \ diff --git a/buildroot/package/boa/Config.in b/buildroot/package/boa/Config.in deleted file mode 100644 index cb085a249..000000000 --- a/buildroot/package/boa/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BOA - bool "boa" - depends on BR2_USE_MMU # uses fork() - help - A very small and very fast http daemon. Not intended as - a feature-packed server. - - http://www.boa.org/ diff --git a/buildroot/package/boa/boa.conf b/buildroot/package/boa/boa.conf deleted file mode 100644 index f51c23731..000000000 --- a/buildroot/package/boa/boa.conf +++ /dev/null @@ -1,187 +0,0 @@ -# Boa v0.94 configuration file -# File format has not changed from 0.93 -# File format has changed little from 0.92 -# version changes are noted in the comments -# -# The Boa configuration file is parsed with a lex/yacc or flex/bison -# generated parser. If it reports an error, the line number will be -# provided; it should be easy to spot. The syntax of each of these -# rules is very simple, and they can occur in any order. Where possible -# these directives mimic those of NCSA httpd 1.3; I saw no reason to -# introduce gratuitous differences. - -# $Id: boa.conf,v 1.1 2004/10/09 02:48:37 andersen Exp $ - -# The "ServerRoot" is not in this configuration file. It can be compiled -# into the server (see defines.h) or specified on the command line with -# the -c option, for example: -# -# boa -c /usr/local/boa - - -# Port: The port Boa runs on. The default port for http servers is 80. -# If it is less than 1024, the server must be started as root. - -Port 80 - -# Listen: the Internet address to bind(2) to. If you leave it out, -# it takes the behavior before 0.93.17.2, which is to bind to all -# addresses (INADDR_ANY). You only get one "Listen" directive, -# if you want service on multiple IP addresses, you have three choices: -# 1. Run boa without a "Listen" directive -# a. All addresses are treated the same; makes sense if the addresses -# are localhost, ppp, and eth0. -# b. Use the VirtualHost directive below to point requests to different -# files. Should be good for a very large number of addresses (web -# hosting clients). -# 2. Run one copy of boa per IP address, each has its own configuration -# with a "Listen" directive. No big deal up to a few tens of addresses. -# Nice separation between clients. -# The name you provide gets run through inet_aton(3), so you have to use dotted -# quad notation. This configuration is too important to trust some DNS. - -#Listen 192.68.0.5 - -# User: The name or UID the server should run as. -# Group: The group name or GID the server should run as. - -User nobody -Group nobody - -# ServerAdmin: The email address where server problems should be sent. -# Note: this is not currently used, except as an environment variable -# for CGIs. - -#ServerAdmin root@localhost - -# ErrorLog: The location of the error log file. If this does not start -# with /, it is considered relative to the server root. -# Set to /dev/null if you don't want errors logged. -# If unset, defaults to /dev/stderr - -ErrorLog /var/log/boa/error_log -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#ErrorLog "|/usr/sbin/cronolog --symlink=/var/log/boa/error_log /var/log/boa/error-%Y%m%d.log" - -# AccessLog: The location of the access log file. If this does not -# start with /, it is considered relative to the server root. -# Comment out or set to /dev/null (less effective) to disable -# Access logging. - -AccessLog /var/log/boa/access_log -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#AccessLog "|/usr/sbin/cronolog --symlink=/var/log/boa/access_log /var/log/boa/access-%Y%m%d.log" - -# UseLocaltime: Logical switch. Uncomment to use localtime -# instead of UTC time -#UseLocaltime - -# VerboseCGILogs: this is just a logical switch. -# It simply notes the start and stop times of cgis in the error log -# Comment out to disable. - -#VerboseCGILogs - -# ServerName: the name of this server that should be sent back to -# clients if different than that returned by gethostname + gethostbyname - -#ServerName www.your.org.here - -# VirtualHost: a logical switch. -# Comment out to disable. -# Given DocumentRoot /var/www, requests on interface 'A' or IP 'IP-A' -# become /var/www/IP-A. -# Example: http://localhost/ becomes /var/www/127.0.0.1 -# -# Not used until version 0.93.17.2. This "feature" also breaks commonlog -# output rules, it prepends the interface number to each access_log line. -# You are expected to fix that problem with a postprocessing script. - -#VirtualHost - -# DocumentRoot: The root directory of the HTML documents. -# Comment out to disable server non user files. - -DocumentRoot /var/www - -# UserDir: The name of the directory which is appended onto a user's home -# directory if a ~user request is recieved. - -UserDir public_html - -# DirectoryIndex: Name of the file to use as a pre-written HTML -# directory index. Please MAKE AND USE THESE FILES. On the -# fly creation of directory indexes can be _slow_. -# Comment out to always use DirectoryMaker - -DirectoryIndex index.html - -# DirectoryMaker: Name of program used to create a directory listing. -# Comment out to disable directory listings. If both this and -# DirectoryIndex are commented out, accessing a directory will give -# an error (though accessing files in the directory are still ok). - -DirectoryMaker /usr/lib/boa/boa_indexer - -# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker -# has been commented out, the the on-the-fly indexing of Boa can be used -# to generate indexes of directories. Be warned that the output is -# extremely minimal and can cause delays when slow disks are used. -# Note: The DirectoryCache must be writable by the same user/group that -# Boa runs as. - -# DirectoryCache /var/spool/boa/dircache - -# KeepAliveMax: Number of KeepAlive requests to allow per connection -# Comment out, or set to 0 to disable keepalive processing - -KeepAliveMax 1000 - -# KeepAliveTimeout: seconds to wait before keepalive connection times out - -KeepAliveTimeout 10 - -# MimeTypes: This is the file that is used to generate mime type pairs -# and Content-Type fields for boa. -# Set to /dev/null if you do not want to load a mime types file. -# Do *not* comment out (better use AddType!) - -MimeTypes /etc/mime.types - -# DefaultType: MIME type used if the file extension is unknown, or there -# is no file extension. - -DefaultType text/plain - -# AddType: adds types without editing mime.types -# Example: AddType type extension [extension ...] - -# Uncomment the next line if you want .cgi files to execute from anywhere -#AddType application/x-httpd-cgi cgi - -# Redirect, Alias, and ScriptAlias all have the same semantics -- they -# match the beginning of a request and take appropriate action. Use -# Redirect for other servers, Alias for the same server, and ScriptAlias -# to enable directories for script execution. - -# Redirect allows you to tell clients about documents which used to exist in -# your server's namespace, but do not anymore. This allows you to tell the -# clients where to look for the relocated document. -# Example: Redirect /bar http://elsewhere/feh/bar - -# Aliases: Aliases one path to another. -# Example: Alias /path1/bar /path2/foo - -# Alias /doc /usr/doc - -# ScriptAlias: Maps a virtual path to a directory for serving scripts -# Example: ScriptAlias /htbin/ /www/htbin/ - -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - diff --git a/buildroot/package/boa/boa.hash b/buildroot/package/boa/boa.hash deleted file mode 100644 index 4efe3aec4..000000000 --- a/buildroot/package/boa/boa.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 02c51bf25f29d56e641b662f0767759654c28d88ec31f55c5a73d57edfe13cf6 boa-0.94.14rc21.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/boa/boa.mk b/buildroot/package/boa/boa.mk deleted file mode 100644 index d8bcaa122..000000000 --- a/buildroot/package/boa/boa.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# boa -# -################################################################################ - -BOA_VERSION = 0.94.14rc21 -BOA_SITE = http://www.boa.org -BOA_LICENSE = GPL-2.0+ -BOA_LICENSE_FILES = COPYING - -define BOA_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/src/boa $(TARGET_DIR)/usr/sbin/boa - $(INSTALL) -D -m 755 $(@D)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer - $(INSTALL) -D -m 644 package/boa/boa.conf $(TARGET_DIR)/etc/boa/boa.conf - $(INSTALL) -D -m 644 package/boa/mime.types $(TARGET_DIR)/etc/mime.types -endef - -$(eval $(autotools-package)) diff --git a/buildroot/package/boa/mime.types b/buildroot/package/boa/mime.types deleted file mode 100644 index 53f6ea101..000000000 --- a/buildroot/package/boa/mime.types +++ /dev/null @@ -1,205 +0,0 @@ -############################################################################### -# -# MIME-TYPES and the extensions that represent them -# -# This file is part of the "mime-support" package. Please send email (not a -# bug report) to mime-support@packages.debian.org if you would like new types -# and/or extensions to be added. -# -# Note: Compression schemes like "gzip", "bzip", and "compress" are not -# actually "mime-types". They are "encodings" and hence must _not_ have -# entries in this file to map their extensions. The "mime-type" of an -# encoded file refers to the type of data that has been encoded, not the -# type of the encoding. -# -############################################################################### - - -application/activemessage -application/andrew-inset -application/applefile -application/atomicmail -application/cu-seeme csm cu -application/dca-rft -application/dec-dx -application/dsptype tsp -application/futuresplash spl -application/ghostview -application/mac-binhex40 hqx -application/macwriteii -application/msaccess mdb -application/msword doc dot -application/news-message-id -application/news-transmission -application/octet-stream bin -application/oda oda -application/pdf pdf -application/pgp-signature pgp -application/postscript ps ai eps -application/remote-printing -application/rtf rtf -application/slate -application/vnd.ms-excel xls xlb -application/vnd.ms-powerpoint ppt pps pot -application/vnd.wap.wmlc wmlc -application/vnd.wap.wmlscriptc wmlsc -application/wita -application/wordperfect5.1 wp5 -application/zip zip -application/x-123 wk -application/x-bcpio bcpio -application/x-chess-pgn pgn -application/x-core -application/x-cpio cpio -application/x-csh -application/x-debian-package deb -application/x-director dcr dir dxr -application/x-dms dms -application/x-dvi dvi -application/x-executable -application/x-font pfa pfb gsf pcf pcf.Z -application/x-gnumeric gnumeric -application/x-gtar gtar tgz -application/x-hdf hdf -application/x-httpd-php phtml pht php -application/x-httpd-php3 php3 -application/x-httpd-php3-source phps -application/x-httpd-php3-preprocessed php3p -application/x-httpd-php4 php4 -application/x-ica ica -application/x-java class -application/x-javascript js -application/x-kdelnk -application/x-kchart chrt -application/x-killustrator kil -application/x-kpresenter kpr kpt -application/x-kspread ksp -application/x-kword kwd kwt -application/x-latex latex -application/x-lha lha -application/x-lzh lzh -application/x-lzx lzx -application/x-maker frm maker frame fm fb book fbdoc -application/x-mif mif -application/x-msdos-program com exe bat dll -application/x-msi msi -application/x-netcdf nc cdf -application/x-ns-proxy-autoconfig pac -application/x-object o -application/x-ogg ogg -application/x-oz-application oza -application/x-perl pl pm -application/x-redhat-package-manager rpm -application/x-rx -application/x-sh -application/x-shar shar -application/x-shellscript -application/x-shockwave-flash swf swfl -application/x-stuffit sit -application/x-sv4cpio sv4cpio -application/x-sv4crc sv4crc -application/x-tar tar -application/x-tcl -application/x-tex -application/x-tex-gf gf -application/x-tex-pk pk PK -application/x-texinfo texinfo texi -application/x-trash ~ % bak old sik -application/x-troff t tr roff -application/x-troff-man man -application/x-troff-me me -application/x-troff-ms ms -application/x-ustar ustar -application/x-wais-source src -application/x-wingz wz - -audio/basic au snd -audio/midi mid midi -audio/mpeg mpga mpega mp2 mp3 -audio/mpegurl m3u -audio/prs.sid sid -audio/x-aiff aif aiff aifc -audio/x-gsm gsm -audio/x-pn-realaudio ra rm ram -audio/x-wav wav - -image/bitmap bmp -image/gif gif -image/ief ief -image/jpeg jpeg jpg jpe -image/pcx pcx -image/png png -image/tiff tiff tif -image/vnd.wap.wbmp wbmp -image/x-cmu-raster ras -image/x-coreldraw cdr -image/x-coreldrawpattern pat -image/x-coreldrawtemplate cdt -image/x-corelphotopaint cpt -image/x-jng jng -image/x-portable-anymap pnm -image/x-portable-bitmap pbm -image/x-portable-graymap pgm -image/x-portable-pixmap ppm -image/x-rgb rgb -image/x-xbitmap xbm -image/x-xpixmap xpm -image/x-xwindowdump xwd - -inode/chardevice -inode/blockdevice -inode/directory-locked -inode/directory -inode/fifo -inode/socket - -message/external-body -message/news -message/partial -message/rfc822 - -multipart/alternative -multipart/appledouble -multipart/digest -multipart/mixed -multipart/parallel - -text/comma-separated-values csv -text/css css -text/english -text/html htm html xhtml -text/mathml mml -text/plain txt text diff -text/richtext rtx -text/tab-separated-values tsv -text/vnd.wap.wml wml -text/vnd.wap.wmlscript wmls -text/xml xml -text/x-c++hdr h++ hpp hxx hh -text/x-c++src c++ cpp cxx cc -text/x-chdr h -text/x-crontab -text/x-csh csh -text/x-csrc c -text/x-java java -text/x-makefile -text/x-moc moc -text/x-pascal p pas -text/x-setext etx -text/x-sh sh -text/x-tcl tcl tk -text/x-tex tex ltx sty cls -text/x-vcalendar vcs -text/x-vcard vcf - -video/dl dl -video/fli fli -video/gl gl -video/mpeg mpeg mpg mpe -video/quicktime qt mov -video/x-mng mng -video/x-ms-asf asf asx -video/x-msvideo avi -video/x-sgi-movie movie - -x-world/x-vrml vrm vrml wrl diff --git a/buildroot/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk index a47ad9abe..fe972181d 100644 --- a/buildroot/package/boinc/boinc.mk +++ b/buildroot/package/boinc/boinc.mk @@ -10,6 +10,7 @@ BOINC_SITE = \ $(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION)) BOINC_LICENSE = LGPL-3.0+ BOINC_LICENSE_FILES = COPYING COPYING.LESSER +BOINC_CPE_ID_VENDOR = rom_walton BOINC_DEPENDENCIES = host-pkgconf libcurl openssl BOINC_AUTORECONF = YES BOINC_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config diff --git a/buildroot/package/boost/0002-fenv.patch b/buildroot/package/boost/0001-fenv.patch similarity index 100% rename from buildroot/package/boost/0002-fenv.patch rename to buildroot/package/boost/0001-fenv.patch diff --git a/buildroot/package/boost/0001-fix-uclibc-eventfd.patch b/buildroot/package/boost/0001-fix-uclibc-eventfd.patch deleted file mode 100644 index 1b7eb8723..000000000 --- a/buildroot/package/boost/0001-fix-uclibc-eventfd.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use eventfd() function with uClibc - -The Boost eventfd code either directly makes the eventfd system call -using __NR_eventfd (when __GLIBC_MINOR is less than 8), or otherwise -uses the eventfd() function provided by the C library. - -However, since uClibc pretends to be glibc 2.2, the Boost eventfd code -directly uses the system call. While it works fine on most -architectures, it doesn't on ARC since __NR_eventfd is not defined on -this architecture. However, eventfd() is properly implemented. - -So, this patch adjusts the logic used by Boost to consider uClibc as a -C library providing the eventfd() function. - -Signed-off-by: Thomas Petazzoni - -Index: b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -=================================================================== ---- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp -+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -@@ -23,7 +23,7 @@ - #include - #include - #include --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - # include - #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 - # include -@@ -46,7 +46,7 @@ - - void eventfd_select_interrupter::open_descriptors() - { --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); - if (read_descriptor_ != -1) - { diff --git a/buildroot/package/boost/Config.in b/buildroot/package/boost/Config.in index f9e7b0a89..9248c574f 100644 --- a/buildroot/package/boost/Config.in +++ b/buildroot/package/boost/Config.in @@ -189,6 +189,16 @@ config BR2_PACKAGE_BOOST_IOSTREAMS Boost.IOStreams provides a framework for defining streams, stream buffers and i/o filters. +config BR2_PACKAGE_BOOST_JSON + bool "boost-json" + select BR2_PACKAGE_BOOST_CONTAINER + help + Boost.JSON is a portable C++ library which provides containers + and algorithms that implement JavaScript Object Notation, or + simply "JSON", a lightweight data-interchange format. + + To use the library "header-only" this option is not needed. + config BR2_PACKAGE_BOOST_LOCALE bool "boost-locale" # When boost-locale is enabled with icu support, Boost no @@ -270,6 +280,11 @@ config BR2_PACKAGE_BOOST_MPI Message Passing Interface library, for use in distributed-memory parallel application programming. +config BR2_PACKAGE_BOOST_NOWIDE + bool "boost-nowide" + help + Library for cross-platform, unicode aware programming. + config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS bool "boost-program_options" help diff --git a/buildroot/package/boost/boost.hash b/buildroot/package/boost/boost.hash index d11232f5a..e6d44a76b 100644 --- a/buildroot/package/boost/boost.hash +++ b/buildroot/package/boost/boost.hash @@ -1,5 +1,5 @@ # From https://www.boost.org/users/history/version_1_74_0.html -sha256 83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1 boost_1_74_0.tar.bz2 +sha256 953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost_1_75_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/buildroot/package/boost/boost.mk b/buildroot/package/boost/boost.mk index 82fe42d6b..b8f90bb83 100644 --- a/buildroot/package/boost/boost.mk +++ b/buildroot/package/boost/boost.mk @@ -4,23 +4,21 @@ # ################################################################################ -BOOST_VERSION = 1.74.0 +BOOST_VERSION = 1.75.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt - -# CVE-2009-3654 is misclassified (by our CVE tracker) as affecting to boost, -# while in fact it affects Drupal (a module called boost in there). -BOOST_IGNORE_CVES += CVE-2009-3654 +BOOST_CPE_ID_VENDOR = boost # keep host variant as minimal as possible HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract coroutine date_time exception filesystem graph graph_parallel \ - iostreams locale log math mpi program_options python random regex \ - serialization system test thread timer type_erasure wave) + contract container coroutine date_time exception fiber filesystem graph \ + graph_parallel iostreams json locale log math mpi nowide program_options \ + python random regex serialization stacktrace system test thread timer \ + type_erasure wave) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) @@ -35,10 +33,12 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_JSON),,json) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) +BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_NOWIDE),,nowide) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) diff --git a/buildroot/package/botan/0001-Add--extra-libs-option-and-group-l-flags-from-LDFLAGS-to-the-end.patch b/buildroot/package/botan/0001-Add--extra-libs-option-and-group-l-flags-from-LDFLAGS-to-the-end.patch new file mode 100644 index 000000000..8aa5c6865 --- /dev/null +++ b/buildroot/package/botan/0001-Add--extra-libs-option-and-group-l-flags-from-LDFLAGS-to-the-end.patch @@ -0,0 +1,75 @@ +From af63fe89228172e5a395f7e6491fae3bfa9da4b1 Mon Sep 17 00:00:00 2001 +From: Jack Lloyd +Date: Mon, 15 Feb 2021 15:01:38 -0500 +Subject: [PATCH] Add --extra-libs option and group -l flags from LDFLAGS to + the end + +Ref #2622 + +[Retrieved from: +https://github.com/randombit/botan/commit/af63fe89228172e5a395f7e6491fae3bfa9da4b1] +Signed-off-by: Fabrice Fontaine +--- + configure.py | 14 ++++++++++++++ + src/build-data/makefile.in | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 73fc0271e9..865a6c8e62 100755 +--- a/configure.py ++++ b/configure.py +@@ -333,6 +333,9 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state + target_group.add_option('--ldflags', metavar='FLAGS', + help='set linker flags', default=None) + ++ target_group.add_option('--extra-libs', metavar='LIBS', ++ help='specify extra libraries to link against', default='') ++ + target_group.add_option('--ar-command', dest='ar_command', metavar='AR', default=None, + help='set path to static archive creator') + +@@ -2020,6 +2023,12 @@ def choose_cxx_exe(): + else: + return '%s %s' % (options.compiler_cache, cxx) + ++ def extra_libs(libs, cc): ++ if libs is None: ++ return '' ++ ++ return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',')]) ++ + variables = { + 'version_major': Version.major(), + 'version_minor': Version.minor(), +@@ -2149,6 +2158,7 @@ def choose_cxx_exe(): + 'cc_sysroot': sysroot_option(), + 'cc_compile_flags': options.cxxflags or cc.cc_compile_flags(options), + 'ldflags': options.ldflags or '', ++ 'extra_libs': extra_libs(options.extra_libs, cc), + 'cc_warning_flags': cc.cc_warning_flags(options), + 'output_to_exe': cc.output_to_exe, + 'cc_macro': cc.macro_name, +@@ -3029,6 +3039,10 @@ def canonicalize_build_targets(options): + if options.build_fuzzers == 'libfuzzer' and options.fuzzer_lib is None: + options.fuzzer_lib = 'Fuzzer' + ++ if options.ldflags is not None: ++ libs = [m.group(1) for m in re.finditer(r'-l([a-z0-9]+)', options.ldflags)] ++ options.extra_libs += ','.join(libs) ++ + # Checks user options for consistency + # This method DOES NOT change options on behalf of the user but explains + # why the given configuration does not work. +diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in +index 4692d00f71..82f6576650 100644 +--- a/src/build-data/makefile.in ++++ b/src/build-data/makefile.in +@@ -20,7 +20,7 @@ LDFLAGS = %{ldflags} + EXE_LINK_CMD = %{exe_link_cmd} + + LIB_LINKS_TO = %{external_link_cmd} %{link_to} +-EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) ++EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{extra_libs} + + BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) + diff --git a/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch b/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch deleted file mode 100644 index fd6a2ffdd..000000000 --- a/buildroot/package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a93bc8503649028852402c61bdda531af2872d0e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 09:15:06 +0200 -Subject: [PATCH] src/build-data/arch/arm64.txt: add aarch64_be - -Allow the user to set cpu value to aarch64_be. -Endianness will be correctly guessed by choose_endian function because -this alias ends with "be" - -Fixes: - - http://autobuild.buildroot.org/results/69ebf03c59b2af4140a39bc26f17d0396b6ec15d - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/randombit/botan/commit/a93bc8503649028852402c61bdda531af2872d0e] ---- - src/build-data/arch/arm64.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/build-data/arch/arm64.txt b/src/build-data/arch/arm64.txt -index 056c5318ff..5205295125 100644 ---- a/src/build-data/arch/arm64.txt -+++ b/src/build-data/arch/arm64.txt -@@ -5,6 +5,7 @@ family arm - - - aarch64 -+aarch64_be - armv8 - armv8-a - diff --git a/buildroot/package/botan/0002-Avoid-empty-l.patch b/buildroot/package/botan/0002-Avoid-empty-l.patch new file mode 100644 index 000000000..910236024 --- /dev/null +++ b/buildroot/package/botan/0002-Avoid-empty-l.patch @@ -0,0 +1,25 @@ +From 4b2225ea54988e09b649768848b3c14b43e064de Mon Sep 17 00:00:00 2001 +From: Jack Lloyd +Date: Mon, 15 Feb 2021 15:11:12 -0500 +Subject: [PATCH] Avoid empty -l + +[Retrieved from: +https://github.com/randombit/botan/commit/4b2225ea54988e09b649768848b3c14b43e064de] +Signed-off-by: Fabrice Fontaine +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 865a6c8e62..a79f672eca 100755 +--- a/configure.py ++++ b/configure.py +@@ -2027,7 +2027,7 @@ def extra_libs(libs, cc): + if libs is None: + return '' + +- return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',')]) ++ return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',') if lib != '']) + + variables = { + 'version_major': Version.major(), diff --git a/buildroot/package/botan/botan.hash b/buildroot/package/botan/botan.hash index 003dd13e9..d1b1d14ac 100644 --- a/buildroot/package/botan/botan.hash +++ b/buildroot/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628 Botan-2.16.0.tar.xz +sha256 79123b654445a4abba486e09a431788545c708237382a3e765664c9f55b03b88 Botan-2.17.3.tar.xz # Locally computed sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index d36324c7f..c3af4a45d 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -4,11 +4,12 @@ # ################################################################################ -BOTAN_VERSION = 2.16.0 +BOTAN_VERSION = 2.17.3 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt +BOTAN_CPE_ID_VALID = YES BOTAN_INSTALL_STAGING = YES @@ -17,14 +18,11 @@ BOTAN_CONF_OPTS = \ --os=linux \ --cc=gcc \ --cc-bin="$(TARGET_CXX)" \ - --ldflags="$(BOTAN_LDFLAGS)" \ --prefix=/usr \ --without-documentation -BOTAN_LDFLAGS = $(TARGET_LDFLAGS) - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -BOTAN_LDFLAGS += -latomic +BOTAN_CONF_OPTS += --extra-libs=atomic endif ifeq ($(BR2_SHARED_LIBS),y) diff --git a/buildroot/package/brickd/brickd.hash b/buildroot/package/brickd/brickd.hash index 8de57a9b8..e9be1b10b 100644 --- a/buildroot/package/brickd/brickd.hash +++ b/buildroot/package/brickd/brickd.hash @@ -1,5 +1,5 @@ # Locally computed hash -sha256 0b79f1ccd6fa644d7ecb2e17b19f9ffbf6374702ae9ac536b2c4a0b8b2cfe160 brickd-ev3dev-stretch_1.2.1.tar.gz +sha256 205f581103512599cb10992275da8c7207ed732e1a686600877c51b7a742de73 brickd-ev3dev-stretch_1.2.1-br1.tar.gz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/buildroot/package/bridge-utils/bridge-utils.mk b/buildroot/package/bridge-utils/bridge-utils.mk index 9d63b3ef3..fa71c3a64 100644 --- a/buildroot/package/bridge-utils/bridge-utils.mk +++ b/buildroot/package/bridge-utils/bridge-utils.mk @@ -10,6 +10,7 @@ BRIDGE_UTILS_SITE = \ BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_LICENSE = GPL-2.0+ BRIDGE_UTILS_LICENSE_FILES = COPYING +BRIDGE_UTILS_CPE_ID_VENDOR = kernel # Avoid using the host's headers. Location is not important as # required headers will anyway be found from within the sysroot. diff --git a/buildroot/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch b/buildroot/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch new file mode 100644 index 000000000..92b5aea21 --- /dev/null +++ b/buildroot/package/brltty/0002-Programs-pgmprivs_linux.c-fix-build-with-gcc-5.patch @@ -0,0 +1,55 @@ +From 92b3fca2d55757680398b55869214fc2d19e9b71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Feb 2021 20:47:06 +0100 +Subject: [PATCH] Programs/pgmprivs_linux.c: fix build with gcc < 5 + +Build with gcc < 5 is broken since version 6.2 and +https://github.com/brltty/brltty/commit/8ce262f2c15f10a40d9cbae0b3c88b466970a055: + +./pgmprivs_linux.c: In function 'getPrivilegeParameterNames': +./pgmprivs_linux.c:2220:3: error: array initialized from non-constant array expression + static const char *const names[] = NULL_TERMINATED_STRING_ARRAY( + ^ + +Build was partially fixed since +https://github.com/brltty/brltty/commit/8ae78dd560d00c5074158f90be5ac8dac80183db +but it forgot to update pgmprivs_linux.c + +Fixes: + - http://autobuild.buildroot.org/results/58afeb50a0ecdb8b527d7c9946bcae290b79b055 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: use an actual backport after upstream merge] +Signed-off-by: Yann E. MORIN +--- + Programs/pgmprivs_linux.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Programs/pgmprivs_linux.c b/Programs/pgmprivs_linux.c +index 56e464a82..7dfabaf9b 100644 +--- a/Programs/pgmprivs_linux.c ++++ b/Programs/pgmprivs_linux.c +@@ -2215,13 +2215,15 @@ typedef enum { + PARM_USER, + } Parameters; + ++ ++static const char *const *const pgmprivs_names = ++ NULL_TERMINATED_STRING_ARRAY( ++ "path", "scfmode", "shell", "user" ++ ); ++ + const char *const * + getPrivilegeParameterNames (void) { +- static const char *const names[] = NULL_TERMINATED_STRING_ARRAY( +- "path", "scfmode", "shell", "user" +- ); +- +- return names; ++ return pgmprivs_names; + } + + const char * +-- +2.25.1 + diff --git a/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch b/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch deleted file mode 100644 index 249d420ca..000000000 --- a/buildroot/package/brltty/0002-fix-input_event-time-related-compile-fail.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 43390f9906a8c663872e0eab56c1173032d1bd6c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Sun, 7 Jun 2020 12:58:38 +0200 -Subject: [PATCH] fix input_event time related compile fail - -./system_linux.c: In function 'writeInputEvent': -./system_linux.c:962:23: error: 'struct input_event' has no member named 'time'; did you mean 'type'? - gettimeofday(&event.time, NULL); - ^~~~ - type - -Signed-off-by: Heiko Thiery ---- - Programs/system_linux.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Programs/system_linux.c b/Programs/system_linux.c -index a97ee7ff6..77052d32f 100644 ---- a/Programs/system_linux.c -+++ b/Programs/system_linux.c -@@ -40,6 +40,14 @@ - #ifdef HAVE_LINUX_INPUT_H - #include - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#endif -+ -+#ifndef input_event_usec -+#define input_event_usec time.tv_usec -+#endif -+ - #include "kbd_keycodes.h" - - LINUX_KEY_MAP(xt00) = { -@@ -957,9 +965,12 @@ int - writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) { - #ifdef HAVE_LINUX_UINPUT_H - struct input_event event; -+ struct timeval tv; - - memset(&event, 0, sizeof(event)); -- gettimeofday(&event.time, NULL); -+ gettimeofday(&tv, NULL); -+ event.input_event_sec = tv.tv_sec; -+ event.input_event_usec = tv.tv_usec; - event.type = type; - event.code = code; - event.value = value; --- -2.20.1 - diff --git a/buildroot/package/brltty/brltty.hash b/buildroot/package/brltty/brltty.hash index d4f87c42f..504b0d802 100644 --- a/buildroot/package/brltty/brltty.hash +++ b/buildroot/package/brltty/brltty.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 4a28e3f1879aee9082f9ce4100fd4053be47add7f8ab0f2af6d6a20590934b62 brltty-6.1.tar.xz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 9ac2af461c3f5c1640601d607a299c7cb9fe3d2f9974bf671af46601e4f9198f README +sha256 b256df8f86b4d6a597cfe982cc5a7c831915de37cfece683ddb02b2329256a8a brltty-6.3.tar.xz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL +sha256 da78e60359a86eeefb6d6e02bc47d386ece10ae45309d998981157c3746724ab README diff --git a/buildroot/package/brltty/brltty.mk b/buildroot/package/brltty/brltty.mk index 3924fa0c1..602750c9b 100644 --- a/buildroot/package/brltty/brltty.mk +++ b/buildroot/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.1 +BRLTTY_VERSION = 6.3 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install diff --git a/buildroot/package/brotli/brotli.mk b/buildroot/package/brotli/brotli.mk index 5209d3186..43c8524c0 100644 --- a/buildroot/package/brotli/brotli.mk +++ b/buildroot/package/brotli/brotli.mk @@ -9,6 +9,7 @@ BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz BROTLI_SITE = https://github.com/google/brotli/archive BROTLI_LICENSE = MIT BROTLI_LICENSE_FILES = LICENSE +BROTLI_CPE_ID_VENDOR = google BROTLI_INSTALL_STAGING = YES BROTLI_CONF_OPTS = \ -DBROTLI_DISABLE_TESTS=ON \ diff --git a/buildroot/package/bsdiff/bsdiff.mk b/buildroot/package/bsdiff/bsdiff.mk index 9030284a0..97a1b3921 100644 --- a/buildroot/package/bsdiff/bsdiff.mk +++ b/buildroot/package/bsdiff/bsdiff.mk @@ -9,6 +9,7 @@ BSDIFF_SITE = http://www.daemonology.net/bsdiff BSDIFF_DEPENDENCIES = bzip2 BSDIFF_LICENSE = BSD-2-Clause BSDIFF_LICENSE_FILES = bsdiff.c +BSDIFF_CPE_ID_VENDOR = daemonology define BSDIFF_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ diff --git a/buildroot/package/bustle/bustle.hash b/buildroot/package/bustle/bustle.hash index 05281c4f1..0bb899f1c 100644 --- a/buildroot/package/bustle/bustle.hash +++ b/buildroot/package/bustle/bustle.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7760a695b25cb264e7342f353dcdc6d2b7faeacdcd85dd14e03c61b18e791664 bustle-0.7.5.tar.gz -sha256 a6d6109e5b086de8e852e451b91b08b323302f55b6975d506c64c43bb094be38 LICENSE +sha256 2fb3e9d9a97db3cd9a3ce763e86947b642bd7733b46206177a1677f08726573c bustle-0.8.0.tar.gz +sha256 ad168b537264fba8f94380cb10f60847da7db551fb4281bb6d4f24c74f652a1d LICENSE diff --git a/buildroot/package/bustle/bustle.mk b/buildroot/package/bustle/bustle.mk index 1dbad64ae..c6c3a72a9 100644 --- a/buildroot/package/bustle/bustle.mk +++ b/buildroot/package/bustle/bustle.mk @@ -4,20 +4,16 @@ # ################################################################################ -BUSTLE_VERSION = 0.7.5 -BUSTLE_SITE = https://www.freedesktop.org/software/bustle/$(BUSTLE_VERSION) -BUSTLE_LICENSE = LGPL-2.1+, GPL-3.0 (binaries) +BUSTLE_VERSION = 0.8.0 +BUSTLE_SITE = https://hackage.haskell.org/package/bustle-$(BUSTLE_VERSION) +BUSTLE_LICENSE = LGPL-2.1+ BUSTLE_LICENSE_FILES = LICENSE BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf - -BUSTLE_PCAP_FLAGS = "-lpcap" -ifeq ($(BR2_STATIC_LIBS),y) -BUSTLE_PCAP_FLAGS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -endif +BUSTLE_MAKE_OPTS = PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config define BUSTLE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PCAP_FLAGS="$(BUSTLE_PCAP_FLAGS)" -C $(@D) dist/build/bustle-pcap + $(BUSTLE_MAKE_OPTS) -C $(@D) dist/build/bustle-pcap endef define BUSTLE_INSTALL_TARGET_CMDS diff --git a/buildroot/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch b/buildroot/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch deleted file mode 100644 index cab346acf..000000000 --- a/buildroot/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b Mon Sep 17 00:00:00 2001 -From: Eddie James -Date: Mon, 10 Aug 2020 09:59:02 -0500 -Subject: [PATCH] hwclock: Fix settimeofday for glibc v2.31+ - -The glibc implementation changed for settimeofday, resulting in "invalid -argument" error when attempting to set both timezone and time with a single -call. Fix this by calling settimeofday twice - -Signed-off-by: Eddie James -Signed-off-by: Denys Vlasenko ---- - util-linux/hwclock.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c -index dc97d8fb4..2479e7416 100644 ---- a/util-linux/hwclock.c -+++ b/util-linux/hwclock.c -@@ -122,16 +122,20 @@ static void to_sys_clock(const char **pp_rtcname, int utc) - struct timeval tv; - struct timezone tz; - -- tz.tz_minuteswest = timezone/60; -+ tz.tz_minuteswest = timezone / 60; - /* ^^^ used to also subtract 60*daylight, but it's wrong: - * daylight!=0 means "this timezone has some DST - * during the year", not "DST is in effect now". - */ - tz.tz_dsttime = 0; - -+ /* glibc v2.31+ returns an error if both args are non-NULL */ -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday"); -+ - tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); - tv.tv_usec = 0; -- if (settimeofday(&tv, &tz)) -+ if (settimeofday(&tv, NULL)) - bb_simple_perror_msg_and_die("settimeofday"); - } - -@@ -283,7 +287,11 @@ static void set_system_clock_timezone(int utc) - gettimeofday(&tv, NULL); - if (!utc) - tv.tv_sec += tz.tz_minuteswest * 60; -- if (settimeofday(&tv, &tz)) -+ -+ /* glibc v2.31+ returns an error if both args are non-NULL */ -+ if (settimeofday(NULL, &tz)) -+ bb_simple_perror_msg_and_die("settimeofday"); -+ if (settimeofday(&tv, NULL)) - bb_simple_perror_msg_and_die("settimeofday"); - } - --- -2.17.1 - diff --git a/buildroot/package/busybox/0003-update_passwd-fix-context-variable.patch b/buildroot/package/busybox/0003-update_passwd-fix-context-variable.patch new file mode 100644 index 000000000..25c07d705 --- /dev/null +++ b/buildroot/package/busybox/0003-update_passwd-fix-context-variable.patch @@ -0,0 +1,41 @@ +From b4828612abe378491693c9036db19e4f64768307 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 10 Jan 2021 13:15:04 +0100 +Subject: [PATCH] update_passwd: fix context variable + +Commit +https://git.busybox.net/busybox/commit/libbb/update_passwd.c?id=2496616b0a8d1c80cd1416b73a4847b59b9f969a + +changed the variable used from context to seuser but forgot this +change resulting in build errors detected by buildroot autobuilders: + +http://autobuild.buildroot.net/results/b89/b89b7d0f0601bb706e76cea31cf4e43326e5540c//build-end.log + +libbb/update_passwd.c:51:11: error: 'context' undeclared (first use in + this function); did you mean 'ucontext'? + freecon(context); + +Patch sent upstream: +http://lists.busybox.net/pipermail/busybox/2021-January/088467.html + +Signed-off-by: Bernd Kuhls +--- + libbb/update_passwd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c +index 7b67f30cd..a228075cc 100644 +--- a/libbb/update_passwd.c ++++ b/libbb/update_passwd.c +@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username) + bb_simple_error_msg_and_die("SELinux: access denied"); + } + if (ENABLE_FEATURE_CLEAN_UP) +- freecon(context); ++ freecon(seuser); + } + #else + # define check_selinux_update_passwd(username) ((void)0) +-- +2.29.2 + diff --git a/buildroot/package/busybox/busybox.hash b/buildroot/package/busybox/busybox.hash index 222937960..dffab2140 100644 --- a/buildroot/package/busybox/busybox.hash +++ b/buildroot/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.32.0.tar.bz2.sha256 -sha256 c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.33.0.tar.bz2.sha256 +sha256 d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd busybox-1.33.0.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/buildroot/package/busybox/busybox.mk b/buildroot/package/busybox/busybox.mk index 8c8303a35..032e48726 100644 --- a/buildroot/package/busybox/busybox.mk +++ b/buildroot/package/busybox/busybox.mk @@ -4,11 +4,12 @@ # ################################################################################ -BUSYBOX_VERSION = 1.32.0 -BUSYBOX_SITE = http://www.busybox.net/downloads +BUSYBOX_VERSION = 1.33.0 +BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE +BUSYBOX_CPE_ID_VENDOR = busybox define BUSYBOX_HELP_CMDS @echo ' busybox-menuconfig - Run BusyBox menuconfig' diff --git a/buildroot/package/busybox/udhcpc.script b/buildroot/package/busybox/udhcpc.script index ec4d9f618..c73ad6c2e 100755 --- a/buildroot/package/busybox/udhcpc.script +++ b/buildroot/package/busybox/udhcpc.script @@ -18,7 +18,7 @@ fi wait_for_ipv6_default_route() { printf "Waiting for IPv6 default route to appear" while [ $IF_WAIT_DELAY -gt 0 ]; do - if [ -z "$(ip -6 route list | grep default)" ]; then + if ip -6 route list | grep -q default; then printf "\n" return fi diff --git a/buildroot/package/bzip2/bzip2.mk b/buildroot/package/bzip2/bzip2.mk index b4d8eea25..c2e5f7610 100644 --- a/buildroot/package/bzip2/bzip2.mk +++ b/buildroot/package/bzip2/bzip2.mk @@ -9,6 +9,7 @@ BZIP2_SITE = https://sourceware.org/pub/bzip2 BZIP2_INSTALL_STAGING = YES BZIP2_LICENSE = bzip2 license BZIP2_LICENSE_FILES = LICENSE +BZIP2_CPE_ID_VENDOR = bzip ifeq ($(BR2_STATIC_LIBS),) define BZIP2_BUILD_SHARED_CMDS diff --git a/buildroot/package/c-ares/0001-src-lib-Makefile.am-install-ares_dns.h.patch b/buildroot/package/c-ares/0001-src-lib-Makefile.am-install-ares_dns.h.patch deleted file mode 100644 index 02422dde3..000000000 --- a/buildroot/package/c-ares/0001-src-lib-Makefile.am-install-ares_dns.h.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2180d95fb67f57b6ffba01fefb4844a1ca4f792 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 18 Nov 2020 08:12:45 +0100 -Subject: [PATCH] src/lib/Makefile.am: install ares_dns.h - -This will avoid the following build failure with resiprocate: - -In file included from dns/DnsCnameRecord.cxx:7: -dns/AresCompat.hxx:5:10: fatal error: ares_dns.h: No such file or directory - #include "ares_dns.h" - ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/cbf158f0c037d44ef293a8804d18c84e3b731059 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/c-ares/c-ares/pull/376] ---- - src/lib/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index c918667..92a4152 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -14,6 +14,8 @@ lib_LTLIBRARIES = libcares.la - - man_MANS = $(MANPAGES) - -+include_HEADERS = ares_dns.h -+ - # adig and ahost are just sample programs and thus not mentioned with the - # regular sources and headers - EXTRA_DIST = Makefile.inc config-win32.h CMakeLists.txt \ --- -2.29.2 - diff --git a/buildroot/package/c-ares/c-ares.hash b/buildroot/package/c-ares/c-ares.hash index a24f3d72e..235b7dbc6 100644 --- a/buildroot/package/c-ares/c-ares.hash +++ b/buildroot/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1cecd5dbe21306c7263f8649aa6e9a37aecb985995a3489f487d98df2b40757d c-ares-1.17.0.tar.gz +sha256 d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 c-ares-1.17.1.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/buildroot/package/c-ares/c-ares.mk b/buildroot/package/c-ares/c-ares.mk index ca1baf8af..8f200237c 100644 --- a/buildroot/package/c-ares/c-ares.mk +++ b/buildroot/package/c-ares/c-ares.mk @@ -4,14 +4,12 @@ # ################################################################################ -C_ARES_VERSION = 1.17.0 +C_ARES_VERSION = 1.17.1 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -# We're patching src/lib/Makefile.am -C_ARES_AUTORECONF = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/c-capnproto/c-capnproto.hash b/buildroot/package/c-capnproto/c-capnproto.hash index 75edaebf9..e215400ce 100644 --- a/buildroot/package/c-capnproto/c-capnproto.hash +++ b/buildroot/package/c-capnproto/c-capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 88c454f4f4bad87c9b60cd739c7da5605c1085c0e92b317dd72d547bbb804279 c-capnproto-9053ebe6eeb2ae762655b982e27c341cb568366d.tar.gz +sha256 1e35ef786bd8e418ff04fccb20ac881a87fa2fa76df1cbddc4774e35423bafb8 c-capnproto-9053ebe6eeb2ae762655b982e27c341cb568366d-br1.tar.gz sha256 27797e6c7dce96675d79ed250584d157b7a86405db6eb6fba9644e6d96d42c57 COPYING diff --git a/buildroot/package/c-icap/c-icap.hash b/buildroot/package/c-icap/c-icap.hash index 8c70d7558..6aa81c264 100644 --- a/buildroot/package/c-icap/c-icap.hash +++ b/buildroot/package/c-icap/c-icap.hash @@ -1,6 +1,6 @@ # Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ -md5 d59e767ee3733cd81cea02819f13ac72 c_icap-0.5.6.tar.gz -sha1 361e36b63f895bd72bdd18aac5fe4192d4eff530 c_icap-0.5.6.tar.gz +md5 82fd2fba1a08a8a0cf3567fe24aa035d c_icap-0.5.7.tar.gz +sha1 3b2470e00abd1418bec3a440d3073d7a6231c4c1 c_icap-0.5.7.tar.gz # Locally calculated -sha256 9826c50fc34f8fd4a3115844b27c9816dd3fcc3e7e2a3b6bcc7094ec307802b7 c_icap-0.5.6.tar.gz +sha256 01ef17d7999d3476fe705abc56d0da562c2f180aafe08fc1269f419cad8521a9 c_icap-0.5.7.tar.gz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/buildroot/package/c-icap/c-icap.mk b/buildroot/package/c-icap/c-icap.mk index 1a68674a6..5548fb4b9 100644 --- a/buildroot/package/c-icap/c-icap.mk +++ b/buildroot/package/c-icap/c-icap.mk @@ -4,11 +4,12 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.6 +C_ICAP_VERSION = 0.5.7 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING +C_ICAP_CPE_ID_VALID = YES C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ diff --git a/buildroot/package/c-periphery/c-periphery.hash b/buildroot/package/c-periphery/c-periphery.hash index daebb0435..516cfb33e 100644 --- a/buildroot/package/c-periphery/c-periphery.hash +++ b/buildroot/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d31fb19c2645b9658ad5ca9313c7f0488c16a52e5adf8b2845e1955ad94546ae c-periphery-2.2.4.tar.gz +sha256 ba298aac5c1f6ebe2b89ed623a2f678bedfa3b9dc78aaf4f0534a1dd304629da c-periphery-2.3.1.tar.gz sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE diff --git a/buildroot/package/c-periphery/c-periphery.mk b/buildroot/package/c-periphery/c-periphery.mk index ce0e03f1e..dcc82f19c 100644 --- a/buildroot/package/c-periphery/c-periphery.mk +++ b/buildroot/package/c-periphery/c-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.2.4 +C_PERIPHERY_VERSION = 2.3.1 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT diff --git a/buildroot/package/cairo/cairo.mk b/buildroot/package/cairo/cairo.mk index 3d2fdbd5d..98f270442 100644 --- a/buildroot/package/cairo/cairo.mk +++ b/buildroot/package/cairo/cairo.mk @@ -8,6 +8,7 @@ CAIRO_VERSION = 1.16.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 +CAIRO_CPE_ID_VENDOR = cairographics CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES diff --git a/buildroot/package/can-utils/Config.in b/buildroot/package/can-utils/Config.in index da5637886..bdc84b461 100644 --- a/buildroot/package/can-utils/Config.in +++ b/buildroot/package/can-utils/Config.in @@ -1,14 +1,9 @@ config BR2_PACKAGE_CAN_UTILS bool "can-utils" depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL # error() help SocketCAN is a set of open source CAN drivers and a networking stack. This package provides various tools for this stack. https://github.com/linux-can/can-utils - -comment "can-utils needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU diff --git a/buildroot/package/can-utils/can-utils.hash b/buildroot/package/can-utils/can-utils.hash index f76576773..d7d462450 100644 --- a/buildroot/package/can-utils/can-utils.hash +++ b/buildroot/package/can-utils/can-utils.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a766aad89955b9cfcca27f61ef988fa169565c3657d2789808c0f33a7afa23c8 can-utils-2020.02.04.tar.gz +sha256 b8e53081c076fca248c39ae9ae5791359a81f1eb3e5fe23ff6fb0d0e1f1033fa can-utils-2020.11.0.tar.gz sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/buildroot/package/can-utils/can-utils.mk b/buildroot/package/can-utils/can-utils.mk index 5227bf485..2cd7777d8 100644 --- a/buildroot/package/can-utils/can-utils.mk +++ b/buildroot/package/can-utils/can-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAN_UTILS_VERSION = 2020.02.04 +CAN_UTILS_VERSION = 2020.11.0 CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt diff --git a/buildroot/package/capnproto/capnproto.mk b/buildroot/package/capnproto/capnproto.mk index 2e7b095cb..901b57ecd 100644 --- a/buildroot/package/capnproto/capnproto.mk +++ b/buildroot/package/capnproto/capnproto.mk @@ -8,6 +8,7 @@ CAPNPROTO_VERSION = 0.8.0 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE +CAPNPROTO_CPE_ID_VENDOR = capnproto CAPNPROTO_INSTALL_STAGING = YES # Fetched from Github with no configure script CAPNPROTO_AUTORECONF = YES diff --git a/buildroot/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch b/buildroot/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch new file mode 100644 index 000000000..a528b1244 --- /dev/null +++ b/buildroot/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch @@ -0,0 +1,35 @@ +From 06b667de02df34e3efa1864b4031853bd4ee010d Mon Sep 17 00:00:00 2001 +From: Yair Ben-Avraham +Date: Sun, 10 Jan 2021 06:34:58 +0100 +Subject: [PATCH] castore: fix build without lzma or xz + +castore.c unconditioanlly includes lzma.h, but lzma support if optional. +Furthermore, castore.c does not need anything from lzma.h. + +Drop the include altogether. + +Signed-off-by: Yair Ben-Avraham +[yann.morin.1998@free.fr: + - lzma.h is not needed at all + - rewrite commit log accordingly +] +Signed-off-by: Yann E. MORIN +--- + src/castore.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/castore.c b/src/castore.c +index c290dfd..b2e5320 100644 +--- a/src/castore.c ++++ b/src/castore.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + +-- +2.25.1 + diff --git a/buildroot/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch b/buildroot/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch new file mode 100644 index 000000000..838b06557 --- /dev/null +++ b/buildroot/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch @@ -0,0 +1,53 @@ +From e3f683dc3013d14bddb9f9ec5bdc31367dc51a1c Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 10 Jan 2021 10:44:39 +0100 +Subject: [PATCH] build: don't install udev rules without udev support + +Signed-off-by: Yann E. MORIN +--- + meson.build | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index aac7727..92be1ea 100644 +--- a/meson.build ++++ b/meson.build +@@ -151,6 +151,11 @@ conf.set10('HAVE_SELINUX', get_option('selinux')) + + if get_option('udev') + libudev = dependency('libudev') ++ udevrulesdir = get_option('udevrulesdir') ++ if udevrulesdir == '' ++ udev = dependency('udev', required : false) ++ udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') ++ endif + else + libudev = [] + endif +@@ -175,12 +180,6 @@ subdir('test') + + includes = include_directories('src') + +-udevrulesdir = get_option('udevrulesdir') +-if udevrulesdir == '' +- udev = dependency('udev', required : false) +- udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') +-endif +- + subdir('shell-completion/bash') + subdir('doc') + +@@ -318,7 +317,9 @@ udev_rule = configure_file( + input : 'src/75-casync.rules.in', + configuration : substs) + +-install_data(udev_rule, install_dir : udevrulesdir) ++if get_option('udev') ++ install_data(udev_rule, install_dir : udevrulesdir) ++endif + + ############################################################ + +-- +2.25.1 + diff --git a/buildroot/package/casync/Config.in b/buildroot/package/casync/Config.in new file mode 100644 index 000000000..89a9520e3 --- /dev/null +++ b/buildroot/package/casync/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CASYNC + bool "casync" + depends on BR2_TOOLCHAIN_USES_GLIBC # scandirat() is not implemented by musl and uclibc-ng + select BR2_PACKAGE_ACL + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL + help + Content-Addressable Data Synchronization Tool + + https://github.com/systemd/casync + +comment "casync needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/casync/casync.hash b/buildroot/package/casync/casync.hash new file mode 100644 index 000000000..dbb85520d --- /dev/null +++ b/buildroot/package/casync/casync.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 d07f43e70e3c466152033da4c55c065f815d3025234a046c2bce1cfe4ac7d273 casync-4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/buildroot/package/casync/casync.mk b/buildroot/package/casync/casync.mk new file mode 100644 index 000000000..d74cb1bfe --- /dev/null +++ b/buildroot/package/casync/casync.mk @@ -0,0 +1,64 @@ +################################################################################ +# +# casync +# +################################################################################ + +CASYNC_VERSION = 4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc +CASYNC_SITE = $(call github,systemd,casync,$(CASYNC_VERSION)) +CASYNC_LICENSE = LGPL-2.1+ +CASYNC_LICENSE_FILES = LICENSE.LGPL2.1 +CASYNC_DEPENDENCIES = acl libcurl openssl + +CASYNC_CONF_OPTS = -Dman=false -Doss-fuzz=false -Dllvm-fuzz=false + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +CASYNC_DEPENDENCIES += bash-completion +# The default path is correct, leave it as-is +else +CASYNC_CONF_OPTS += -Dbashcompletiondir=no +endif + +ifeq ($(BR2_PACKAGE_LIBFUSE),y) +CASYNC_DEPENDENCIES += libfuse +CASYNC_CONF_OPTS += -Dfuse=true +else +CASYNC_CONF_OPTS += -Dfuse=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +CASYNC_DEPENDENCIES += libselinux +CASYNC_CONF_OPTS += -Dselinux=true +else +CASYNC_CONF_OPTS += -Dselinux=false +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +CASYNC_DEPENDENCIES += udev +CASYNC_CONF_OPTS += -Dudev=true +else +CASYNC_CONF_OPTS += -Dudev=false +endif + +ifeq ($(BR2_PACKAGE_LIBZSTD),y) +CASYNC_DEPENDENCIES += libzstd +CASYNC_CONF_OPTS += -Dlibzstd=enabled +else +CASYNC_CONF_OPTS += -Dlibzstd=disabled +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +CASYNC_DEPENDENCIES += xz +CASYNC_CONF_OPTS += -Dliblzma=enabled +else +CASYNC_CONF_OPTS += -Dliblzma=disabled +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +CASYNC_DEPENDENCIES += zlib +CASYNC_CONF_OPTS += -Dlibz=enabled +else +CASYNC_CONF_OPTS += -Dlibz=disabled +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/cc-tool/Config.in b/buildroot/package/cc-tool/Config.in index 033128843..2661592d7 100644 --- a/buildroot/package/cc-tool/Config.in +++ b/buildroot/package/cc-tool/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_CC_TOOL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR # boost-filesystem + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS @@ -16,5 +17,7 @@ config BR2_PACKAGE_CC_TOOL https://github.com/dashesy/cc-tool/ -comment "cc-tool needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "cc-tool needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 " + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/ccid/Config.in b/buildroot/package/ccid/Config.in index 599bcc042..aae5a7181 100644 --- a/buildroot/package/ccid/Config.in +++ b/buildroot/package/ccid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CCID bool "ccid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_PCSC_LITE @@ -10,6 +11,7 @@ config BR2_PACKAGE_CCID https://ccid.apdu.fr/ -comment "ccid needs a toolchain w/ threads, dynamic library" +comment "ccid needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/ccid/ccid.hash b/buildroot/package/ccid/ccid.hash index f129d2ae9..4ef7aff3d 100644 --- a/buildroot/package/ccid/ccid.hash +++ b/buildroot/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424 ccid-1.4.33.tar.bz2 +sha256 e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a ccid-1.4.34.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/ccid/ccid.mk b/buildroot/package/ccid/ccid.mk index 570c3907e..3cb599d56 100644 --- a/buildroot/package/ccid/ccid.mk +++ b/buildroot/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.33 +CCID_VERSION = 1.4.34 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/cegui/cegui.mk b/buildroot/package/cegui/cegui.mk index 23919e015..d578c9913 100644 --- a/buildroot/package/cegui/cegui.mk +++ b/buildroot/package/cegui/cegui.mk @@ -9,7 +9,8 @@ CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION)) CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ +CEGUI_CONF_OPTS = \ + -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ -DCEGUI_BUILD_RENDERER_OGRE=OFF CEGUI_DEPENDENCIES = glm \ diff --git a/buildroot/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch b/buildroot/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch new file mode 100644 index 000000000..3458ec1b5 --- /dev/null +++ b/buildroot/package/cereal/0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch @@ -0,0 +1,67 @@ +From f27c12d491955c94583512603bf32c4568f20929 Mon Sep 17 00:00:00 2001 +From: Michael Walz +Date: Tue, 2 Feb 2021 00:50:29 +0100 +Subject: [PATCH] Store a copy of each serialized shared_ptr within the archive + to prevent the shared_ptr to be freed to early. (#667) + +The archives use the memory address pointed by the shared_ptr as a +unique id which must not be reused during lifetime of the archive. +Therefore, the archives stores a copy of it. +This problem was also reported as CVE-2020-11105. + +[Retrieved from: +https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929] +Signed-off-by: Fabrice Fontaine +--- + include/cereal/cereal.hpp | 13 +++++++++++-- + include/cereal/types/memory.hpp | 2 +- + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp +index 99bed9d6..f0d15e8b 100644 +--- a/include/cereal/cereal.hpp ++++ b/include/cereal/cereal.hpp +@@ -369,12 +369,17 @@ namespace cereal + point to the same data. + + @internal +- @param addr The address (see shared_ptr get()) pointed to by the shared pointer ++ @param sharedPointer The shared pointer itself (the adress is taked via get()). ++ The archive takes a copy to prevent the memory location to be freed ++ as long as the address is used as id. This is needed to prevent CVE-2020-11105. + @return A key that uniquely identifies the pointer */ +- inline std::uint32_t registerSharedPointer( void const * addr ) ++ inline std::uint32_t registerSharedPointer(const std::shared_ptr& sharedPointer) + { ++ void const * addr = sharedPointer.get(); ++ + // Handle null pointers by just returning 0 + if(addr == 0) return 0; ++ itsSharedPointerStorage.push_back(sharedPointer); + + auto id = itsSharedPointerMap.find( addr ); + if( id == itsSharedPointerMap.end() ) +@@ -645,6 +650,10 @@ namespace cereal + //! Maps from addresses to pointer ids + std::unordered_map itsSharedPointerMap; + ++ //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive ++ // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. ++ std::vector> itsSharedPointerStorage; ++ + //! The id to be given to the next pointer + std::uint32_t itsCurrentPointerId; + +diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp +index 59e9da9b..cac1f334 100644 +--- a/include/cereal/types/memory.hpp ++++ b/include/cereal/types/memory.hpp +@@ -263,7 +263,7 @@ namespace cereal + { + auto & ptr = wrapper.ptr; + +- uint32_t id = ar.registerSharedPointer( ptr.get() ); ++ uint32_t id = ar.registerSharedPointer( ptr ); + ar( CEREAL_NVP_("id", id) ); + + if( id & detail::msb_32bit ) diff --git a/buildroot/package/cereal/cereal.mk b/buildroot/package/cereal/cereal.mk index 3811fdf32..19faa2ac4 100644 --- a/buildroot/package/cereal/cereal.mk +++ b/buildroot/package/cereal/cereal.mk @@ -9,10 +9,14 @@ CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) CEREAL_LICENSE_FILES = LICENSE include/cereal/external/base64.hpp include/cereal/external/rapidjson/rapidjson.h include/cereal/external/rapidxml/license.txt +CEREAL_CPE_ID_VENDOR = usc CEREAL_INSTALL_STAGING = YES CEREAL_INSTALL_TARGET = NO CEREAL_CONF_OPTS = \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON +# 0001-Store-a-copy-of-each-serialized-shared_ptr-within-the-archive.patch +CEREAL_IGNORE_CVES += CVE-2020-11105 + $(eval $(cmake-package)) diff --git a/buildroot/package/chartjs/chartjs.hash b/buildroot/package/chartjs/chartjs.hash index d2426ea61..de4d6d4eb 100644 --- a/buildroot/package/chartjs/chartjs.hash +++ b/buildroot/package/chartjs/chartjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8079d8fd39131fcfaec33f1c7799412bcf8e051e25b10bd6e37fc16159417aa1 chartjs-v2.9.3.tar.gz +sha256 9ef3697e279a585c79730f35dba16ad4e24ddeed49a150adb341c31f191fb78e chartjs-2.9.4.tar.gz sha256 7b43caae91f31b18dc81fae6e0f7aa1acbecaa6d84e3249905cbe15308307d67 LICENSE.md diff --git a/buildroot/package/chartjs/chartjs.mk b/buildroot/package/chartjs/chartjs.mk index 171e0a4a7..2748a94d3 100644 --- a/buildroot/package/chartjs/chartjs.mk +++ b/buildroot/package/chartjs/chartjs.mk @@ -4,10 +4,12 @@ # ################################################################################ -CHARTJS_VERSION = v2.9.3 -CHARTJS_SITE = $(call github,chartjs,Chart.js,$(CHARTJS_VERSION)) +CHARTJS_VERSION = 2.9.4 +CHARTJS_SITE = $(call github,chartjs,Chart.js,v$(CHARTJS_VERSION)) CHARTJS_LICENSE = MIT CHARTJS_LICENSE_FILES = LICENSE.md +CHARTJS_CPE_ID_VENDOR = chartjs +CHARTJS_CPE_ID_PRODUCT = chart.js define CHARTJS_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.css \ diff --git a/buildroot/package/chrony/0001-sys_linux-fix-build-with-older-kernel-headers.patch b/buildroot/package/chrony/0001-sys_linux-fix-build-with-older-kernel-headers.patch new file mode 100644 index 000000000..892664f49 --- /dev/null +++ b/buildroot/package/chrony/0001-sys_linux-fix-build-with-older-kernel-headers.patch @@ -0,0 +1,33 @@ +From 5dab78341bd515692f1b9ff8716a911c3ebf9ee1 Mon Sep 17 00:00:00 2001 +Message-Id: <5dab78341bd515692f1b9ff8716a911c3ebf9ee1.1611839550.git.baruch@tkos.co.il> +From: Baruch Siach +Date: Thu, 28 Jan 2021 15:02:40 +0200 +Subject: [PATCH] sys_linux: fix build with older kernel headers + +The renameat2 system call was introduced in kernel version 3.15. Fix +build against older headers. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit a2372b0c3abfc85d11c1684c0fb6370cc329e5c4 + + sys_linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sys_linux.c b/sys_linux.c +index 0b24445e173d..202da845edac 100644 +--- a/sys_linux.c ++++ b/sys_linux.c +@@ -547,7 +547,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(readlinkat), + SCMP_SYS(rename), + SCMP_SYS(renameat), ++#ifdef __NR_renameat2 + SCMP_SYS(renameat2), ++#endif + SCMP_SYS(stat), + SCMP_SYS(stat64), + SCMP_SYS(statfs), +-- +2.29.2 + diff --git a/buildroot/package/chrony/chrony.hash b/buildroot/package/chrony/chrony.hash index 57ce91ac8..87e0cf8ea 100644 --- a/buildroot/package/chrony/chrony.hash +++ b/buildroot/package/chrony/chrony.hash @@ -1,4 +1,4 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2020/08/msg00000.html -sha256 1ba82f70db85d414cd7420c39858e3ceca4b9eb8b028cbe869512c3a14a2dca7 chrony-3.5.1.tar.gz +# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2020/10/msg00000.html +sha256 be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625 chrony-4.0.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/chrony/chrony.mk b/buildroot/package/chrony/chrony.mk index f8938a80f..ef459ad38 100644 --- a/buildroot/package/chrony/chrony.mk +++ b/buildroot/package/chrony/chrony.mk @@ -4,16 +4,16 @@ # ################################################################################ -CHRONY_VERSION = 3.5.1 +CHRONY_VERSION = 4.0 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING +CHRONY_DEPENDENCIES = host-pkgconf CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ - --without-readline \ --without-tomcrypt \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) @@ -24,7 +24,7 @@ CHRONY_CONF_OPTS += --without-libcap endif ifeq ($(BR2_PACKAGE_LIBNSS),y) -CHRONY_DEPENDENCIES += host-pkgconf libnss +CHRONY_DEPENDENCIES += libnss else CHRONY_CONF_OPTS += --without-nss endif @@ -48,6 +48,18 @@ ifeq ($(BR2_PACKAGE_PPS_TOOLS),y) CHRONY_DEPENDENCIES += pps-tools endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +CHRONY_DEPENDENCIES += gnutls +else +CHRONY_CONF_OPTS += --without-gnutls +endif + +ifeq ($(BR2_PACKAGE_NETTLE),y) +CHRONY_DEPENDENCIES += nettle +else +CHRONY_CONF_OPTS += --without-nettle +endif + define CHRONY_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) endef diff --git a/buildroot/package/cifs-utils/cifs-utils.mk b/buildroot/package/cifs-utils/cifs-utils.mk index b06ce7ddd..63b454413 100644 --- a/buildroot/package/cifs-utils/cifs-utils.mk +++ b/buildroot/package/cifs-utils/cifs-utils.mk @@ -9,6 +9,7 @@ CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ CIFS_UTILS_LICENSE_FILES = COPYING +CIFS_UTILS_CPE_ID_VENDOR = samba # Missing install-sh in release tarball and patching Makefile.am CIFS_UTILS_AUTORECONF = YES CIFS_UTILS_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk index c0cbdb4a2..2cabee373 100644 --- a/buildroot/package/civetweb/civetweb.mk +++ b/buildroot/package/civetweb/civetweb.mk @@ -8,6 +8,7 @@ CIVETWEB_VERSION = 1.13 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md +CIVETWEB_CPE_ID_VALID = YES CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) diff --git a/buildroot/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk index 31fef74d9..4bfab3b64 100644 --- a/buildroot/package/cjson/cjson.mk +++ b/buildroot/package/cjson/cjson.mk @@ -9,6 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE +CJSON_CPE_ID_VALID = YES # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index bc1bf3bf9..1b2325870 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546 clamav-0.103.0.tar.gz +sha256 7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257 clamav-0.103.1.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index 45d62943a..4cd13fb82 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,12 +4,13 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.0 +CLAMAV_VERSION = 0.103.1 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \ COPYING.unrar COPYING.zlib +CLAMAV_CPE_ID_VENDOR = clamav CLAMAV_DEPENDENCIES = \ host-pkgconf \ libcurl \ diff --git a/buildroot/package/clang/clang.mk b/buildroot/package/clang/clang.mk index ceb7de9af..939f000cb 100644 --- a/buildroot/package/clang/clang.mk +++ b/buildroot/package/clang/clang.mk @@ -10,6 +10,7 @@ CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CL CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT +CLANG_CPE_ID_VENDOR = llvm CLANG_SUPPORTS_IN_SOURCE_BUILD = NO CLANG_INSTALL_STAGING = YES diff --git a/buildroot/package/clinfo/clinfo.hash b/buildroot/package/clinfo/clinfo.hash index d5766e632..2528a9e6c 100644 --- a/buildroot/package/clinfo/clinfo.hash +++ b/buildroot/package/clinfo/clinfo.hash @@ -1,4 +1,4 @@ # locally calculated -sha256 64b02e68ccff3b95437bd0bd70dcb88438c58adec16a7145a5d4e5c26a898ccf clinfo-2.2.18.03.26.tar.gz -sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt -sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE +sha256 3c506083e72e9ee09fc7d5de513be7c5eff0284f198a60fb60ab493f6f0a549a clinfo-3.0.20.11.20.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt +sha256 2a7a9321be169ea6edbc6b1010e8f7bb0f4c1482a2f65c34a49e9719f129b79a LICENSE diff --git a/buildroot/package/clinfo/clinfo.mk b/buildroot/package/clinfo/clinfo.mk index cf0869231..404e5f753 100644 --- a/buildroot/package/clinfo/clinfo.mk +++ b/buildroot/package/clinfo/clinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLINFO_VERSION = 2.2.18.03.26 +CLINFO_VERSION = 3.0.20.11.20 CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION)) CLINFO_LICENSE = CC0-1.0 CLINFO_LICENSE_FILES = legalcode.txt LICENSE diff --git a/buildroot/package/collectd/Config.in b/buildroot/package/collectd/Config.in index 3e854ba51..82c24fdbc 100644 --- a/buildroot/package/collectd/Config.in +++ b/buildroot/package/collectd/Config.in @@ -285,6 +285,11 @@ config BR2_PACKAGE_COLLECTD_HUGEPAGES help Reports the number of used and free hugepages on Linux. +config BR2_PACKAGE_COLLECTD_INFINIBAND + bool "infiniband" + help + Attributes and counters for each port on each IB device. + config BR2_PACKAGE_COLLECTD_INTERFACE bool "interface" help @@ -321,11 +326,21 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. +config BR2_PACKAGE_COLLECTD_LOGPARSER + bool "logparser" + help + Plugin for filtering and parsing log messages. + config BR2_PACKAGE_COLLECTD_MD bool "md" help Collects software-RAID device information. +config BR2_PACKAGE_COLLECTD_MDEVENTS + bool "mdevents" + help + Events from md (Linux Software RAID) devices. + config BR2_PACKAGE_COLLECTD_MEMCACHEC bool "memcachec" depends on BR2_INSTALL_LIBSTDCPP @@ -498,6 +513,11 @@ config BR2_PACKAGE_COLLECTD_SWAP help Collects the amount of memory currently written to disk. +config BR2_PACKAGE_COLLECTD_SYNPROXY + bool "synproxy" + help + Synproxy stats plugin. + config BR2_PACKAGE_COLLECTD_TABLE bool "table" help @@ -525,6 +545,16 @@ config BR2_PACKAGE_COLLECTD_THERMAL help Reads ACPI thermal zone information. +config BR2_PACKAGE_COLLECTD_UBI + bool "ubi" + help + UBI (Unsorted Block Images) is an erase block management layer + for flash memory devices. UBI serves two purposes, tracking + NAND flash bad blocks and providing wear leveling. + This plugin collects some stats about UBI devices: + * bad physical underlying blocks (bad_peb_count) + * max erase counter value (max_ec) + config BR2_PACKAGE_COLLECTD_UPTIME bool "uptime" help diff --git a/buildroot/package/collectd/collectd.mk b/buildroot/package/collectd/collectd.mk index 00e33f27d..7db753b34 100644 --- a/buildroot/package/collectd/collectd.mk +++ b/buildroot/package/collectd/collectd.mk @@ -12,6 +12,7 @@ COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING +COLLECTD_CPE_ID_VENDOR = collectd # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ @@ -82,6 +83,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ + $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ @@ -89,9 +91,11 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ + $(if $(BR2_PACKAGE_COLLECTD_LOGPARSER),--enable-logparser,--disable-logparser) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ + $(if $(BR2_PACKAGE_COLLECTD_MDEVENTS),--enable-mdevents,--disable-mdevents) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ @@ -128,6 +132,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_SMART),--enable-smart,--disable-smart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \ $(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \ + $(if $(BR2_PACKAGE_COLLECTD_SYNPROXY),--enable-synproxy,--disable-synproxy) \ $(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \ $(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \ $(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \ @@ -136,6 +141,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \ $(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \ $(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \ + $(if $(BR2_PACKAGE_COLLECTD_UBI),--enable-ubi,--disable-ubi) \ $(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \ $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ @@ -191,9 +197,6 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) # include/library fixups -ifeq ($(BR2_PACKAGE_GRPC),y) -COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr -endif ifeq ($(BR2_PACKAGE_JANSSON),y) COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr endif diff --git a/buildroot/package/connman/S45connman b/buildroot/package/connman/S45connman index d3d4bd5df..c8e913d3a 100644 --- a/buildroot/package/connman/S45connman +++ b/buildroot/package/connman/S45connman @@ -1,22 +1,52 @@ #!/bin/sh +DAEMON="connmand" +PIDFILE="/var/run/$DAEMON.pid" + +CONNMAND_ARGS="-n" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $CONNMAND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + case "$1" in - start) - printf "Starting connman ... " - start-stop-daemon -S -q -m -b -p /var/run/connmand.pid --exec /usr/sbin/connmand -- -n - echo "done." - ;; - stop) - printf "Stopping connman ..." - start-stop-daemon -K -q -p /var/run/connmand.pid - echo "done." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; *) - echo "usage: $0 {start|stop|restart}" - ;; + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/buildroot/package/connman/connman.hash b/buildroot/package/connman/connman.hash index 303910502..338e1919d 100644 --- a/buildroot/package/connman/connman.hash +++ b/buildroot/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz +sha256 9f62a7169b7491c670a1ff2e335b0d966308fb2f62e285c781105eb90f181af3 connman-1.39.tar.xz # Locally computed -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/connman/connman.mk b/buildroot/package/connman/connman.mk index 23e7cb779..77073f984 100644 --- a/buildroot/package/connman/connman.mk +++ b/buildroot/package/connman/connman.mk @@ -4,13 +4,14 @@ # ################################################################################ -CONNMAN_VERSION = 1.38 +CONNMAN_VERSION = 1.39 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables CONNMAN_INSTALL_STAGING = YES CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING +CONNMAN_CPE_ID_VENDOR = intel CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc diff --git a/buildroot/package/conntrack-tools/conntrack-tools.mk b/buildroot/package/conntrack-tools/conntrack-tools.mk index 145b6d785..55ea40792 100644 --- a/buildroot/package/conntrack-tools/conntrack-tools.mk +++ b/buildroot/package/conntrack-tools/conntrack-tools.mk @@ -12,6 +12,7 @@ CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ libnetfilter_queue host-bison host-flex CONNTRACK_TOOLS_LICENSE = GPL-2.0+ CONNTRACK_TOOLS_LICENSE_FILES = COPYING +CONNTRACK_TOOLS_CPE_ID_VENDOR = netfilter CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS) diff --git a/buildroot/package/coremark-pro/Config.in b/buildroot/package/coremark-pro/Config.in new file mode 100644 index 000000000..dd6821056 --- /dev/null +++ b/buildroot/package/coremark-pro/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_COREMARK_PRO + bool "coremark-pro" + depends on BR2_USE_MMU # perl uses fork() + select BR2_PACKAGE_PERL + help + CoreMark-PRO is a comprehensive, advanced processor benchmark. + + https://www.eembc.org/coremark-pro/ diff --git a/buildroot/package/coremark-pro/coremark-pro.hash b/buildroot/package/coremark-pro/coremark-pro.hash new file mode 100644 index 000000000..c43fc555c --- /dev/null +++ b/buildroot/package/coremark-pro/coremark-pro.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 440223554134832efec4ad220795611769ded3869fbc3ce3c59b05b7ddeb9f6d coremark-pro-1.1.2743.tar.gz +sha256 0d7775bd793ea71fef3594c18164a08ed2f5f66c898958d0644f7a236a536f2b LICENSE.md diff --git a/buildroot/package/coremark-pro/coremark-pro.mk b/buildroot/package/coremark-pro/coremark-pro.mk new file mode 100644 index 000000000..515b8eafb --- /dev/null +++ b/buildroot/package/coremark-pro/coremark-pro.mk @@ -0,0 +1,62 @@ +################################################################################ +# +# CoreMark-PRO +# +################################################################################ + +COREMARK_PRO_VERSION = 1.1.2743 +COREMARK_PRO_SITE = $(call github,eembc,coremark-pro,v$(COREMARK_PRO_VERSION)) +COREMARK_PRO_LICENSE = Apache-2.0 +COREMARK_PRO_LICENSE_FILES = LICENSE.md +COREMARK_PRO_DEPENDENCIES = perl + +COREMARK_PRO_LDFLAGS = $(TARGET_LDFLAGS) -lm + +ifeq ($(BR2_ENDIAN),"BIG") +COREMARK_PRO_DEFINES += \ + EE_BIG_ENDIAN=1 \ + EE_LITTLE_ENDIAN=0 +else +COREMARK_PRO_DEFINES += \ + EE_BIG_ENDIAN=0 \ + EE_LITTLE_ENDIAN=1 +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +COREMARK_PRO_DEFINES += \ + USE_NATIVE_PTHREAD=1 \ + USE_SINGLE_CONTEXT=0 +COREMARK_PRO_LDFLAGS += -lpthread +else +COREMARK_PRO_DEFINES += \ + USE_NATIVE_PTHREAD=0 \ + USE_SINGLE_CONTEXT=1 +endif + +COREMARK_PRO_MAKE_OPTS += \ + LINKER_LAST="$(COREMARK_PRO_LDFLAGS)" \ + PLATFORM_DEFINES="$(COREMARK_PRO_DEFINES)" \ + TARGET=linux$(if $(BR2_ARCH_IS_64),64) \ + EXE= + +define COREMARK_PRO_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" -C $(@D) \ + $(COREMARK_PRO_MAKE_OPTS) build +endef + +COREMARK_PRO_MARKS = cjpeg-rose7-preset core linear_alg-mid-100x100-sp loops-all-mid-10k-sp nnet_test parser-125k radix2-big-64k sha-test zip-test +COREMARK_PRO_SCRIPTS = results_parser.pl cert_median.pl cert_mark.pl headings.txt + +define COREMARK_PRO_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/share/coremark-pro/logs + $(foreach m,$(COREMARK_PRO_MARKS),\ + $(INSTALL) -D $(@D)/builds/linux$(if $(BR2_ARCH_IS_64),64)/gcc$(if $(BR2_ARCH_IS_64),64)/bin/$(m) $(TARGET_DIR)/usr/bin/$(m)$(sep) \ + size $(TARGET_DIR)/usr/bin/$(m) > $(TARGET_DIR)/usr/share/coremark-pro/logs/$(m).size.log$(sep)) + $(INSTALL) -D $(@D)/builds/linux$(if $(BR2_ARCH_IS_64),64)/gcc$(if $(BR2_ARCH_IS_64),64)/data/libbmp/Rose256.bmp $(TARGET_DIR)/usr/share/coremark-pro/Rose256.bmp + $(foreach s,$(COREMARK_PRO_SCRIPTS),\ + $(INSTALL) -D $(@D)/util/perl/$(s) $(TARGET_DIR)/usr/share/coremark-pro/util/perl/$(s)$(sep)) + $(Q)sed "s/@COREMARK_PRO_MARKS@/$(COREMARK_PRO_MARKS)/" \ + package/coremark-pro/coremark-pro.sh.in >$(TARGET_DIR)/usr/bin/coremark-pro.sh +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/coremark-pro/coremark-pro.sh.in b/buildroot/package/coremark-pro/coremark-pro.sh.in new file mode 100755 index 000000000..8b370b7c7 --- /dev/null +++ b/buildroot/package/coremark-pro/coremark-pro.sh.in @@ -0,0 +1,35 @@ +#!/bin/sh +# SPDX-License-Identifier: Apache-2.0 + +workloads="@COREMARK_PRO_MARKS@" + +rm -rf /tmp/coremark-pro +mkdir -p /tmp/coremark-pro +cp /usr/share/coremark-pro/Rose256.bmp /tmp/coremark-pro +cp /usr/share/coremark-pro/logs/*.size.log /tmp/coremark-pro + +cd /tmp/coremark-pro + +for contype in single best; do + cat /usr/share/coremark-pro/util/perl/headings.txt >>result.log + for wld in $workloads; do + [ "$contype" = "single" ] && XCMD="-c1 -w1" + [ "$contype" = "best" ] && XCMD="-c$(nproc) -w$(nproc)" + echo "#Results for verification run started at $(date +%x:%X) XCMD=$XCMD" >$wld-$contype-result.log + echo "Verification run for $wld" + $wld $XCMD -v1 > $wld.run.log + LC_ALL=C perl /usr/share/coremark-pro/util/perl/results_parser.pl $wld-$contype-result.log $wld.run.log + echo "#Results for performance runs started at $(date +%x:%X) XCMD=$XCMD" >>$wld-$contype-result.log + echo "Performance run for $wld" + for i in 1 2 3; do + $wld $XCMD -v0 > $wld.run.log + LC_ALL=C perl /usr/share/coremark-pro/util/perl/results_parser.pl $wld-$contype-result.log $wld.run.log + done + echo "#Median for final result $wld" >>$wld-$contype-result.log + LC_ALL=C perl /usr/share/coremark-pro/util/perl/cert_median.pl $wld-$contype-result.log $contype >>$wld-$contype-result.log + cat $wld-$contype-result.log >>result.log + done +done +LC_ALL=C perl /usr/share/coremark-pro/util/perl/cert_mark.pl -i result.log -s coremarkpro > result.mark +cat result.mark +cd - >/dev/null diff --git a/buildroot/package/coremark/Config.in b/buildroot/package/coremark/Config.in new file mode 100644 index 000000000..f0e13eda6 --- /dev/null +++ b/buildroot/package/coremark/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_COREMARK + bool "coremark" + help + CoreMark is a benchmark that measures the performance of + microcontrollers (MCUs) and central processing units (CPUs) + used in embedded systems + + https://www.eembc.org/coremark/ diff --git a/buildroot/package/coremark/coremark.hash b/buildroot/package/coremark/coremark.hash new file mode 100644 index 000000000..950e736b6 --- /dev/null +++ b/buildroot/package/coremark/coremark.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 99c5a6d63af85a281b4e4d6ccb522c446653c435dfec9455ad73ef9e71f28bde coremark-1.01.tar.gz +sha256 d72094a3cb629dc7712ae09b7b777416903c6670930928b5530f2ddfb2296888 LICENSE.md diff --git a/buildroot/package/coremark/coremark.mk b/buildroot/package/coremark/coremark.mk new file mode 100644 index 000000000..418fd5c8d --- /dev/null +++ b/buildroot/package/coremark/coremark.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# CoreMark +# +################################################################################ + +COREMARK_VERSION = 1.01 +COREMARK_SITE = $(call github,eembc,coremark,v$(COREMARK_VERSION)) +COREMARK_LICENSE = Apache-2.0 +COREMARK_LICENSE_FILES = LICENSE.md + +define COREMARK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) \ + PORT_DIR=linux$(if $(BR2_ARCH_IS_64),64) EXE= link +endef + +define COREMARK_INSTALL_TARGET_CMDS + $(INSTALL) -D $(@D)/coremark $(TARGET_DIR)/usr/bin/coremark +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk index 3866b7624..18e9052df 100644 --- a/buildroot/package/coreutils/coreutils.mk +++ b/buildroot/package/coreutils/coreutils.mk @@ -9,6 +9,7 @@ COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ COREUTILS_LICENSE_FILES = COPYING +COREUTILS_CPE_ID_VENDOR = gnu COREUTILS_CONF_OPTS = --disable-rpath \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) diff --git a/buildroot/package/cpio/cpio.mk b/buildroot/package/cpio/cpio.mk index 1d9c54669..9ce281dd1 100644 --- a/buildroot/package/cpio/cpio.mk +++ b/buildroot/package/cpio/cpio.mk @@ -10,6 +10,7 @@ CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin CPIO_LICENSE = GPL-3.0+ CPIO_LICENSE_FILES = COPYING +CPIO_CPE_ID_VENDOR = gnu # cpio uses argp.h which is not provided by uclibc or musl by default. # Use the argp-standalone package to provide this. diff --git a/buildroot/package/crda/crda.mk b/buildroot/package/crda/crda.mk index c5880797b..31a64d004 100644 --- a/buildroot/package/crda/crda.mk +++ b/buildroot/package/crda/crda.mk @@ -9,6 +9,7 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE +CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ diff --git a/buildroot/package/cryptodev-linux/cryptodev-linux.mk b/buildroot/package/cryptodev-linux/cryptodev-linux.mk index 5b882b284..2a65755aa 100644 --- a/buildroot/package/cryptodev-linux/cryptodev-linux.mk +++ b/buildroot/package/cryptodev-linux/cryptodev-linux.mk @@ -9,6 +9,7 @@ CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ CRYPTODEV_LINUX_LICENSE_FILES = COPYING +CRYPTODEV_LINUX_CPE_ID_VENDOR = cryptodev-linux CRYPTODEV_LINUX_PROVIDES = cryptodev diff --git a/buildroot/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk index c1b8aaa44..170610845 100644 --- a/buildroot/package/cryptopp/cryptopp.mk +++ b/buildroot/package/cryptopp/cryptopp.mk @@ -9,6 +9,8 @@ CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX) CRYPTOPP_LICENSE_FILES = License.txt +CRYPTOPP_CPE_ID_VENDOR = cryptopp +CRYPTOPP_CPE_ID_PRODUCT = crypto\+\+ CRYPTOPP_INSTALL_STAGING = YES define HOST_CRYPTOPP_EXTRACT_CMDS diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk index a59a0c757..34981282b 100644 --- a/buildroot/package/cryptsetup/cryptsetup.mk +++ b/buildroot/package/cryptsetup/cryptsetup.mk @@ -15,6 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL +CRYPTSETUP_CPE_ID_VALID = YES CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 diff --git a/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch b/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch deleted file mode 100644 index 650b90a89..000000000 --- a/buildroot/package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ad1ed8b7939bf75079b0a770e234bfee7d33dbb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Jul 2020 23:02:50 +0200 -Subject: [PATCH] configure.ac: fix cross-compilation without dejavu - -Cross-compilation is broken since commit 1d66106. Indeed, when -cross-compiling, dejavu font won't be installed in /usr/share/fonts. The -path (e.g. $(TARGET_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf) could be -provided through --with-test-font-path which will fix the build failure -but will result in broken test programs. - -So when cross-compiling don't try to check if the test-font-path is -valid or not and just use the one provided by the user or the default -one (e.g. /usr/share/fonts/dejavu/DejaVuSans.ttf) - -Fix #262 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/OpenPrinting/cups-filters/commit/6ad1ed8b7939bf75079b0a770e234bfee7d33dbb] ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa905cf5d..4cc4fd6e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -796,10 +796,10 @@ AC_ARG_WITH([test-font-path], - [with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`] - ) - --AS_IF([test -f "$with_test_font_path"], -- [AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])], -+AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"], - [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)] - ) -+AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests]) - - # ================ - # Check for cflags diff --git a/buildroot/package/cups-filters/cups-filters.hash b/buildroot/package/cups-filters/cups-filters.hash index 61cb42a43..8c2526ae9 100644 --- a/buildroot/package/cups-filters/cups-filters.hash +++ b/buildroot/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz -sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING +sha256 cf90b96b5c7a906a05070e757ee5566d9680db98a279e60567ea5421c38f11de cups-filters-1.28.4.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/buildroot/package/cups-filters/cups-filters.mk b/buildroot/package/cups-filters/cups-filters.mk index 237d8afe6..3ba031d5a 100644 --- a/buildroot/package/cups-filters/cups-filters.mk +++ b/buildroot/package/cups-filters/cups-filters.mk @@ -4,12 +4,10 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.27.5 +CUPS_FILTERS_VERSION = 1.28.4 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -# We're patching configure.ac -CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg diff --git a/buildroot/package/cups/cups.mk b/buildroot/package/cups/cups.mk index 2f4385671..2fe9b03a6 100644 --- a/buildroot/package/cups/cups.mk +++ b/buildroot/package/cups/cups.mk @@ -9,6 +9,7 @@ CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception CUPS_LICENSE_FILES = LICENSE NOTICE +CUPS_CPE_ID_VENDOR = cups CUPS_INSTALL_STAGING = YES # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. diff --git a/buildroot/package/cvs/cvs.mk b/buildroot/package/cvs/cvs.mk index 6f83ca640..3d01f335e 100644 --- a/buildroot/package/cvs/cvs.mk +++ b/buildroot/package/cvs/cvs.mk @@ -10,6 +10,7 @@ CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob) CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h +CVS_CPE_ID_VENDOR = gnu CVS_DEPENDENCIES = ncurses CVS_CONF_ENV = \ diff --git a/buildroot/package/czmq/czmq.hash b/buildroot/package/czmq/czmq.hash index 4738c9c43..19e2053a0 100644 --- a/buildroot/package/czmq/czmq.hash +++ b/buildroot/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 7e09997db6ac3b25e8ed104053040722 czmq-4.2.0.tar.gz -sha1 42165b3eede517708814e5a1b6972d8bde417f7a czmq-4.2.0.tar.gz +md5 471e9ec120fc66a2fe2aae14359e3cfa czmq-4.2.1.tar.gz +sha1 75ced09c143f93fae65238375e3a799c40eaed4c czmq-4.2.1.tar.gz # Locally calculated -sha256 cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb czmq-4.2.0.tar.gz +sha256 5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39 czmq-4.2.1.tar.gz sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/buildroot/package/czmq/czmq.mk b/buildroot/package/czmq/czmq.mk index 1c9493cb7..8ddd9e8f9 100644 --- a/buildroot/package/czmq/czmq.mk +++ b/buildroot/package/czmq/czmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CZMQ_VERSION = 4.2.0 +CZMQ_VERSION = 4.2.1 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) CZMQ_INSTALL_STAGING = YES diff --git a/buildroot/package/daemon/0001-fix-musl.patch b/buildroot/package/daemon/0001-fix-musl.patch index 9454d72ae..5ebb64597 100644 --- a/buildroot/package/daemon/0001-fix-musl.patch +++ b/buildroot/package/daemon/0001-fix-musl.patch @@ -8,11 +8,11 @@ Signed-off-by: Baruch Siach diff -Nuar daemon-0.6.4-orig/daemon.c daemon-0.6.4/daemon.c --- daemon-0.6.4-orig/daemon.c 2010-06-12 16:37:00.000000000 +0300 +++ daemon-0.6.4/daemon.c 2017-05-01 22:02:17.721413468 +0300 -@@ -665,6 +665,7 @@ +@@ -864,6 +864,7 @@ #ifdef _RESTORE_POSIX_SOURCE #define _POSIX_SOURCE #endif +#include + #include #include #include - #include diff --git a/buildroot/package/daemon/daemon.hash b/buildroot/package/daemon/daemon.hash index ad8637ee8..b1c1dcdc2 100644 --- a/buildroot/package/daemon/daemon.hash +++ b/buildroot/package/daemon/daemon.hash @@ -1,4 +1,3 @@ -# md5 from http://www.libslack.org/daemon/; sha256 locally calculated -md5 6cd0a28630a29ac279bc501f39baec66 daemon-0.6.4.tar.gz -sha256 c4b9ea4aa74d55ea618c34f1e02c080ddf368549037cb239ee60c83191035ca1 daemon-0.6.4.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +# From http://www.libslack.org/daemon/ +sha256 f66af2ece784c16dcb5219de1f4fa3ae5787bb3374e44bd4b1d3e275e8ff272c daemon-0.7.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/buildroot/package/daemon/daemon.mk b/buildroot/package/daemon/daemon.mk index 79cf3f7aa..f3a1917fa 100644 --- a/buildroot/package/daemon/daemon.mk +++ b/buildroot/package/daemon/daemon.mk @@ -4,17 +4,16 @@ # ################################################################################ -DAEMON_VERSION = 0.6.4 +DAEMON_VERSION = 0.7 DAEMON_SITE = http://libslack.org/daemon/download DAEMON_LICENSE = GPL-2.0+ DAEMON_LICENSE_FILES = LICENSE define DAEMON_CONFIGURE_CMDS - (cd $(@D); ./config) + (cd $(@D); ./configure) endef define DAEMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) ready $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef diff --git a/buildroot/package/dash/dash.hash b/buildroot/package/dash/dash.hash index 069a7b179..24cc7318b 100644 --- a/buildroot/package/dash/dash.hash +++ b/buildroot/package/dash/dash.hash @@ -1,4 +1,4 @@ # From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz.sha256sum -sha256 00fb7d68b7599cc41ab151051c06c01e9500540183d8aa72116cb9c742bd6d5f dash-0.5.11.2.tar.gz +sha256 62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a dash-0.5.11.3.tar.gz # Locally calculated sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING diff --git a/buildroot/package/dash/dash.mk b/buildroot/package/dash/dash.mk index 88caa6609..1712dcf59 100644 --- a/buildroot/package/dash/dash.mk +++ b/buildroot/package/dash/dash.mk @@ -4,7 +4,7 @@ # ################################################################################ -DASH_VERSION = 0.5.11.2 +DASH_VERSION = 0.5.11.3 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING diff --git a/buildroot/package/datatables-buttons/Config.in b/buildroot/package/datatables-buttons/Config.in new file mode 100644 index 000000000..515038ebe --- /dev/null +++ b/buildroot/package/datatables-buttons/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DATATABLES_BUTTONS + bool "datatables-buttons" + depends on BR2_PACKAGE_DATATABLES + select BR2_PACKAGE_JSZIP + help + The Buttons library for DataTables provides a framework with + common options and API that can be used with DataTables, but + is also very extensible, recognising that you will likely want + to use buttons which perform an action unique to your + applications. + + https://datatables.net/extensions/buttons diff --git a/buildroot/package/datatables-buttons/datatables-buttons.hash b/buildroot/package/datatables-buttons/datatables-buttons.hash new file mode 100644 index 000000000..eda8df34b --- /dev/null +++ b/buildroot/package/datatables-buttons/datatables-buttons.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 427632c0245f488328edab83b53294545744c8de621a5eaa9dd3d257d7ed7775 Buttons-1.6.1.zip +sha256 21fa7cbc3c00bcad1e0f3417d465e702bd470d7dc446a6deff80c8fc5eda9148 License.txt diff --git a/buildroot/package/datatables-buttons/datatables-buttons.mk b/buildroot/package/datatables-buttons/datatables-buttons.mk new file mode 100644 index 000000000..a08be0586 --- /dev/null +++ b/buildroot/package/datatables-buttons/datatables-buttons.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# datatables-buttons +# +################################################################################ + +DATATABLES_BUTTONS_VERSION = 1.6.1 +DATATABLES_BUTTONS_SITE = https://datatables.net/releases +DATATABLES_BUTTONS_SOURCE = Buttons-$(DATATABLES_BUTTONS_VERSION).zip +DATATABLES_BUTTONS_LICENSE = MIT +DATATABLES_BUTTONS_LICENSE_FILES = License.txt + +define DATATABLES_BUTTONS_EXTRACT_CMDS + $(UNZIP) $(DATATABLES_BUTTONS_DL_DIR)/$(DATATABLES_BUTTONS_SOURCE) -d $(@D) + mv $(@D)/Buttons-$(DATATABLES_BUTTONS_VERSION)/* $(@D) + rmdir $(@D)/Buttons-$(DATATABLES_BUTTONS_VERSION) +endef + +define DATATABLES_BUTTONS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/datatables-buttons/css $(TARGET_DIR)/var/www/datatables-buttons/js + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-buttons/css $(@D)/css/*.min.css + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-buttons/js $(@D)/js/*.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/datatables-fixedcolumns/Config.in b/buildroot/package/datatables-fixedcolumns/Config.in new file mode 100644 index 000000000..4d2e5ea06 --- /dev/null +++ b/buildroot/package/datatables-fixedcolumns/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_DATATABLES_FIXEDCOLUMNS + bool "datatables-fixedcolumns" + depends on BR2_PACKAGE_DATATABLES + help + When making use of DataTables' x-axis scrolling feature + (scrollX), you may wish to fix the left or right most columns + in place. This extension for DataTables provides exactly this + option. + + https://datatables.net/extensions/fixedcolumns diff --git a/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.hash b/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.hash new file mode 100644 index 000000000..dc9462020 --- /dev/null +++ b/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 53a7b20ea9dbb6498137cb7260bde8605989ec578e4b71787f5ebc4ef9910bd9 FixedColumns-3.3.0.zip +sha256 e8e92f97216f9ea00cb2735b933a91ec8e3869bed37b6d63a90f76f41508f2de License.txt diff --git a/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.mk b/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.mk new file mode 100644 index 000000000..3c744990c --- /dev/null +++ b/buildroot/package/datatables-fixedcolumns/datatables-fixedcolumns.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# datatables-fixedcolumns +# +################################################################################ + +DATATABLES_FIXEDCOLUMNS_VERSION = 3.3.0 +DATATABLES_FIXEDCOLUMNS_SITE = https://datatables.net/releases +DATATABLES_FIXEDCOLUMNS_SOURCE = FixedColumns-$(DATATABLES_FIXEDCOLUMNS_VERSION).zip +DATATABLES_FIXEDCOLUMNS_LICENSE = MIT +DATATABLES_FIXEDCOLUMNS_LICENSE_FILES = License.txt + +define DATATABLES_FIXEDCOLUMNS_EXTRACT_CMDS + $(UNZIP) $(DATATABLES_FIXEDCOLUMNS_DL_DIR)/$(DATATABLES_FIXEDCOLUMNS_SOURCE) -d $(@D) + mv $(@D)/FixedColumns-$(DATATABLES_FIXEDCOLUMNS_VERSION)/* $(@D) + rmdir $(@D)/FixedColumns-$(DATATABLES_FIXEDCOLUMNS_VERSION) +endef + +define DATATABLES_FIXEDCOLUMNS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/datatables-fixedcolumns/css $(TARGET_DIR)/var/www/datatables-fixedcolumns/js + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-fixedcolumns/css $(@D)/css/*.min.css + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-fixedcolumns/js $(@D)/js/*.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/datatables-responsive/Config.in b/buildroot/package/datatables-responsive/Config.in new file mode 100644 index 000000000..085824af4 --- /dev/null +++ b/buildroot/package/datatables-responsive/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DATATABLES_RESPONSIVE + bool "datatables-responsive" + depends on BR2_PACKAGE_DATATABLES + help + In the modern world of responsive web design tables can often + cause a particular problem for designers due to their row + based layout. Responsive is an extension for DataTables that + resolves that problem by optimising the table's layout for + different screen sizes through the dynamic insertion and + removal of columns from the table. + + https://datatables.net/extensions/responsive diff --git a/buildroot/package/datatables-responsive/datatables-responsive.hash b/buildroot/package/datatables-responsive/datatables-responsive.hash new file mode 100644 index 000000000..d10313f36 --- /dev/null +++ b/buildroot/package/datatables-responsive/datatables-responsive.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 47caf3b753dd2c537b8834816eaf38c4df214cb4e6a97144e0de4cf82ad24d02 Responsive-2.2.3.zip +sha256 da4e1020ae97c095a14d7830c1a8a793e080c062e22d749ecd3fc3c075673dbf License.txt diff --git a/buildroot/package/datatables-responsive/datatables-responsive.mk b/buildroot/package/datatables-responsive/datatables-responsive.mk new file mode 100644 index 000000000..bc9644701 --- /dev/null +++ b/buildroot/package/datatables-responsive/datatables-responsive.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# datatables-responsive +# +################################################################################ + +DATATABLES_RESPONSIVE_VERSION = 2.2.3 +DATATABLES_RESPONSIVE_SITE = https://datatables.net/releases +DATATABLES_RESPONSIVE_SOURCE = Responsive-$(DATATABLES_RESPONSIVE_VERSION).zip +DATATABLES_RESPONSIVE_LICENSE = MIT +DATATABLES_RESPONSIVE_LICENSE_FILES = License.txt + +define DATATABLES_RESPONSIVE_EXTRACT_CMDS + $(UNZIP) $(DATATABLES_RESPONSIVE_DL_DIR)/$(DATATABLES_RESPONSIVE_SOURCE) -d $(@D) + mv $(@D)/Responsive-$(DATATABLES_RESPONSIVE_VERSION)/* $(@D) + rmdir $(@D)/Responsive-$(DATATABLES_RESPONSIVE_VERSION) +endef + +define DATATABLES_RESPONSIVE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/datatables-responsive/css $(TARGET_DIR)/var/www/datatables-responsive/js + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-responsive/css $(@D)/css/*.min.css + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables-responsive/js $(@D)/js/*.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/datatables/Config.in b/buildroot/package/datatables/Config.in new file mode 100644 index 000000000..89009712d --- /dev/null +++ b/buildroot/package/datatables/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_DATATABLES + bool "datatables" + help + Javascript library providing advanced interaction controls + for your HTML tables. + + https://datatables.net diff --git a/buildroot/package/datatables/datatables.hash b/buildroot/package/datatables/datatables.hash new file mode 100644 index 000000000..d6eeadfb3 --- /dev/null +++ b/buildroot/package/datatables/datatables.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e2c79dd9d02caa04130ce888061bc922e18561e72e842ba0cb657d1812d9f1bf DataTables-1.10.20.zip +sha256 c6a873f21550ed804f76013c36e14225704c1aa551fdb870e0c626eb91c19247 license.txt diff --git a/buildroot/package/datatables/datatables.mk b/buildroot/package/datatables/datatables.mk new file mode 100644 index 000000000..7bd3d83ac --- /dev/null +++ b/buildroot/package/datatables/datatables.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# datatables +# +################################################################################ + +DATATABLES_VERSION = 1.10.20 +DATATABLES_SITE = https://datatables.net/releases +DATATABLES_SOURCE = DataTables-$(DATATABLES_VERSION).zip +DATATABLES_LICENSE = MIT +DATATABLES_LICENSE_FILES = license.txt + +define DATATABLES_EXTRACT_CMDS + $(UNZIP) $(DATATABLES_DL_DIR)/$(DATATABLES_SOURCE) -d $(@D) + mv $(@D)/DataTables-$(DATATABLES_VERSION)/* $(@D) + rmdir $(@D)/DataTables-$(DATATABLES_VERSION) +endef + +define DATATABLES_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/datatables/css $(TARGET_DIR)/var/www/datatables/js + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables/css $(@D)/media/css/*.min.css + $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/datatables/js $(@D)/media/js/*.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/dav1d/dav1d.hash b/buildroot/package/dav1d/dav1d.hash index 3ff4b1b68..45152f7a8 100644 --- a/buildroot/package/dav1d/dav1d.hash +++ b/buildroot/package/dav1d/dav1d.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9eac4f50089f54a9f562827bda4a21187d68c01d8b20055eef1d7efca9f84cf8 dav1d-0.7.1.tar.bz2 +sha256 842da2945afcf54e651d17112bf2823a238e6c935a6c8dff3a8e96a2eb740269 dav1d-0.8.1.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/buildroot/package/dav1d/dav1d.mk b/buildroot/package/dav1d/dav1d.mk index 1e84c21b4..68f6fc880 100644 --- a/buildroot/package/dav1d/dav1d.mk +++ b/buildroot/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.7.1 +DAV1D_VERSION = 0.8.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/buildroot/package/davici/davici.mk b/buildroot/package/davici/davici.mk index 5c08bbe0d..6c8df48b6 100644 --- a/buildroot/package/davici/davici.mk +++ b/buildroot/package/davici/davici.mk @@ -8,6 +8,7 @@ DAVICI_VERSION = 1.3 DAVICI_SITE = $(call github,strongswan,davici,v$(DAVICI_VERSION)) DAVICI_LICENSE = LGPL-2.1+ DAVICI_LICENSE_FILES = COPYING +DAVICI_CPE_ID_VENDOR = strongswan DAVICI_DEPENDENCIES = strongswan DAVICI_INSTALL_STAGING = YES DAVICI_AUTORECONF = YES diff --git a/buildroot/package/dbus-glib/dbus-glib.mk b/buildroot/package/dbus-glib/dbus-glib.mk index 372942e1c..5eb158d95 100644 --- a/buildroot/package/dbus-glib/dbus-glib.mk +++ b/buildroot/package/dbus-glib/dbus-glib.mk @@ -9,6 +9,7 @@ DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+ DBUS_GLIB_LICENSE_FILES = COPYING +DBUS_GLIB_CPE_ID_VENDOR = freedesktop DBUS_GLIB_CONF_ENV = \ ac_cv_have_abstract_sockets=yes \ diff --git a/buildroot/package/dbus-triggerd/dbus-triggerd.hash b/buildroot/package/dbus-triggerd/dbus-triggerd.hash index b7ed89abf..956a577ca 100644 --- a/buildroot/package/dbus-triggerd/dbus-triggerd.hash +++ b/buildroot/package/dbus-triggerd/dbus-triggerd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3c6d865427bf1b93b16323c796ed6957ce6b2b6fd53f518b1b082d03b939102c dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09.tar.gz +sha256 930cccfe8bdff98cab0cff003d90f9421858850d2d00143108191b62b4ef5e5a dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09-br1.tar.gz sha256 30d135650639af9019633690fc1aecbfc150aeeef9446347d4286a58338d10b0 dbus-triggerd.c diff --git a/buildroot/package/dbus/dbus.mk b/buildroot/package/dbus/dbus.mk index 149183437..d78e10242 100644 --- a/buildroot/package/dbus/dbus.mk +++ b/buildroot/package/dbus/dbus.mk @@ -8,6 +8,8 @@ DBUS_VERSION = 1.12.20 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING +DBUS_CPE_ID_VENDOR = d-bus_project +DBUS_CPE_ID_PRODUCT = d-bus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS diff --git a/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch b/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch index c838063e0..6abc3105e 100644 --- a/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch +++ b/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch @@ -4,6 +4,7 @@ Date: Sat, 20 Jul 2019 00:27:31 -0300 Subject: [PATCH] main.c: add newline to logfile openning error message Signed-off-by: Carlos Santos +[Upstream status: https://github.com/dubiousjim/dcron/pull/22] --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/package/dcron/dcron.hash b/buildroot/package/dcron/dcron.hash index 3e53ddc25..35b02eb78 100644 --- a/buildroot/package/dcron/dcron.hash +++ b/buildroot/package/dcron/dcron.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824 dcron-4.5.tar.gz +sha256 5a53930ba27b57c06c3b03635788cf569990283bde8ea9c1ee820e13f988288d dcron-1ba33c3325df48de46263276a43ed76cf9d81518.tar.gz +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 COPYING diff --git a/buildroot/package/dcron/dcron.mk b/buildroot/package/dcron/dcron.mk index 51ebb1874..f0c3efbf8 100644 --- a/buildroot/package/dcron/dcron.mk +++ b/buildroot/package/dcron/dcron.mk @@ -4,10 +4,10 @@ # ################################################################################ -DCRON_VERSION = 4.5 -DCRON_SITE = http://www.jimpryor.net/linux/releases -# The source code does not specify the version of the GPL that is used. -DCRON_LICENSE = GPL +DCRON_VERSION = 1ba33c3325df48de46263276a43ed76cf9d81518 +DCRON_SITE = $(call github,dubiousjim,dcron,$(DCRON_VERSION)) +DCRON_LICENSE = GPL-2.0+ +DCRON_LICENSE_FILES = COPYING define DCRON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/buildroot/package/delve/Config.in b/buildroot/package/delve/Config.in new file mode 100644 index 000000000..9428e4016 --- /dev/null +++ b/buildroot/package/delve/Config.in @@ -0,0 +1,22 @@ +# Supported architectures are listed in +# pkg/proc/native/support_sentinel.go +config BR2_PACKAGE_DELVE_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_i386 + default y if BR2_x86_64 + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + +config BR2_PACKAGE_DELVE + bool "delve" + depends on BR2_PACKAGE_DELVE_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Delve is a debugger for the Go programming language. + + https://github.com/go-delve/delve + +comment "delve needs a toolchain w/ threads" + depends on BR2_PACKAGE_DELVE_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/delve/delve.hash b/buildroot/package/delve/delve.hash new file mode 100644 index 000000000..e8bb9c37a --- /dev/null +++ b/buildroot/package/delve/delve.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab delve-1.5.0.tar.gz +sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/buildroot/package/delve/delve.mk b/buildroot/package/delve/delve.mk new file mode 100644 index 000000000..f574bc5c0 --- /dev/null +++ b/buildroot/package/delve/delve.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# delve +# +################################################################################ + +DELVE_VERSION = 1.5.0 +DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) +DELVE_LICENSE = MIT +DELVE_LICENSE_FILES = LICENSE +DELVE_DEPENDENCIES = host-pkgconf + +DELVE_TAGS = cgo +DELVE_BUILD_TARGETS = cmd/dlv +DELVE_INSTALL_BINS = $(notdir $(DELVE_BUILD_TARGETS)) + +$(eval $(golang-package)) diff --git a/buildroot/package/dfu-util/Config.in b/buildroot/package/dfu-util/Config.in index 201c8a7cf..71c1a1687 100644 --- a/buildroot/package/dfu-util/Config.in +++ b/buildroot/package/dfu-util/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DFU_UTIL bool "dfu-util" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Dfu-util is the host side implementation of the DFU 1.0 @@ -9,5 +10,6 @@ config BR2_PACKAGE_DFU_UTIL http://dfu-util.sourceforge.net/ -comment "dfu-util needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "dfu-util needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/dfu-util/Config.in.host b/buildroot/package/dfu-util/Config.in.host index ea47a36c7..1bf9275f9 100644 --- a/buildroot/package/dfu-util/Config.in.host +++ b/buildroot/package/dfu-util/Config.in.host @@ -1,8 +1,12 @@ config BR2_PACKAGE_HOST_DFU_UTIL bool "host dfu-util" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help Dfu-util is the host side implementation of the DFU 1.0 specification of the USB forum. DFU is intended to download and upload firmware to devices connected over USB. http://dfu-util.sourceforge.net/ + +comment "host dfu-util needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/dhcp/dhcp.mk b/buildroot/package/dhcp/dhcp.mk index f1ffa81d9..d8f331719 100644 --- a/buildroot/package/dhcp/dhcp.mk +++ b/buildroot/package/dhcp/dhcp.mk @@ -10,6 +10,7 @@ DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE DHCP_DEPENDENCIES = bind +DHCP_CPE_ID_VENDOR = isc # use libtool-enabled configure.ac define DHCP_LIBTOOL_AUTORECONF diff --git a/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch b/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch deleted file mode 100644 index 07e6d642a..000000000 --- a/buildroot/package/dhcpcd/0001-src-dhcpcd.c-fix-build-without-fork.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 13e475d9847bf7d6a6af62397f67eb269e27613e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Jul 2020 10:43:51 +0200 -Subject: [PATCH] src/dhcpcd.c: fix build without fork - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rsmarples/dhcpcd/pull/17] ---- - src/dhcpcd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/dhcpcd.c b/src/dhcpcd.c -index ee585aa4..b597a5c0 100644 ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -336,7 +336,7 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - #ifdef THERE_IS_NO_FORK - eloop_timeout_delete(ctx->eloop, handle_exit_timeout, ctx); - errno = ENOSYS; -- return 0; -+ return; - #else - int i; - unsigned int logopts = loggetopts(); -@@ -2211,7 +2211,7 @@ printpidfile: - ps_init(&ctx); - #endif - --#ifdef USE_SIGNALS -+#if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK) - if (pipe(sigpipe) == -1) { - logerr("pipe"); - goto exit_failure; --- -2.27.0 - diff --git a/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch b/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch new file mode 100644 index 000000000..89dd3c763 --- /dev/null +++ b/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch @@ -0,0 +1,40 @@ +From bc59536c202ba134422a42fe4dfdfe0643806c8f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 29 Jan 2021 22:21:00 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for nds32 + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/af8ba07ea0c12ab8cd24d528ef98db05521f3d36 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rsmarples/dhcpcd/pull/21] +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 2226659b..e81689bb 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -182,6 +182,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # else + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MIPS + # endif ++#elif defined(__nds32__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32 + #elif defined(__powerpc64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 + #elif defined(__powerpc__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/dhcpcd.hash b/buildroot/package/dhcpcd/dhcpcd.hash index 6991e7368..413f5c842 100644 --- a/buildroot/package/dhcpcd/dhcpcd.hash +++ b/buildroot/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.1.4.tar.xz.distinfo -sha256 5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820 dhcpcd-9.1.4.tar.xz +# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo +sha256 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513 dhcpcd-9.4.0.tar.xz # Locally calculated sha256 9cce1077bad23544349788ec750ec6e5aee106fc437fd6b5d73c0d8510426578 LICENSE diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk index 4900e0581..cb269f113 100644 --- a/buildroot/package/dhcpcd/dhcpcd.mk +++ b/buildroot/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 9.1.4 +DHCPCD_VERSION = 9.4.0 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf @@ -16,6 +16,11 @@ DHCPCD_CONFIG_OPTS = \ --os=linux \ --privsepuser=dhcpcd +# AUDIT_ARCH_NDS32 is only available since kernel >= 5.2 +ifeq ($(BR2_nds32):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) DHCPCD_CONFIG_OPTS += --with-udev DHCPCD_DEPENDENCIES += udev diff --git a/buildroot/package/dnsmasq/dnsmasq.hash b/buildroot/package/dnsmasq/dnsmasq.hash index 99e417f06..d141fb0c8 100644 --- a/buildroot/package/dnsmasq/dnsmasq.hash +++ b/buildroot/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.81.tar.xz.asc -sha256 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb dnsmasq-2.81.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.83.tar.xz.asc +sha256 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c dnsmasq-2.84.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/buildroot/package/dnsmasq/dnsmasq.mk b/buildroot/package/dnsmasq/dnsmasq.mk index 4a7218a2b..76b48f952 100644 --- a/buildroot/package/dnsmasq/dnsmasq.mk +++ b/buildroot/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.81 +DNSMASQ_VERSION = 2.84 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -14,6 +14,7 @@ DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 +DNSMASQ_CPE_ID_VENDOR = thekelleys DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) @@ -77,13 +78,7 @@ DNSMASQ_DEPENDENCIES += ubus DNSMASQ_COPTS += -DHAVE_UBUS endif -define DNSMASQ_FIX_PKGCONFIG - $(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \ - $(DNSMASQ_DIR)/Makefile -endef - define DNSMASQ_BUILD_CMDS - $(DNSMASQ_FIX_PKGCONFIG) $(DNSMASQ_TWEAK_LIBLUA) $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N) endef diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index 66abfe522..95b15b539 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 21b88a00e8f7a3194c0ae1de5a31e3e1728ef6aa2804158dcb502a8b5fd6ae2b docker-cli-19.03.13.tar.gz -sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE +sha256 aafba3765d9013cb75810b4f4334525f0e74e82ef073b4df9e8b524f3794e60a docker-cli-20.10.3.tar.gz +sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 86fffafdb..d90c3b7d1 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.13 +DOCKER_CLI_VERSION = 20.10.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index 2eed6e346..7c74da708 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -8,15 +8,27 @@ DOCKER_CONTAINERD_VERSION = 1.4.3 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE +DOCKER_CONTAINERD_CPE_ID_VENDOR = linuxfoundation +DOCKER_CONTAINERD_CPE_ID_PRODUCT = containerd DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd DOCKER_CONTAINERD_LDFLAGS = \ -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION) -DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim +DOCKER_CONTAINERD_BUILD_TARGETS = \ + cmd/containerd \ + cmd/containerd-shim \ + cmd/containerd-shim-runc-v1 \ + cmd/containerd-shim-runc-v2 \ + cmd/ctr -DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim +DOCKER_CONTAINERD_INSTALL_BINS = $(notdir $(DOCKER_CONTAINERD_BUILD_TARGETS)) + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +DOCKER_CONTAINERD_DEPENDENCIES += libapparmor +DOCKER_CONTAINERD_TAGS += apparmor +endif ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_CONTAINERD_DEPENDENCIES += libapparmor @@ -34,12 +46,4 @@ else DOCKER_CONTAINERD_TAGS += no_btrfs endif -define DOCKER_CONTAINERD_INSTALL_SYMLINKS - ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc - ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim - ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd -endef - -DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS - $(eval $(golang-package)) diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index e7d593268..69ebd113e 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f43331fef1d24e31f43392fc1fed72b48fc17fd432d341d6eb1f68ca11383406 docker-engine-19.03.13.tar.gz -sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE +sha256 62bb03f197b8a064da568e62639f6834f91c8cfc9273126a978847becc214c31 docker-engine-20.10.3.tar.gz +sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index 7f898680b..bbc97af8b 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.13 +DOCKER_ENGINE_VERSION = 20.10.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -14,10 +14,13 @@ DOCKER_ENGINE_DEPENDENCIES = host-pkgconf DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_LDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.BuildTime="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.GitCommit="buildroot" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.IAmStatic="false" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" -DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) @@ -58,16 +61,6 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) -define DOCKER_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - BUILDTIME="$$(date)" \ - VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ - bash ./hack/make/.go-autogen -endef - -DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service diff --git a/buildroot/package/domoticz/domoticz.mk b/buildroot/package/domoticz/domoticz.mk index 0ceaab87b..0cd3520a7 100644 --- a/buildroot/package/domoticz/domoticz.mk +++ b/buildroot/package/domoticz/domoticz.mk @@ -8,6 +8,7 @@ DOMOTICZ_VERSION = 2020.1 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt +DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ host-pkgconf \ diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk index 3100bfbc9..8635ea5c4 100644 --- a/buildroot/package/dovecot/dovecot.mk +++ b/buildroot/package/dovecot/dovecot.mk @@ -10,6 +10,7 @@ DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT +DOVECOT_CPE_ID_VENDOR = dovecot DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ diff --git a/buildroot/package/dropbear/dropbear.mk b/buildroot/package/dropbear/dropbear.mk index 00992f066..1cbe63682 100644 --- a/buildroot/package/dropbear/dropbear.mk +++ b/buildroot/package/dropbear/dropbear.mk @@ -11,6 +11,8 @@ DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) +DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project +DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This diff --git a/buildroot/package/dt-utils/dt-utils.hash b/buildroot/package/dt-utils/dt-utils.hash index 3610fe164..e42e82578 100644 --- a/buildroot/package/dt-utils/dt-utils.hash +++ b/buildroot/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61440ab222543268923175eb5c7425076d2b8bce4c1dfc177f2eb3873449af7c dt-utils-v2019.01.0.tar.gz -sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING +sha256 737313719d7c04d7b9576fdc572d838c81ea22ea41a44c7646467018e67a0b97 dt-utils-v2019.01.0-br1.tar.gz +sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash b/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash index 73e0e7d19..a57409978 100644 --- a/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 76cb6131df1b35ed71b0f6c87cfafc188d614cfbd9973e7832a65ba63e85c504 dtv-scan-tables-6d019038cd04e837d9dd58701202c15924c1c654.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL +sha256 fc65b1f85195ab3d877f7ce802dc62b8c70b3a1815fa6e6a69de19a9d354c19a dtv-scan-tables-6d019038cd04e837d9dd58701202c15924c1c654-br1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/buildroot/package/dump1090/Config.in b/buildroot/package/dump1090/Config.in index c796faef9..8f1792923 100644 --- a/buildroot/package/dump1090/Config.in +++ b/buildroot/package/dump1090/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_DUMP1090 bool "dump1090" depends on BR2_TOOLCHAIN_HAS_THREADS # librtlsdr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librtlsdr -> libusb select BR2_PACKAGE_LIBRTLSDR help Dump1090 is a simple Mode S decoder for RTLSDR devices https://github.com/MalcolmRobb/dump1090 -comment "dump1090 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "dump1090 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/ebtables/ebtables.mk b/buildroot/package/ebtables/ebtables.mk index e8b982206..54932334c 100644 --- a/buildroot/package/ebtables/ebtables.mk +++ b/buildroot/package/ebtables/ebtables.mk @@ -8,6 +8,8 @@ EBTABLES_VERSION = 2.0.11 EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING +EBTABLES_CPE_ID_VENDOR = netfilter +EBTABLES_SELINUX_MODULES = iptables ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE @@ -31,4 +33,11 @@ endef EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_REMOVE_UTILS_RESTORE endif +ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES),) +define EBTABLES_INSTALL_LEGACY_SYMLINK + ln -sf /usr/sbin/ebtables-legacy $(TARGET_DIR)/sbin/ebtables +endef +EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_LEGACY_SYMLINK +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk b/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk index 3a3253a36..f087e81a4 100644 --- a/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk @@ -9,6 +9,7 @@ ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download ECRYPTFS_UTILS_LICENSE = GPL-2.0+ ECRYPTFS_UTILS_LICENSE_FILES = COPYING +ECRYPTFS_UTILS_CPE_ID_VENDOR = ecryptfs ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap diff --git a/buildroot/package/ed/ed.mk b/buildroot/package/ed/ed.mk index deb900e28..1b299781d 100644 --- a/buildroot/package/ed/ed.mk +++ b/buildroot/package/ed/ed.mk @@ -9,6 +9,7 @@ ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_LICENSE = GPL-3.0+ ED_LICENSE_FILES = COPYING +ED_CPE_ID_VENDOR = gnu define ED_CONFIGURE_CMDS (cd $(@D); \ diff --git a/buildroot/package/edid-decode/edid-decode.hash b/buildroot/package/edid-decode/edid-decode.hash index 3d7e94540..65d6c7107 100644 --- a/buildroot/package/edid-decode/edid-decode.hash +++ b/buildroot/package/edid-decode/edid-decode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 327fe14531ddebe74a730efc30209e68efbd86c11375b5576cbe23af3d691150 edid-decode-188950472c19492547e298b27f9da0d72cf826df.tar.gz +sha256 c1a6222083c59f0499b3e43c159aee7e4c6c07d33b790d490a13fd62942fa9b5 edid-decode-188950472c19492547e298b27f9da0d72cf826df-br1.tar.gz sha256 9bc7ab961e9a07dc84eaa0210af388def56d024357e79671fb89fe27d073eed7 LICENSE diff --git a/buildroot/package/efl/Config.in b/buildroot/package/efl/Config.in index d4a8762de..305d1469a 100644 --- a/buildroot/package/efl/Config.in +++ b/buildroot/package/efl/Config.in @@ -143,15 +143,11 @@ comment "Warning: one of the recommended option for EFL is not enabled" config BR2_PACKAGE_EFL_EOLIAN_CPP bool "Enable Eolian C++ bindings" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # Eolian needs C++11 help Eolian is an EO object parser and code generator. With this option enabled Eolian will handle automatic generation of EFL bindings for the C++11 language. -comment "Eolian needs gcc >= 4.8" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - comment "libecore video support" config BR2_PACKAGE_EFL_FB @@ -270,17 +266,11 @@ config BR2_PACKAGE_EFL_SVG bool "SVG loader" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO help This option enables the Evas generic SVG loader -comment "SVG loader needs a toolchain w/ gcc >= 4.8" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - endif # BR2_PACKAGE_EFL comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.9, host gcc >= 4.9, threads, wchar" diff --git a/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch index 01a5362e5..ffacb6daf 100644 --- a/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch +++ b/buildroot/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch @@ -1,6 +1,6 @@ -From 277103e886c9b3ddfede8b3f5b92d3e94736f404 Mon Sep 17 00:00:00 2001 +From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Fri, 23 Nov 2018 16:13:21 +0100 +Date: Fri, 20 Nov 2020 00:33:30 +0100 Subject: [PATCH] Makefile.in: do not download or compile dependencies Signed-off-by: Johan Oudinet @@ -9,10 +9,10 @@ Signed-off-by: Johan Oudinet 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 48dca7d8..d2324dae 100644 +index abd64835..06f876bb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -94,7 +94,7 @@ ifneq ($(INSTALLGROUP),) +@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),) G_USER=-g $(INSTALLGROUP) endif @@ -21,7 +21,7 @@ index 48dca7d8..d2324dae 100644 deps: deps/.got -@@ -108,7 +108,7 @@ deps/.built: deps/.got +@@ -111,7 +111,7 @@ deps/.built: deps/.got $(REBAR) configure-deps $(REBAR) compile && :> deps/.built @@ -31,5 +31,5 @@ index 48dca7d8..d2324dae 100644 update: -- -2.17.1 +2.29.2 diff --git a/buildroot/package/ejabberd/ejabberd.hash b/buildroot/package/ejabberd/ejabberd.hash index 145e7401a..0d57ada5b 100644 --- a/buildroot/package/ejabberd/ejabberd.hash +++ b/buildroot/package/ejabberd/ejabberd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 18ddf61af22fc9b59f8afc6835aae2aee9896eb91cc1030056d6bca6a1fa40d2 ejabberd-19.09.1.tgz -sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING +sha256 9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8 ejabberd-20.07.tgz +sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/buildroot/package/ejabberd/ejabberd.mk b/buildroot/package/ejabberd/ejabberd.mk index 3419c6e59..a0b4a6354 100644 --- a/buildroot/package/ejabberd/ejabberd.mk +++ b/buildroot/package/ejabberd/ejabberd.mk @@ -4,9 +4,9 @@ # ################################################################################ -EJABBERD_VERSION = 19.09.1 +EJABBERD_VERSION = 20.07 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz -EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION) +EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception EJABBERD_LICENSE_FILES = COPYING EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ diff --git a/buildroot/package/elfutils/elfutils.mk b/buildroot/package/elfutils/elfutils.mk index 3d37c4634..42f2f8b30 100644 --- a/buildroot/package/elfutils/elfutils.mk +++ b/buildroot/package/elfutils/elfutils.mk @@ -43,6 +43,10 @@ ELFUTILS_CONF_ENV += \ ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ELFUTILS_LDFLAGS += -latomic +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) ELFUTILS_DEPENDENCIES += musl-fts ELFUTILS_LDFLAGS += -lfts diff --git a/buildroot/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch b/buildroot/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch new file mode 100644 index 000000000..3e0002300 --- /dev/null +++ b/buildroot/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch @@ -0,0 +1,47 @@ +From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001 +From: Denis Kenzior +Date: Mon, 30 Nov 2020 13:00:11 -0600 +Subject: [PATCH] build: Add rawmemchr to missing.h + +For those systems (i.e. musl) that do not support this + +[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81] +Signed-off-by: Peter Seiderer +--- + configure.ac | 1 + + ell/missing.h | 10 ++++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 1e5ead9..f34add1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan], + ]) + + AC_CHECK_FUNCS(explicit_bzero) ++AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, + AC_MSG_ERROR(signalfd support is required)) +diff --git a/ell/missing.h b/ell/missing.h +index 6b9b0fd..2a3e647 100644 +--- a/ell/missing.h ++++ b/ell/missing.h +@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n) + #ifndef SO_BINDTOIFINDEX + #define SO_BINDTOIFINDEX 62 + #endif ++ ++#ifndef HAVE_RAWMEMCHR ++static inline void *rawmemchr(const void *s, int c) ++{ ++_Pragma("GCC diagnostic push") ++_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") ++ return memchr(s, c, (size_t) -1); ++_Pragma("GCC diagnostic pop") ++} ++#endif +-- +2.29.2 + diff --git a/buildroot/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch b/buildroot/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch new file mode 100644 index 000000000..a2ac7b096 --- /dev/null +++ b/buildroot/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch @@ -0,0 +1,26 @@ +From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= +Date: Mon, 30 Nov 2020 18:40:33 -0300 +Subject: [PATCH] ell: add missing include in dhcp-server. + +[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=6dfff19d4716ba216de1a3298ed0f667d7782810] +Signed-off-by: Peter Seiderer +--- + ell/dhcp-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c +index c983ed4..144e83e 100644 +--- a/ell/dhcp-server.c ++++ b/ell/dhcp-server.c +@@ -24,6 +24,7 @@ + #include + #endif + ++#include + #include + #include + #include +-- +2.29.2 + diff --git a/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch b/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch deleted file mode 100644 index ba6cafa7a..000000000 --- a/buildroot/package/ell/0002-ell-rtnl-fix-compile-with-older-toolchains.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 60b4cd4c703be380aef194d31a1ffc4b42431bde Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 9 Apr 2020 22:21:36 +0200 -Subject: [PATCH] ell/rtnl: fix compile with older toolchains - -Older toolchains need to include sys/types.h and sys/socket.h before -linux/if.h, RTA_PREF was introduces with linux-4.1.x. - -Fixes: - - In file included from ell/rtnl.c:28:0: - .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:185:19: error: field 'ifru_addr' has incomplete type - .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:186:19: error: field 'ifru_dstaddr' has incomplete type - .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:187:19: error: field 'ifru_broadaddr' has incomplete type - .../host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:188:19: error: field 'ifru_netmask' has incomplete type - .../arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:189:20: error: field 'ifru_hwaddr' has incomplete type - ell/rtnl.c: In function 'l_rtnl_route_extract': - ell/rtnl.c:120:8: error: 'RTA_PREF' undeclared (first use in this function) - -[Upstream: https://lists.ofono.org/hyperkitty/list/ell@lists.01.org/thread/TOJ5XEY7X6WMOMJHX4KWI5LFEOX2QTBQ] -Signed-off-by: Peter Seiderer ---- - configure.ac | 2 ++ - ell/rtnl.c | 7 ++++++- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0351f89..3be35a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,6 +113,8 @@ AC_CHECK_LIB(dl, dlopen, dummy=yes, - - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) - -+AC_CHECK_DECLS([RTA_PREF], [], [], [[#include ]]) -+ - AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], - [enable ell/glib main loop example]), - [enable_glib=${enableval}]) -diff --git a/ell/rtnl.c b/ell/rtnl.c -index dc83937..3493d34 100644 ---- a/ell/rtnl.c -+++ b/ell/rtnl.c -@@ -25,8 +25,9 @@ - #endif - - #define _GNU_SOURCE --#include -+#include - #include -+#include - #include - - #include "util.h" -@@ -35,6 +36,10 @@ - #include "rtnl.h" - #include "private.h" - -+#if defined HAVE_DECL_RTA_PREF && !HAVE_DECL_RTA_PREF -+#define RTA_PREF 20 -+#endif -+ - static size_t rta_add_u8(void *rta_buf, unsigned short type, uint8_t value) - { - struct rtattr *rta = rta_buf; --- -2.26.0 - diff --git a/buildroot/package/ell/Config.in b/buildroot/package/ell/Config.in index d33715487..c7c916481 100644 --- a/buildroot/package/ell/Config.in +++ b/buildroot/package/ell/Config.in @@ -2,14 +2,12 @@ config BR2_PACKAGE_ELL bool "ell" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 - depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR help Embedded Linux library (ell) https://01.org/ell -comment "ell needs a toolchain w/ dynamic library, wchar, headers >= 4.12" +comment "ell needs a toolchain w/ wchar, headers >= 4.12" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/buildroot/package/ell/ell.hash b/buildroot/package/ell/ell.hash index 43324e658..efd39b31d 100644 --- a/buildroot/package/ell/ell.hash +++ b/buildroot/package/ell/ell.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fc3fd66739008fabf4b62f8bc1b37110cc44b9e8233c34f8d991939d0e0247b6 ell-0.33.tar.gz +sha256 c2b3848568c75bcf5a0e7d1f2efce4fdb2733d28226ed21c6a6542f0be05d784 ell-0.35-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/ell/ell.mk b/buildroot/package/ell/ell.mk index f35c02250..8aec067bc 100644 --- a/buildroot/package/ell/ell.mk +++ b/buildroot/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.33 +ELL_VERSION = 0.35 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git ELL_SITE_METHOD = git ELL_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/environment-setup/environment-setup b/buildroot/package/environment-setup/environment-setup index 813aa01c7..e9bc36fdd 100644 --- a/buildroot/package/environment-setup/environment-setup +++ b/buildroot/package/environment-setup/environment-setup @@ -10,6 +10,7 @@ cat <<'EOF' Some tips: * PATH now contains the SDK utilities * Standard autotools variables (CC, LD, CFLAGS) are exported +* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported * To configure do "./configure $CONFIGURE_FLAGS" or use the "configure" alias * To build CMake-based projects, use the "cmake" alias diff --git a/buildroot/package/environment-setup/environment-setup.mk b/buildroot/package/environment-setup/environment-setup.mk index fb87c6f0b..fcad013f0 100644 --- a/buildroot/package/environment-setup/environment-setup.mk +++ b/buildroot/package/environment-setup/environment-setup.mk @@ -11,6 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS for var in $(TARGET_CONFIGURE_OPTS); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done + printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE) printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -31,6 +32,10 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS $(ENVIRONMENT_SETUP_FILE) printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \ >> $(ENVIRONMENT_SETUP_FILE) + + $(if $(BR2_LINUX_KERNEL),\ + printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \ + >> $(ENVIRONMENT_SETUP_FILE),) endef $(eval $(host-generic-package)) diff --git a/buildroot/package/erlang-eimp/erlang-eimp.hash b/buildroot/package/erlang-eimp/erlang-eimp.hash index a0276bede..28d22be16 100644 --- a/buildroot/package/erlang-eimp/erlang-eimp.hash +++ b/buildroot/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfcdc211480f974175af615616c7f8c1e8f9dff5d6be5faa3f20c3eb4c60240e erlang-eimp-1.0.12.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922 erlang-eimp-1.0.17.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-eimp/erlang-eimp.mk b/buildroot/package/erlang-eimp/erlang-eimp.mk index c8cea0e42..d066961cd 100644 --- a/buildroot/package/erlang-eimp/erlang-eimp.mk +++ b/buildroot/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.12 +ERLANG_EIMP_VERSION = 1.0.17 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION)) ERLANG_EIMP_LICENSE = Apache-2.0 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-jiffy/erlang-jiffy.hash b/buildroot/package/erlang-jiffy/erlang-jiffy.hash index 1c18142b6..19e4f9601 100644 --- a/buildroot/package/erlang-jiffy/erlang-jiffy.hash +++ b/buildroot/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz -sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE +sha256 7cf67840c58b8732e12c84c8a3b714774da2601ae5e6a57f286273e25b205516 erlang-jiffy-1.0.6.tar.gz +sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/buildroot/package/erlang-jiffy/erlang-jiffy.mk b/buildroot/package/erlang-jiffy/erlang-jiffy.mk index 9a688f7c9..e50a5f598 100644 --- a/buildroot/package/erlang-jiffy/erlang-jiffy.mk +++ b/buildroot/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 0.14.11 +ERLANG_JIFFY_VERSION = 1.0.6 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ diff --git a/buildroot/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch b/buildroot/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch new file mode 100644 index 000000000..a27730e23 --- /dev/null +++ b/buildroot/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch @@ -0,0 +1,26 @@ +From a2422fdf4097d1f5f8c8f88bbe08b9a0f3c35fe6 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Wed, 25 Nov 2020 22:38:22 +0100 +Subject: [PATCH] rebar.config.script: remove extra dependency to base64url + +Signed-off-by: Johan Oudinet +--- + rebar.config.script | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rebar.config.script b/rebar.config.script +index a63895e..41b2970 100644 +--- a/rebar.config.script ++++ b/rebar.config.script +@@ -62,7 +62,7 @@ Cfg2 = case IsRebar3 of + [{plugin_dir, filename:join([filename:dirname(SCRIPT),"plugins"])}, + {plugins, [override_deps_versions]}] ++ + ModCfg(CONFIG, [deps], fun(V) -> +- V ++ [{base64url, ".*", {git, "git://github.com/dvv/base64url.git", {tag, "v1.0"}}}] ++ V + end, []) + end, + +-- +2.29.2 + diff --git a/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash b/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash index 036cb923b..af13e88b1 100644 --- a/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash +++ b/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 556a9628c323a5a83116ed78599c891f74447b0bac237c095e776c7009089656 erlang-p1-acme-1.0.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632 erlang-p1-acme-1.0.9.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk b/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk index ae77d4a58..21c155e20 100644 --- a/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk +++ b/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ACME_VERSION = 1.0.1 +ERLANG_P1_ACME_VERSION = 1.0.9 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION)) ERLANG_P1_ACME_LICENSE = Apache-2.0 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index 605ced2ba..85a92cf0b 100644 --- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 572b6532dca59c561d994bf2bf8eed3637118c64cdd3a9e51d81b506f5b09e2c erlang-p1-cache-tab-1.0.20.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9 erlang-p1-cache-tab-1.0.25.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index 0d53358cf..f3253d1cd 100644 --- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.20 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.25 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash index 43e98d069..cf1a880cb 100644 --- a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash +++ b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 034d564e92ca8e9d66668548ea510d2cf9fdbad40609622a87374aa907110884 erlang-p1-mqtree-1.0.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189 erlang-p1-mqtree-1.0.10.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk index bd5f28237..19e31ef1b 100644 --- a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk +++ b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_MQTREE_VERSION = 1.0.5 +ERLANG_P1_MQTREE_VERSION = 1.0.10 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION)) ERLANG_P1_MQTREE_LICENSE = Apache-2.0 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index ed5ea5514..a6d00aa96 100644 --- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55bf54133ce0882fab59f813ddf9ed4dac1e051a53fb4bd1c0565136ebb4d6ac erlang-p1-oauth2-0.6.5.tar.gz -sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE +sha256 c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811 erlang-p1-oauth2-0.6.7.tar.gz +sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index ea7c23a51..d7dd45b25 100644 --- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.5 +ERLANG_P1_OAUTH2_VERSION = 0.6.7 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash index b11340b87..b0ee7d58b 100644 --- a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash +++ b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 184069d9055991cb8b7bd07dde8737a0a793e66e1ec1020deb680f83260a3e82 erlang-p1-pkix-1.0.4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e erlang-p1-pkix-1.0.6.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk index 9f902d44b..12ae04213 100644 --- a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk +++ b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_PKIX_VERSION = 1.0.4 +ERLANG_P1_PKIX_VERSION = 1.0.6 ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION)) ERLANG_P1_PKIX_LICENSE = Apache-2.0 ERLANG_P1_PKIX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-sip/0001-correct-include.patch b/buildroot/package/erlang-p1-sip/0001-correct-include.patch new file mode 100644 index 000000000..90d68b518 --- /dev/null +++ b/buildroot/package/erlang-p1-sip/0001-correct-include.patch @@ -0,0 +1,31 @@ +From 5ad4f871df7cbbc973708cb7380c3410b20bde1c Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Tue, 1 Dec 2020 23:07:51 +0100 +Subject: [PATCH] correct include + +This part of the code was moved into it's own project and was packaged +separately by me. To make the build process work, this small fix is +necessary. + +Author: Philipp Huebner +Signed-off-by: Johan Oudinet +--- + src/esip_socket.erl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/esip_socket.erl b/src/esip_socket.erl +index 4154faa..db5fa92 100644 +--- a/src/esip_socket.erl ++++ b/src/esip_socket.erl +@@ -37,7 +37,7 @@ + + -include("esip.hrl"). + -include("esip_lib.hrl"). +--include_lib("stun/include/stun.hrl"). ++-include_lib("p1_stun/include/stun.hrl"). + + -define(TCP_SEND_TIMEOUT, 15000). + -define(CONNECT_TIMEOUT, 20000). +-- +2.28.0 + diff --git a/buildroot/package/erlang-p1-sip/0001-fix-includes.patch b/buildroot/package/erlang-p1-sip/0001-fix-includes.patch deleted file mode 100644 index 80e2ab36c..000000000 --- a/buildroot/package/erlang-p1-sip/0001-fix-includes.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: correct include - This part of the code was moved into it's own project and was packaged - separately by me. To make the build process work, this small fix is - necessary. -Author: Philipp Huebner - -Index: erlang-p1-sip/src/esip_socket.erl -=================================================================== ---- erlang-p1-sip.orig/src/esip_socket.erl -+++ erlang-p1-sip/src/esip_socket.erl -@@ -22,7 +22,7 @@ - - -include("esip.hrl"). - -include("esip_lib.hrl"). ---include("stun.hrl"). -+-include_lib("p1_stun/include/stun.hrl"). - - -define(TCP_SEND_TIMEOUT, 15000). - -define(CONNECT_TIMEOUT, 20000). diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash index 70b20f95d..e52371e40 100644 --- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4c8dbba1dfcbb16a300fea5fd75f5ab2a145f011fa1ebff37e31e1672a9bc285 erlang-p1-sip-1.0.30.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 b46349a7077d8e5f36a216ada4a5c0b51ef3d66005606beb0ea3962069f215a7 erlang-p1-sip-1.0.38.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk index f7f10caf9..2d2f0110c 100644 --- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.30 +ERLANG_P1_SIP_VERSION = 1.0.38 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = Apache-2.0 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index bd1995cb7..e23cc4f38 100644 --- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 119b751f569baecc4d911ff3c2a6a33a042f8d0b2e64445072d1af14ed935fc0 erlang-p1-stringprep-1.0.17.tar.gz -sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL -sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 47f9f8ee901f47b7f62c5140ea09f113efe7fedd5e8ffb92d50f51c5e11fb67f erlang-p1-stringprep-1.0.23.tar.gz +sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL +sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 49ffb77cd..580f4a9aa 100644 --- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.17 +ERLANG_P1_STRINGPREP_VERSION = 1.0.23 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash index bf569201b..fb56b8f4e 100644 --- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 87cfd9d75c7b956b4c26c9e94492737a4528abf4b09f4f7d89a40abaa0dc088a erlang-p1-stun-1.0.29.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 05d2f31f172883d2301a93cd141e6b930dfdd01e10b6aacf806becc3674973d8 erlang-p1-stun-1.0.39.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk index ff2899ffb..f762e7f45 100644 --- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.29 +ERLANG_P1_STUN_VERSION = 1.0.39 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash index 135a5368d..475223b98 100644 --- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6444e174650054a53624490155a914b8bea31cdefbcd5f87fc1862102dc1db6e erlang-p1-tls-1.1.2.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 97fd0a398751fc63b28df016e92a08ea98d083f7d5e3f32380a92de1ee86ca0e erlang-p1-tls-1.1.9.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk index 824fe41ec..9e7d4c7c7 100644 --- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.1.2 +ERLANG_P1_TLS_VERSION = 1.1.9 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = Apache-2.0 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash index f749aabe3..dec7c2603 100644 --- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2559967770558dc003bcc3c7efc216f6c57c4f23830d5de33c6bf61d8a3f880c erlang-p1-utils-1.0.16.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9 erlang-p1-utils-1.0.20.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk index 5375971d3..084382cd2 100644 --- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.16 +ERLANG_P1_UTILS_VERSION = 1.0.20 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash index 07e640341..f2a4ab83e 100644 --- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f3226683ec9c8406147a025beebb5b9ed0adcb28099b7c4bb9435a369e9ac3f9 erlang-p1-xml-1.1.37.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 739f37a161a570071469ab1f3d8fc232f004ea616700fe7e46b6d8afa9d03a60 erlang-p1-xml-1.1.44.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk index c66bd2577..5730181ac 100644 --- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.37 +ERLANG_P1_XML_VERSION = 1.1.44 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch b/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch index d0a267b72..f02037fdc 100644 --- a/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch +++ b/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch @@ -6,11 +6,11 @@ diff --git a/include/xmpp.hrl b/include/xmpp.hrl index afa5f61..678858e 100644 --- a/include/xmpp.hrl +++ b/include/xmpp.hrl -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ -include("ns.hrl"). -include("jid.hrl"). -include("xmpp_codec.hrl"). ---include("fxml.hrl"). +--include_lib("fast_xml/include/fxml.hrl"). +-include_lib("p1_xml/include/fxml.hrl"). -type stanza() :: iq() | presence() | message(). diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index 05578f993..d0a761fca 100644 --- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a192349e256c0c0af46e6d7f46c52e6345e61984a266696bb0346934c434f342 erlang-p1-xmpp-1.4.2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 65c73ffaf8faab5d6fc7d42ada0b5a380f20f3e46056ad98614d81922322d9a2 erlang-p1-xmpp-1.4.10.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index 2f74c60df..f903cb945 100644 --- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.4.2 +ERLANG_P1_XMPP_VERSION = 1.4.10 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) ERLANG_P1_XMPP_LICENSE = Apache-2.0 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash index 116363203..955a00093 100644 --- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b915612c06ef190bfed6d0370906b071274ed4ce4143b668cdad66588a9484a0 erlang-p1-yaml-1.0.21.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +sha256 8f53308438e4d1613562acb586b4c4540569d8305097508c40e6f261fe4216cd erlang-p1-yaml-1.0.28.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk index 6836c3f55..e42ff5fe3 100644 --- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.21 +ERLANG_P1_YAML_VERSION = 1.0.28 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash index 6d0a9f68a..97e71f85c 100644 --- a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash +++ b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94724bde03c976cdf51d0d43eece73c70381ef60a9dd7e49292d194c0beaeb53 erlang-p1-yconf-1.0.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 ab0f7462b8d03d18be1587fa9cfb227923055f765fca4459b4bb42ccef971329 erlang-p1-yconf-1.0.8.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk index 5d44ec7ee..3e3a10ae1 100644 --- a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YCONF_VERSION = 1.0.1 +ERLANG_P1_YCONF_VERSION = 1.0.8 ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION)) ERLANG_P1_YCONF_LICENSE = Apache-2.0 ERLANG_P1_YCONF_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash index ed803d98d..7ce58762f 100644 --- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d39a3cb92ed7781b6b6ba95704e2591c626d62eddb3c52dcaeac60c339084d7 erlang-p1-zlib-1.0.6.tar.gz -sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt +sha256 f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 erlang-p1-zlib-1.0.9.tar.gz +sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk index 46a7d1286..0e6ee298e 100644 --- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.6 +ERLANG_P1_ZLIB_VERSION = 1.0.9 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = Apache-2.0 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erofs-utils/Config.in b/buildroot/package/erofs-utils/Config.in index ffb2a891d..9d9aa159c 100644 --- a/buildroot/package/erofs-utils/Config.in +++ b/buildroot/package/erofs-utils/Config.in @@ -15,4 +15,17 @@ config BR2_PACKAGE_EROFS_UTILS_LZ4 help Support LZ4 compression algorithm +config BR2_PACKAGE_EROFS_UTILS_EROFSFUSE + bool "erofsfuse support" + depends on BR2_USE_MMU # libfuse + depends on !BR2_STATIC_LIBS # libfuse + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse + select BR2_PACKAGE_LIBFUSE + help + FUSE file system client for EROFS + +comment "erofsfuse needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/buildroot/package/erofs-utils/erofs-utils.hash b/buildroot/package/erofs-utils/erofs-utils.hash index 31624b181..0de52d28a 100644 --- a/buildroot/package/erofs-utils/erofs-utils.hash +++ b/buildroot/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a14a30d0d941f6642cad130fbba70a2493fabbe7baa09a8ce7d20745ea3385d6 erofs-utils-1.1.tar.gz -sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING +sha256 6b2ea15c3b092bd9a3abd966f78bc01c6caacb94022643ff34cf69893ee04e84 erofs-utils-1.2.1.tar.gz +sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/buildroot/package/erofs-utils/erofs-utils.mk b/buildroot/package/erofs-utils/erofs-utils.mk index edc5288b1..5d547148b 100644 --- a/buildroot/package/erofs-utils/erofs-utils.mk +++ b/buildroot/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.1 +EROFS_UTILS_VERSION = 1.2.1 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING @@ -21,8 +21,22 @@ else EROFS_UTILS_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +EROFS_UTILS_CONF_OPTS += --with-selinux +EROFS_UTILS_DEPENDENCIES += libselinux +else +EROFS_UTILS_CONF_OPTS += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_EROFS_UTILS_EROFSFUSE),y) +EROFS_UTILS_CONF_OPTS += --enable-fuse +EROFS_UTILS_DEPENDENCIES += libfuse +else +EROFS_UTILS_CONF_OPTS += --disable-fuse +endif + HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 -HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 +HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --disable-fuse --without-selinux $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/ethtool/ethtool.hash b/buildroot/package/ethtool/ethtool.hash index 3c17fca51..334ff8d50 100644 --- a/buildroot/package/ethtool/ethtool.hash +++ b/buildroot/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 2f3b54d08d048f5977b80cb6cb4744994370def7553ee634d39dbbb6ccf87546 ethtool-5.8.tar.xz +sha256 817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf ethtool-5.10.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/buildroot/package/ethtool/ethtool.mk b/buildroot/package/ethtool/ethtool.mk index 1668171f3..c9765eccf 100644 --- a/buildroot/package/ethtool/ethtool.mk +++ b/buildroot/package/ethtool/ethtool.mk @@ -4,11 +4,12 @@ # ################################################################################ -ETHTOOL_VERSION = 5.8 +ETHTOOL_VERSION = 5.10 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 ETHTOOL_LICENSE_FILES = LICENSE COPYING +ETHTOOL_CPE_ID_VENDOR = kernel ETHTOOL_CONF_OPTS = \ $(if $(BR2_PACKAGE_ETHTOOL_PRETTY_PRINT),--enable-pretty-dump,--disable-pretty-dump) diff --git a/buildroot/package/exfat-utils/exfat-utils.mk b/buildroot/package/exfat-utils/exfat-utils.mk index 16d5aa03d..d13ec6bab 100644 --- a/buildroot/package/exfat-utils/exfat-utils.mk +++ b/buildroot/package/exfat-utils/exfat-utils.mk @@ -6,7 +6,7 @@ EXFAT_UTILS_VERSION = 1.3.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) -EXFAT_UTILS_LICENSE = GPL-3.0+ +EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ diff --git a/buildroot/package/exfat/exfat.mk b/buildroot/package/exfat/exfat.mk index d8744feb9..e23495152 100644 --- a/buildroot/package/exfat/exfat.mk +++ b/buildroot/package/exfat/exfat.mk @@ -8,7 +8,7 @@ EXFAT_VERSION = 1.3.0 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz EXFAT_DEPENDENCIES = libfuse host-pkgconf -EXFAT_LICENSE = GPL-3.0+ +EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index 19a62f497..53185c4bb 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -9,6 +9,7 @@ EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ EXIM_LICENSE_FILES = LICENCE +EXIM_CPE_ID_VENDOR = exim EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf # Modify a variable value. It must already exist in the file, either diff --git a/buildroot/package/exiv2/exiv2.mk b/buildroot/package/exiv2/exiv2.mk index 78b9c2e42..3d4cf4173 100644 --- a/buildroot/package/exiv2/exiv2.mk +++ b/buildroot/package/exiv2/exiv2.mk @@ -9,13 +9,10 @@ EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION)) EXIV2_INSTALL_STAGING = YES EXIV2_LICENSE = GPL-2.0+ EXIV2_LICENSE_FILES = COPYING +EXIV2_CPE_ID_VENDOR = exiv2 EXIV2_CONF_OPTS += -DEXIV2_BUILD_SAMPLES=OFF -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling. -EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON else diff --git a/buildroot/package/expat/expat.mk b/buildroot/package/expat/expat.mk index bb04ab1a9..201e18ae6 100644 --- a/buildroot/package/expat/expat.mk +++ b/buildroot/package/expat/expat.mk @@ -12,6 +12,7 @@ EXPAT_DEPENDENCIES = host-pkgconf HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING +EXPAT_CPE_ID_VENDOR = libexpat EXPAT_CONF_OPTS = --without-docbook HOST_EXPAT_CONF_OPTS = --without-docbook diff --git a/buildroot/package/faad2/faad2.hash b/buildroot/package/faad2/faad2.hash index e9aa78051..2eb11d73a 100644 --- a/buildroot/package/faad2/faad2.hash +++ b/buildroot/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9728b2b94f94ab49363cd229e7377fbe6ef3c311c5cd80da662d53ddb0ee091d faad2-2.9.2.tar.gz +sha256 0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb faad2-2.10.0.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/buildroot/package/faad2/faad2.mk b/buildroot/package/faad2/faad2.mk index 69c44461f..d085c814b 100644 --- a/buildroot/package/faad2/faad2.mk +++ b/buildroot/package/faad2/faad2.mk @@ -4,10 +4,12 @@ # ################################################################################ -FAAD2_VERSION = 2.9.2 +FAAD2_VERSION = 2.10.0 FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION))) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING +FAAD2_CPE_ID_VENDOR = audiocoding +FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 # frontend/faad calls frexp() FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES diff --git a/buildroot/package/fail2ban/fail2ban.mk b/buildroot/package/fail2ban/fail2ban.mk index a4ee0852c..d2fe19d11 100644 --- a/buildroot/package/fail2ban/fail2ban.mk +++ b/buildroot/package/fail2ban/fail2ban.mk @@ -8,6 +8,7 @@ FAIL2BAN_VERSION = 0.11.1 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING +FAIL2BAN_CPE_ID_VENDOR = fail2ban FAIL2BAN_SETUP_TYPE = distutils ifeq ($(BR2_PACKAGE_PYTHON3),y) diff --git a/buildroot/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/buildroot/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch new file mode 100644 index 000000000..574e55e33 --- /dev/null +++ b/buildroot/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch @@ -0,0 +1,45 @@ +From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 20:59:25 -0800 +Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc 2.33 does does declare `_STAT_VER` anymore. + +Based on patch from Jan Pazdziora: +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/ + +Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7 + +Signed-off-by: Ilya Lipnitskiy +Signed-off-by: Jörg Krause +--- + libfakeroot.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 3e80e38..14cdbc4 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -90,6 +90,16 @@ + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif ++ + /* + These INT_* (which stands for internal) macros should always be used when + the fakeroot library owns the storage of the stat variable. +-- +2.30.1 + diff --git a/buildroot/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/buildroot/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch new file mode 100644 index 000000000..8115598d6 --- /dev/null +++ b/buildroot/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch @@ -0,0 +1,80 @@ +From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 21:00:04 -0800 +Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch add wrappers for newly exported symbols in glibc 2.33. + +Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7 + +Signed-off-by: Ilya Lipnitskiy +Signed-off-by: Jörg Krause +--- + libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 14cdbc4..d75c51f 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath, + #endif /* HAVE_FSTATAT */ + + ++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) ++/* Glibc 2.33 exports symbols for these functions in the shared lib */ ++ int lstat(const char *file_name, struct stat *statbuf) { ++ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); ++ } ++ int stat(const char *file_name, struct stat *st) { ++ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat(int fd, struct stat *st) { ++ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) { ++ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ ++ #ifdef STAT64_SUPPORT ++ int lstat64(const char *file_name, struct stat64 *st) { ++ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int stat64(const char *file_name, struct stat64 *st) { ++ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat64(int fd, struct stat64 *st) { ++ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) { ++ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ #endif ++ ++ int mknod(const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev); ++ } ++ ++ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT) ++ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); ++ } ++ #endif ++#endif /* GLIBC_PREREQ */ ++ ++ + #ifdef FAKEROOT_FAKENET + pid_t fork(void) + { +-- +2.30.1 + diff --git a/buildroot/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch b/buildroot/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch new file mode 100644 index 000000000..38dfea868 --- /dev/null +++ b/buildroot/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch @@ -0,0 +1,66 @@ +From 432dd46e662772020306a2ce8b1be38321697e69 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 19:32:08 -0800 +Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Switch default to assume * and not the absence of *. + +On glibc 2.33+, there is no definition for these functions in header +files, so the compile test doesn't work. But, we can default to using +the pointer (as is the case with newer glibc), and use the header file +on older platforms to fail the test and use no pointer. + +Backported from: c3eebec293e35b997bb46c22fb5a4e114afb5e7f + +Signed-off-by: Ilya Lipnitskiy +Signed-off-by: Jörg Krause +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 73415d2..d85566f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) + ]], [[ + int __xmknod ( int ver, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNOD_FRTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNOD_FRTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNOD_FRTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) + int __xmknodat ( int ver, + int dirfd, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNODAT_FIFTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNODAT_FIFTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNODAT_FIFTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +-- +2.30.1 + diff --git a/buildroot/package/fakeroot/0005-fix-build-regression-on-macOS.patch b/buildroot/package/fakeroot/0005-fix-build-regression-on-macOS.patch new file mode 100644 index 000000000..d5589a79f --- /dev/null +++ b/buildroot/package/fakeroot/0005-fix-build-regression-on-macOS.patch @@ -0,0 +1,63 @@ +From 3590b817df703a256f2c1de9a5f5469eaa1c86e9 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Mon, 15 Feb 2021 11:07:56 -0800 +Subject: [PATCH] fix build regression on macOS + +Signed-off-by: Felix Fietkau +Signed-off-by: Ilya Lipnitskiy +[Ryan: backported from 8090dffdad8fda86dccd47ce7a7db8840bdf7d7b] +Signed-off-by: Ryan Barnett +--- + configure.ac | 6 ++++++ + libfakeroot.c | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d85566f..d635df1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,6 +181,9 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) + #include + #include + ]], [[ ++#ifndef __GLIBC__ ++#error no extra * ++#endif + int __xmknod ( int ver, + const char *pathname , + mode_t mode , dev_t *dev); +@@ -207,6 +210,9 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) + #include + #include + ]], [[ ++#ifndef __GLIBC__ ++#error no extra * ++#endif + int __xmknodat ( int ver, + int dirfd, + const char *pathname , +diff --git a/libfakeroot.c b/libfakeroot.c +index d75c51f..ec4e577 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1352,7 +1352,8 @@ int renameat(int olddir_fd, const char *oldpath, + #endif /* HAVE_FSTATAT */ + + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) ++#if defined(__GLIBC__) ++#if __GLIBC_PREREQ(2,33) + /* Glibc 2.33 exports symbols for these functions in the shared lib */ + int lstat(const char *file_name, struct stat *statbuf) { + return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); +@@ -1397,6 +1398,7 @@ int renameat(int olddir_fd, const char *oldpath, + return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); + } + #endif ++#endif /* __GLIBC__ */ + #endif /* GLIBC_PREREQ */ + + +-- +2.25.1 + diff --git a/buildroot/package/fakeroot/fakeroot.mk b/buildroot/package/fakeroot/fakeroot.mk index 957f0a53b..c3312b777 100644 --- a/buildroot/package/fakeroot/fakeroot.mk +++ b/buildroot/package/fakeroot/fakeroot.mk @@ -15,7 +15,7 @@ HOST_FAKEROOT_DEPENDENCIES = host-acl HOST_FAKEROOT_CONF_ENV = \ ac_cv_header_sys_capability_h=no \ ac_cv_func_capset=no -# upstream does not ship with configure script anymore +# patching configure.ac in patch 0003 HOST_FAKEROOT_AUTORECONF = YES FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING diff --git a/buildroot/package/fbgrab/fbgrab.hash b/buildroot/package/fbgrab/fbgrab.hash index 414a93c99..4d9a6b97d 100644 --- a/buildroot/package/fbgrab/fbgrab.hash +++ b/buildroot/package/fbgrab/fbgrab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2bfdad379579c4ca1a910d0a8ac63183ef2c12a45e6b7d402fd045d83bb3faee fbgrab-1.3.3.tar.gz +sha256 62d7aa82138ac36db0921832f3b5267b4cffc0dc22c8701857ebcb997960a32e fbgrab-1.4.tar.gz sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk index 6d2f09bc2..1ae03ae43 100644 --- a/buildroot/package/fbgrab/fbgrab.mk +++ b/buildroot/package/fbgrab/fbgrab.mk @@ -4,7 +4,7 @@ # ################################################################################ -FBGRAB_VERSION = 1.3.3 +FBGRAB_VERSION = 1.4 FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION)) FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPL-2.0 diff --git a/buildroot/package/fetchmail/fetchmail.hash b/buildroot/package/fetchmail/fetchmail.hash index b40ce7f7b..b52616384 100644 --- a/buildroot/package/fetchmail/fetchmail.hash +++ b/buildroot/package/fetchmail/fetchmail.hash @@ -1,7 +1,6 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37037213/ -sha256 26cd936ece146e056cdf79a676a33738b4eab0a5ae2edf3fce5ba034721b09bd fetchmail-6.4.8.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37215482/ +sha256 044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9 fetchmail-6.4.16.tar.xz # From https://sourceforge.net/projects/fetchmail/files/branch_6.4/ -sha1 900386d69e2731999f142d5c16b4f2b69ed87f7a fetchmail-6.4.8.tar.xz -md5 4e5e67efe498038032576fa24c7f848e fetchmail-6.4.8.tar.xz +sha1 ec910eed3db4d8c44469aabaf33f529334a2fdb5 fetchmail-6.4.16.tar.xz # Locally computed: -sha256 89d6efe79c78f965b256e007d6acc367fff982c59b6195fb6ec5895ea0fc9bd5 COPYING +sha256 8e3ec4863456a26fcd1cf84fadd4146efcb2fd8515bcec482e0f2b7060108895 COPYING diff --git a/buildroot/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk index 1835059f6..2db635ec6 100644 --- a/buildroot/package/fetchmail/fetchmail.mk +++ b/buildroot/package/fetchmail/fetchmail.mk @@ -5,11 +5,12 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).8 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).16 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING FETCHMAIL_LICENSE_FILES = COPYING +FETCHMAIL_CPE_ID_VENDOR = fetchmail FETCHMAIL_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr diff --git a/buildroot/package/ffmpeg/0003-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch b/buildroot/package/ffmpeg/0003-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch new file mode 100644 index 000000000..2892df9d8 --- /dev/null +++ b/buildroot/package/ffmpeg/0003-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch @@ -0,0 +1,36 @@ +From 2c6b3f357331e203ad87214984661c40704aceb7 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sat, 26 Jan 2019 19:48:35 +0100 +Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices + +This fixes / workarounds https://bugs.freedesktop.org/show_bug.cgi?id=105368. +It was hit frequently when watching h264 channels received via DVB-X. +Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704 + +Downloaded from Kodi ffmpeg repo: +https://github.com/xbmc/FFmpeg/commit/2c6b3f357331e203ad87214984661c40704aceb7 + +Patch was sent upstream: +http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html + +Signed-off-by: Bernd Kuhls +--- + libavcodec/vaapi_h264.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c +index dd2a6571604..e521a05c4ff 100644 +--- a/libavcodec/vaapi_h264.c ++++ b/libavcodec/vaapi_h264.c +@@ -314,6 +314,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx) + H264SliceContext *sl = &h->slice_ctx[0]; + int ret; + ++ if (pic->nb_slices == 0) { ++ ret = AVERROR_INVALIDDATA; ++ goto finish; ++ } ++ + ret = ff_vaapi_decode_issue(avctx, pic); + if (ret < 0) + goto finish; diff --git a/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch b/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch new file mode 100644 index 000000000..75a39d16f --- /dev/null +++ b/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch @@ -0,0 +1,38 @@ +From 3136f41e6db8189994a8e4f72eacc92b669776d1 Mon Sep 17 00:00:00 2001 +From: Marton Balint +Date: Sun, 15 Nov 2020 00:39:41 +0100 +Subject: [PATCH] avformat/mpegts: make sure mpegts_read_header always stops at + the first pmt + +mpegts_read_header stops parsing the file at the first PMT. However the check +that ensured this was wrong because streams can also be added before the first +PMT is received (e.g. EIT). + +So let's make sure we are in the header reading phase by checking if ts->pkt is +unset instead of checking if the number of streams found so far is 0. + +Downloaded from Kodi ffmpeg repo: +https://github.com/xbmc/FFmpeg/commit/3136f41e6db8189994a8e4f72eacc92b669776d1 + +Patch was committed upstream: +http://git.videolan.org/?p=ffmpeg.git;a=patch;h=ca55240b8c1fd4cfdb61f88fd2cb378d475d910a + +Signed-off-by: Marton Balint +Signed-off-by: Bernd Kuhls +--- + libavformat/mpegts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index c6fd3e1cef63..1da81a0fe62a 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -2352,7 +2352,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len + goto out; + + // stop parsing after pmt, we found header +- if (!ts->stream->nb_streams) ++ if (!ts->pkt) + ts->stop_parse = 2; + + set_pmt_found(ts, h->id); diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index 6b7437411..6d28bfbed 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -16,6 +16,8 @@ FFMPEG_LICENSE += and GPL-2.0+ FFMPEG_LICENSE_FILES += COPYING.GPLv2 endif +FFMPEG_CPE_ID_VENDOR = ffmpeg + FFMPEG_CONF_OPTS = \ --prefix=/usr \ --enable-avfilter \ @@ -84,6 +86,13 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif +ifeq ($(BR2_PACKAGE_LIBV4L),y) +FFMPEG_DEPENDENCIES += libv4l +FFMPEG_CONF_OPTS += --enable-libv4l2 +else +FFMPEG_CONF_OPTS += --disable-libv4l2 +endif + ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) FFMPEG_CONF_OPTS += --enable-avresample else diff --git a/buildroot/package/file/file.mk b/buildroot/package/file/file.mk index 42f9524ed..fa7daa8e0 100644 --- a/buildroot/package/file/file.mk +++ b/buildroot/package/file/file.mk @@ -12,6 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +FILE_CPE_ID_VALID = YES # We're patching configure.ac FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp diff --git a/buildroot/package/flare-engine/flare-engine.hash b/buildroot/package/flare-engine/flare-engine.hash index e03bcc589..0e37a7192 100644 --- a/buildroot/package/flare-engine/flare-engine.hash +++ b/buildroot/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bbd4674513b643be6294188904665c53f0ef2912e803212c05e8fd22a44d74d flare-engine-1.0.tar.gz +sha256 035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d flare-engine-1.11.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/flare-engine/flare-engine.mk b/buildroot/package/flare-engine/flare-engine.mk index ed9dd19b0..e2f3eefa2 100644 --- a/buildroot/package/flare-engine/flare-engine.mk +++ b/buildroot/package/flare-engine/flare-engine.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.0 -FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,v$(FLARE_ENGINE_VERSION)) +FLARE_ENGINE_VERSION = 1.11 +FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/buildroot/package/flare-game/flare-game.hash b/buildroot/package/flare-game/flare-game.hash index 51646269a..983c23200 100644 --- a/buildroot/package/flare-game/flare-game.hash +++ b/buildroot/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5c8e9d72fcbe59f1861f79ac7b76ceffe3ec61d1df241c32d9133fe158fba4c1 flare-game-1.0.tar.gz -sha256 9fce5eb663f136449e11293a871ed96db5ba579116a927fc6a70dd20a4a5b9e6 README +sha256 c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a flare-game-1.11.tar.gz +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/buildroot/package/flare-game/flare-game.mk b/buildroot/package/flare-game/flare-game.mk index a70e998d0..4bebc7959 100644 --- a/buildroot/package/flare-game/flare-game.mk +++ b/buildroot/package/flare-game/flare-game.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.0 -FLARE_GAME_SITE = $(call github,clintbellanger,flare-game,v$(FLARE_GAME_VERSION)) +FLARE_GAME_VERSION = 1.11 +FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) FLARE_GAME_LICENSE_FILES = README diff --git a/buildroot/package/flashbench/flashbench.hash b/buildroot/package/flashbench/flashbench.hash index f82d7f0ee..9906af02e 100644 --- a/buildroot/package/flashbench/flashbench.hash +++ b/buildroot/package/flashbench/flashbench.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 12e2dcb6f041ef1a303fc5bc84642ed637c24d77ed6c667a2187f21d54555731 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0.tar.gz +sha256 422860966ad3528a7fd1dc88e4aa0b2bd91f11fa6429523b9acd21dc5beb6a19 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch b/buildroot/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch new file mode 100644 index 000000000..f835172e6 --- /dev/null +++ b/buildroot/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch @@ -0,0 +1,95 @@ +From da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d Mon Sep 17 00:00:00 2001 +From: Pyry Kontio +Date: Mon, 6 Jul 2020 12:57:35 +0900 +Subject: [PATCH] Makefile: Fix building on AArch64 NixOS + +The parsing of the output of archtest.c produced an unexpected +value on AArch64 NixOS. For example, the make variable ARCH was set to: + +``` +bit outside of fd_set selected +arm +``` + +This made the arch and OS checks fail. + +This commit simplifies the parsing, making it more robust. + +The C files archtest.c, endiantest.c and os.h used to set the +TARGET_OS, ARCH and ENDIAN variables, respectively, output +the result of the test as the final line, so just extracting +the final line and removing double quoting is enough. + +This commit also fixes a bug with debug_shell lacking escaping +single quotes, which prevented using the single quote in the +debug_shell calls. It used to work by accident before this fix; +the line in the call happened to contain a balanced pair of double +quotes and lacked other characters that needed escaping, which +didn't break the debug_shell, but this was accidental and very +brittle. + +Signed-off-by: Pyry Kontio +Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510 +Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140 +Tested-by: build bot (Jenkins) +Reviewed-by: Angel Pons + +[Retrieved from: +https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index f3f7717e2..e475cbdbd 100644 +--- a/Makefile ++++ b/Makefile +@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL + + # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr + # in the build details file together with the original stdout output. +-debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) ++debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ ++ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) + + ############################################################################### + # General OS-specific settings. +@@ -106,7 +107,8 @@ endif + # IMPORTANT: The following line must be placed before TARGET_OS is ever used + # (of course), but should come after any lines setting CC because the line + # below uses CC itself. +-override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) ++override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ ++ | tail -1 | cut -f 2 -d'"')) + + ifeq ($(TARGET_OS), Darwin) + override CPPFLAGS += -I/opt/local/include -I/usr/local/include +@@ -490,8 +492,10 @@ endif + # IMPORTANT: The following line must be placed before ARCH is ever used + # (of course), but should come after any lines setting CC because the line + # below uses CC itself. +-override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) +-override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) ++override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ ++ | tail -1 | cut -f 2 -d'"')) ++override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ ++ | tail -1)) + + # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) + ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) +@@ -1299,12 +1303,12 @@ compiler: featuresavailable + @printf "Target arch is " + @# FreeBSD wc will output extraneous whitespace. + @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ +- ( echo "unknown. Aborting."; exit 1) ++ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) + @printf "%s\n" '$(ARCH)' + @printf "Target OS is " + @# FreeBSD wc will output extraneous whitespace. + @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ +- ( echo "unknown. Aborting."; exit 1) ++ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) + @printf "%s\n" '$(TARGET_OS)' + ifeq ($(TARGET_OS), libpayload) + @$(CC) --version 2>&1 | grep -q coreboot || \ diff --git a/buildroot/package/flatbuffers/flatbuffers.mk b/buildroot/package/flatbuffers/flatbuffers.mk index 6a71ea9c7..814751f30 100644 --- a/buildroot/package/flatbuffers/flatbuffers.mk +++ b/buildroot/package/flatbuffers/flatbuffers.mk @@ -8,6 +8,7 @@ FLATBUFFERS_VERSION = 1.12.0 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt +FLATBUFFERS_CPE_ID_VENDOR = google FLATBUFFERS_INSTALL_STAGING = YES FLATBUFFERS_CONF_OPTS += \ diff --git a/buildroot/package/flex/flex.mk b/buildroot/package/flex/flex.mk index 6ce768c31..52a15ca49 100644 --- a/buildroot/package/flex/flex.mk +++ b/buildroot/package/flex/flex.mk @@ -9,6 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING +FLEX_CPE_ID_VALID = YES FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4 HOST_FLEX_DEPENDENCIES = host-m4 diff --git a/buildroot/package/fluidsynth/Config.in b/buildroot/package/fluidsynth/Config.in index 7c8836b60..5726e235e 100644 --- a/buildroot/package/fluidsynth/Config.in +++ b/buildroot/package/fluidsynth/Config.in @@ -89,6 +89,16 @@ comment "pulseaudio support needs a toolchain w/ dynamic library, wchar, threads depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_USE_MMU || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_FLUIDSYNTH_SDL2 + bool "sdl2" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_SDL2 + help + Enable SDL2 audio support. + +comment "SDL2 audio support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + comment "Misc options" config BR2_PACKAGE_FLUIDSYNTH_DBUS diff --git a/buildroot/package/fluidsynth/fluidsynth.mk b/buildroot/package/fluidsynth/fluidsynth.mk index 5756df544..dc777e0bf 100644 --- a/buildroot/package/fluidsynth/fluidsynth.mk +++ b/buildroot/package/fluidsynth/fluidsynth.mk @@ -66,4 +66,18 @@ else FLUIDSYNTH_CONF_OPTS += -Denable-readline=0 endif +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_SDL2),y) +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=1 +FLUIDSYNTH_DEPENDENCIES += sdl2 +else +FLUIDSYNTH_CONF_OPTS += -Denable-sdl2=0 +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +FLUIDSYNTH_CONF_OPTS += -Denable-systemd=1 +FLUIDSYNTH_DEPENDENCIES += systemd +else +FLUIDSYNTH_CONF_OPTS += -Denable-systemd=0 +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/fmc/fmc.hash b/buildroot/package/fmc/fmc.hash index d31bb5e79..fed33091c 100644 --- a/buildroot/package/fmc/fmc.hash +++ b/buildroot/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz +sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/buildroot/package/fmlib/fmlib.hash b/buildroot/package/fmlib/fmlib.hash index 9143ac2c3..47460d091 100644 --- a/buildroot/package/fmlib/fmlib.hash +++ b/buildroot/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5870756c7432b15f7a48b860625808f3c95d5f7fa5e251552eb2324ca51b0fa fmlib-fsl-sdk-v2.0.tar.gz +sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/buildroot/package/fmt/fmt.hash b/buildroot/package/fmt/fmt.hash index 1f45c212f..7947a1745 100644 --- a/buildroot/package/fmt/fmt.hash +++ b/buildroot/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 decfdf9ad274070fa85f26407b816f5a4d82205ae86bac1990be658d0795ea4d fmt-7.0.3.zip +sha256 5d98c504d0205f912e22449ecdea776b78ce0bb096927334f80781e720084c9f fmt-7.1.3.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/buildroot/package/fmt/fmt.mk b/buildroot/package/fmt/fmt.mk index 0539dcc02..000bacfd7 100644 --- a/buildroot/package/fmt/fmt.mk +++ b/buildroot/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 7.0.3 +FMT_VERSION = 7.1.3 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception diff --git a/buildroot/package/fping/fping.mk b/buildroot/package/fping/fping.mk index 24aca3236..0a03c1dfd 100644 --- a/buildroot/package/fping/fping.mk +++ b/buildroot/package/fping/fping.mk @@ -8,5 +8,6 @@ FPING_VERSION = 5.0 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING +FPING_SELINUX_MODULES = netutils $(eval $(autotools-package)) diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk index 4c804c136..16d58b5aa 100644 --- a/buildroot/package/freerdp/freerdp.mk +++ b/buildroot/package/freerdp/freerdp.mk @@ -9,6 +9,7 @@ FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE +FREERDP_CPE_ID_VENDOR = freerdp FREERDP_INSTALL_STAGING = YES diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash index b0a150205..0a717d40f 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 5ca1f8b6e6b191594d17ac7b51c38cdbc2ff808d15568ab4b0bbeb5dc6c621f6 firmware-imx-8.8.bin -sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA -sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 2b70f169d4065b2a7ac7a676afe24636128bd2dacc9f5230346758c3b146b2be firmware-imx-8.10.bin +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk index 1ff09baff..6d82ea207 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.8 +FIRMWARE_IMX_VERSION = 8.10 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index b0f47080c..bb7beede9 100644 --- a/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/buildroot/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 e76a71e9166fbedeaa535fd7ebc07edc30a1e87f529ab2aa733e3603d3183ed0 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz +sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 4ff592648..8bfd302b1 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 010bab5780476f26406e16b058514453dc235a0e7f4b995fa03c976d06e5cb96 imx-gpu-g2d-6.4.0.p2.4-arm.bin -sha256 553bbe9ee1caa222fd14b835deb2afedf9ed936b7a13424328df75892286f666 imx-gpu-g2d-6.4.0.p2.4-aarch64.bin -sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING -sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA +sha256 8d3b024151d4bdcc4f68cdbba9c4e5d126d55c9258de5821c43b393ae3f840b4 imx-gpu-g2d-6.4.3.p1.0-arm.bin +sha256 47a39b171d83bced378b1b4f408be6304850fe2f25bf4577dd1ea78e22473f3d imx-gpu-g2d-6.4.3.p1.0-aarch64.bin +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 15cfe66f0..3e6c3fc1c 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.0.p2.4-aarch64 +IMX_GPU_G2D_VERSION = 6.4.3.p1.0-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.0.p2.4-arm +IMX_GPU_G2D_VERSION = 6.4.3.p1.0-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/Config.in b/buildroot/package/freescale-imx/imx-gpu-viv/Config.in index a2deaf2e1..cca268990 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/Config.in +++ b/buildroot/package/freescale-imx/imx-gpu-viv/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_IMX_GPU_VIV depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HAS_LIBOPENCL select BR2_PACKAGE_HAS_LIBOPENVG help Userspace libraries for Vivante GPU on i.MX platforms @@ -66,7 +67,7 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB - default "wl" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_PROVIDES_LIBEGL default "imx-gpu-viv" @@ -74,6 +75,9 @@ config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBGLES default "imx-gpu-viv" +config BR2_PACKAGE_PROVIDES_LIBOPENCL + default "imx-gpu-viv" + config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 6de74a949..9c1810399 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5 imx-gpu-viv-6.4.0.p2.4-aarch32.bin -sha256 a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720 imx-gpu-viv-6.4.0.p2.4-aarch64.bin -sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING -sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA +sha256 9960fadbc1ea919f8b1b5c1e2e38a52b7293b70c906518d7fff2ada4140c59ea imx-gpu-viv-6.4.3.p1.0-aarch32.bin +sha256 0505620c3851a980d2e08fee4b4fcd06eff92efac02d1646924bea86e4384ad4 imx-gpu-viv-6.4.3.p1.0-aarch64.bin +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 06c74869c..6ae9aa7ac 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch64 +IMX_GPU_VIV_VERSION = 6.4.3.p1.0-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.0.p2.4-aarch32 +IMX_GPU_VIV_VERSION = 6.4.3.p1.0-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -18,7 +18,7 @@ IMX_GPU_VIV_LICENSE = NXP Semiconductor Software License Agreement IMX_GPU_VIV_LICENSE_FILES = EULA COPYING IMX_GPU_VIV_REDISTRIBUTE = NO -IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg +IMX_GPU_VIV_PROVIDES = libegl libgles libopencl libopenvg IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) @@ -29,7 +29,7 @@ ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) IMX_GPU_VIV_DEPENDENCIES += libdrm wayland endif @@ -38,24 +38,13 @@ define IMX_GPU_VIV_EXTRACT_CMDS endef # Instead of building, we fix up the inconsistencies that exist -# in the upstream archive here. +# in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS - $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h - $(if $(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11)$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL), - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 - ) - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1 - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 - ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so - ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ + for backend in fb x11 wayland; do \ + $(RM) -r $(@D)/gpu-core/usr/lib/$$backend ; \ + done endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) @@ -64,7 +53,7 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef @@ -101,22 +90,11 @@ define IMX_GPU_VIV_INSTALL_GMEM_INFO endef endif -# On the target, remove the unused libraries. -# Note that this is _required_, else ldconfig may create symlinks -# to the wrong library define IMX_GPU_VIV_INSTALL_TARGET_CMDS $(IMX_GPU_VIV_INSTALL_EXAMPLES) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr $(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd - for lib in EGL GAL GLESv2 VDK; do \ - for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ - case $$f in \ - *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ - *) $(RM) $$f ;; \ - esac; \ - done; \ - done endef $(eval $(generic-package)) diff --git a/buildroot/package/freescale-imx/imx-lib/imx-lib.hash b/buildroot/package/freescale-imx/imx-lib/imx-lib.hash index c16dc7f9a..f7d907b99 100644 --- a/buildroot/package/freescale-imx/imx-lib/imx-lib.hash +++ b/buildroot/package/freescale-imx/imx-lib/imx-lib.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ced5ad0a179887ef1dd93e8103a9ab7372017cc1c241d28cded164cdece4b918 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57.tar.gz +sha256 cad7823568cbd367ed8525e01c8c11a2393fc2dc481425273cb7919385367c61 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57-br1.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING-LGPL-2.1 diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash index bd8de5b86..661a77de1 100644 --- a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 5a28180217975f3d78fcfac15e46b0a942910fadf078e4af76deb6dc498136ed imx-sc-firmware-1.2.7.1.bin -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 db4c414d405aea6f013946d109db198798f40f71bf0810b9b50c027ca252b4b7 imx-sc-firmware-1.7.0.bin +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk index 954cfc407..b05ca3c72 100644 --- a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SC_FIRMWARE_VERSION = 1.2.7.1 +IMX_SC_FIRMWARE_VERSION = 1.7.0 IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-seco/imx-seco.hash b/buildroot/package/freescale-imx/imx-seco/imx-seco.hash index 930801e83..2e111c64d 100644 --- a/buildroot/package/freescale-imx/imx-seco/imx-seco.hash +++ b/buildroot/package/freescale-imx/imx-seco/imx-seco.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 52ba07633e0f8707d8c26724b5cd03ef96444c8de1e0e134acac50acacf3e7dd imx-seco-3.6.3.bin -sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA -sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 2ed8177e48c8e33f742b3a642805be56a5ef56df78b1b29e10518552154da2bc imx-seco-3.7.4.bin +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING diff --git a/buildroot/package/freescale-imx/imx-seco/imx-seco.mk b/buildroot/package/freescale-imx/imx-seco/imx-seco.mk index be3f3c441..f7aaca7e4 100644 --- a/buildroot/package/freescale-imx/imx-seco/imx-seco.mk +++ b/buildroot/package/freescale-imx/imx-seco/imx-seco.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_SECO_VERSION = 3.6.3 +IMX_SECO_VERSION = 3.7.4 IMX_SECO_SITE = $(FREESCALE_IMX_SITE) IMX_SECO_SOURCE = imx-seco-$(IMX_SECO_VERSION).bin diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash index 7f02f9246..df9916e41 100644 --- a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash @@ -1,3 +1,3 @@ -sha256 8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5 imx-vpu-hantro-1.15.0.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 261cab83954bd66e95b1650a737cb36261a2098597d904e517da638097ed4fd2 imx-vpu-hantro-1.19.0.bin +sha256 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2 COPYING +sha256 a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc EULA diff --git a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk index dbdbd4dc7..1d21449c2 100644 --- a/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.15.0 +IMX_VPU_HANTRO_VERSION = 1.19.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux diff --git a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash index 81ea35a7f..6ab67510b 100644 --- a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash +++ b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b7bb67b00daf436fd91a2760c2db375a962e2c919045ce8bf81bd54b95d999c5 imx-vpu-5.4.39.1.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING -sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA +sha256 87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127 imx-vpu-5.4.39.3.bin +sha256 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2 COPYING +sha256 a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc EULA diff --git a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk index e61b9f829..14a1a7a9f 100644 --- a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_VERSION = 5.4.39.1 +IMX_VPU_VERSION = 5.4.39.3 IMX_VPU_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index b9b93aeb5..0fd8e04f2 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 52b7425453fa32300e4779220d5deebd4a43a7525991ce3e5ce27eba909780f3 kernel-module-imx-gpu-viv-f2e8483fbda59bf2482f77efb0804c014848f749.tar.gz +sha256 ee9227d8b3f6da84a4b0be59cdc9a4c67db5c941c719ab44a29e09fe73019cac kernel-module-imx-gpu-viv-5c8eb7b0576dc2348fb206945ce13e41d0837cf1.tar.gz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index 2cea11708..4a2fb3032 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = f2e8483fbda59bf2482f77efb0804c014848f749 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 5c8eb7b0576dc2348fb206945ce13e41d0837cf1 KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 diff --git a/buildroot/package/freetype/freetype.mk b/buildroot/package/freetype/freetype.mk index e543aee0b..59d6dc0eb 100644 --- a/buildroot/package/freetype/freetype.mk +++ b/buildroot/package/freetype/freetype.mk @@ -11,6 +11,7 @@ FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPL-2.0+ FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config diff --git a/buildroot/package/frotz/Config.in b/buildroot/package/frotz/Config.in new file mode 100644 index 000000000..b73beea33 --- /dev/null +++ b/buildroot/package/frotz/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_FROTZ + bool "frotz" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_NCURSES + help + Frotz is an interpreter for old Infocom adventure games and + other Z-code games. Note that frotz can not be run as root. + You must add a normal user to your buildroot configuration to + be able to use it. + + https://661.org/proj/if/frotz/ + +comment "frotz needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/frotz/frotz.hash b/buildroot/package/frotz/frotz.hash new file mode 100644 index 000000000..14f1a7fbe --- /dev/null +++ b/buildroot/package/frotz/frotz.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7e488140791259a1a8c9e16a0c467ca69b694b918c28ffe3d83c654bcb253cca frotz-2.51.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/frotz/frotz.mk b/buildroot/package/frotz/frotz.mk new file mode 100644 index 000000000..ce27bdf0b --- /dev/null +++ b/buildroot/package/frotz/frotz.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# Frotz +# +################################################################################ + +FROTZ_VERSION = 2.51 +FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2 +FROTZ_SITE = https://gitlab.com/DavidGriffith/frotz/-/archive/$(FROTZ_VERSION) +FROTZ_DEPENDENCIES = host-pkgconf ncurses +FROTZ_LICENSE = GPL-2.0+ +FROTZ_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +FROTZ_CURSES=ncursesw +FROTZ_UTF8=yes +else +FROTZ_CURSES=ncurses +endif + +define FROTZ_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc \ + SOUND_TYPE=none CURSES="$(FROTZ_CURSES)" USE_UTF8=$(FROTZ_UTF8) \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" +endef + +define FROTZ_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/frotz $(TARGET_DIR)/usr/bin/frotz +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch b/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch deleted file mode 100644 index 1eb693703..000000000 --- a/buildroot/package/frr/0001-build-find-all-future-minor-versions-of-python3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 838cb35e08eb98acbc27637808162105ae2c4549 Mon Sep 17 00:00:00 2001 -From: Michal Ruprich -Date: Wed, 17 Jun 2020 13:47:30 +0200 -Subject: [PATCH] build: find all future minor versions of python3 - -This way we can find every python from 3.8 further - -Signed-off-by: Michal Ruprich - -[Retrieved from: -https://github.com/FRRouting/frr/commit/838cb35e08eb98acbc27637808162105ae2c4549] -Signed-off-by: Fabrice Fontaine ---- - m4/ax_python.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 -index 9f43ea0ab12..91d12b99b43 100644 ---- a/m4/ax_python.m4 -+++ b/m4/ax_python.m4 -@@ -186,7 +186,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl - AC_MSG_RESULT([yes]) - - PYTHON_CFLAGS="`\"$pycfg\" --includes`" -- if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then -+ minor_ver=${py_ver#*\.} -+ if test $((minor_ver)) -gt 7; then - PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`" - else - PYTHON_LIBS="`\"$pycfg\" --ldflags`" diff --git a/buildroot/package/frr/frr.hash b/buildroot/package/frr/frr.hash index 1c8c27ec4..942065f0f 100644 --- a/buildroot/package/frr/frr.hash +++ b/buildroot/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a frr-7.4.tar.gz +sha256 54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 frr-7.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/frr/frr.mk b/buildroot/package/frr/frr.mk index 6beaf776a..3ae292874 100644 --- a/buildroot/package/frr/frr.mk +++ b/buildroot/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 7.4 +FRR_VERSION = 7.5 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING diff --git a/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash b/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash index 0c52e05cc..9770ee0d3 100644 --- a/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/buildroot/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5df218732244059057686194b0e1fef66fb822d4087db48af88e1bc29bb1afde fuse-overlayfs-1.2.0.tar.gz +sha256 7e5666aef4f2047e6a5202d6438b08c2d314dba5b40e431014e7dbb8168d9018 fuse-overlayfs-1.4.0.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk b/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk index 67bd9d1c7..707cacce0 100644 --- a/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/buildroot/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.2.0 +FUSE_OVERLAYFS_VERSION = 1.4.0 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) FUSE_OVERLAYFS_LICENSE = GPL-3.0 FUSE_OVERLAYFS_LICENSE_FILES = COPYING diff --git a/buildroot/package/fwts/Config.in b/buildroot/package/fwts/Config.in index ff28a4a40..ac9a2e390 100644 --- a/buildroot/package/fwts/Config.in +++ b/buildroot/package/fwts/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_FWTS depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd + depends on !BR2_STATIC_LIBS # libbsd depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBBSD @@ -31,9 +32,9 @@ comment "efi_runtime module needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL endif -comment "fwts needs a glibc toolchain w/ wchar, threads" +comment "fwts needs a glibc toolchain w/ wchar, threads, dynamic library" depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC + !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS diff --git a/buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch b/buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch deleted file mode 100644 index f3c9ea481..000000000 --- a/buildroot/package/gd/0001-bmp-check-return-value-in-gdImageBmpPtr.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Jul 2018 13:54:08 -0400 -Subject: [PATCH] bmp: check return value in gdImageBmpPtr - -Closes #447. - -CVE-2018-1000222 - -Signed-off-by: Peter Korsgaard ---- - src/gd_bmp.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/gd_bmp.c b/src/gd_bmp.c -index bde0b9d..78f40d9 100644 ---- a/src/gd_bmp.c -+++ b/src/gd_bmp.c -@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp - static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); - static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); - -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); -+ - #define BMP_DEBUG(s) - - static int gdBMPPutWord(gdIOCtx *out, int w) -@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageBmpCtx(im, out, compression); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageBmpCtx(im, out, compression)) -+ rv = gdDPExtractData(out, size); -+ else -+ rv = NULL; - out->gd_free(out); - return rv; - } -@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) - compression - whether to apply RLE or not. - */ - BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) -+{ -+ _gdImageBmpCtx(im, out, compression); -+} -+ -+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - { - int bitmap_size = 0, info_size, total_size, padding; - int i, row, xpos, pixel; -@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; - FILE *tmpfile_for_compression = NULL; - gdIOCtxPtr out_original = NULL; -+ int ret = 1; - - /* No compression if its true colour or we don't support seek */ - if (im->trueColor) { -@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) - out_original = NULL; - } - -+ ret = 0; - cleanup: - if (tmpfile_for_compression) { - #ifdef _WIN32 -@@ -338,7 +349,7 @@ cleanup: - if (out_original) { - out_original->gd_free(out_original); - } -- return; -+ return ret; - } - - static int compress_row(unsigned char *row, int length) --- -2.20.1 - diff --git a/buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch b/buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch deleted file mode 100644 index 8d77f0ee1..000000000 --- a/buildroot/package/gd/0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Wed, 29 Nov 2017 19:37:38 +0100 -Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx - -Due to a signedness confusion in `GetCode_` a corrupt GIF file can -trigger an infinite loop. Furthermore we make sure that a GIF without -any palette entries is treated as invalid *after* open palette entries -have been removed. - -CVE-2018-5711 - -See also https://bugs.php.net/bug.php?id=75571. - -[Peter: drop tests] -Signed-off-by: Peter Korsgaard ---- - src/gd_gif_in.c | 12 ++++++------ - 1 files changed, 38 insertions(+), 6 deletions(-) - -diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c -index daf26e7..0a8bd71 100644 ---- a/src/gd_gif_in.c -+++ b/src/gd_gif_in.c -@@ -335,11 +335,6 @@ terminated: - return 0; - } - -- if(!im->colorsTotal) { -- gdImageDestroy(im); -- return 0; -- } -- - /* Check for open colors at the end, so - * we can reduce colorsTotal and ultimately - * BitsPerPixel */ -@@ -351,6 +346,11 @@ terminated: - } - } - -+ if(!im->colorsTotal) { -+ gdImageDestroy(im); -+ return 0; -+ } -+ - return im; - } - -@@ -447,7 +447,7 @@ static int - GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) - { - int i, j, ret; -- unsigned char count; -+ int count; - - if(flag) { - scd->curbit = 0; - --- -2.20.1 - diff --git a/buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch b/buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch deleted file mode 100644 index 57df1a2fb..000000000 --- a/buildroot/package/gd/0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e13a342c079aeb73e31dfa19eaca119761bac3f3 Mon Sep 17 00:00:00 2001 -From: Jonas Meurer -Date: Tue, 11 Jun 2019 12:16:46 +0200 -Subject: [PATCH] Fix #501: Uninitialized read in gdImageCreateFromXbm - (CVE-2019-11038) - -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-11038 -Bug-Debian: https://bugs.debian.org/929821 -Bug: https://github.com/libgd/libgd/issues/501 - -We have to ensure that `sscanf()` does indeed read a hex value here, -and bail out otherwise. - -Original patch by Christoph M. Becker for PHP libgd ext. -https://git.php.net/?p=php-src.git;a=commit;h=ed6dee9a198c904ad5e03113e58a2d2c200f5184 - -Signed-off-by: Peter Korsgaard ---- - src/gd_xbm.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gd_xbm.c b/src/gd_xbm.c -index 4ca41ac..cf0545e 100644 ---- a/src/gd_xbm.c -+++ b/src/gd_xbm.c -@@ -169,7 +169,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXbm(FILE * fd) - } - h[3] = ch; - } -- sscanf(h, "%x", &b); -+ if (sscanf(h, "%x", &b) != 1) { -+ gd_error("invalid XBM"); -+ gdImageDestroy(im); -+ return 0; -+ } - for (bit = 1; bit <= max_bit; bit = bit << 1) { - gdImageSetPixel(im, x++, y, (b & bit) ? 1 : 0); - if (x == im->sx) { --- -2.20.1 - diff --git a/buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch b/buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch deleted file mode 100644 index e51428a64..000000000 --- a/buildroot/package/gd/0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Thu, 17 Jan 2019 11:54:55 +0100 -Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() - -Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we -must not call `gdDPExtractData()`; otherwise a double-free would -happen. Since `gdImage*Ctx()` are void functions, and we can't change -that for BC reasons, we're introducing static helpers which are used -internally. - -We're adding a regression test for `gdImageJpegPtr()`, but not for -`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to -trigger failure of the respective `gdImage*Ctx()` calls. - -This potential security issue has been reported by Solmaz Salimi (aka. -Rooney). - -CVE-2019-6978 - -[Peter: drop tests] -Signed-off-by: Peter Korsgaard ---- - src/gd_gif_out.c | 18 +++++++++++++++--- - src/gd_jpeg.c | 20 ++++++++++++++++---- - src/gd_wbmp.c | 21 ++++++++++++++++++--- - 3 files changed, 84 insertions(+), 11 deletions(-) - -diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c -index 298a581..d5a9534 100644 ---- a/src/gd_gif_out.c -+++ b/src/gd_gif_out.c -@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); - static void char_out(int c, GifCtx *ctx); - static void flush_char(GifCtx *ctx); - -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); - - - -@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageGifCtx(im, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageGifCtx(im, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) - - */ - BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) -+{ -+ _gdImageGifCtx(im, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - { - gdImagePtr pim = 0, tim = im; - int interlace, BitsPerPixel; -@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - based temporary image. */ - pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); - if(!pim) { -- return; -+ return 1; - } - tim = pim; - } -@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) - /* Destroy palette based temporary image. */ - gdImageDestroy( pim); - } -+ -+ return 0; - } - - -diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c -index fc05842..96ef430 100644 ---- a/src/gd_jpeg.c -+++ b/src/gd_jpeg.c -@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) - exit(99); - } - -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); -+ - /* - * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality - * QUALITY. If QUALITY is in the range 0-100, increasing values -@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageJpegCtx(im, out, quality); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageJpegCtx(im, out, quality)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } -@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); - - */ - BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) -+{ -+ _gdImageJpegCtx(im, outfile, quality); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - { - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; -@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row) { - gdFree(row); - } -- return; -+ return 1; - } - - cinfo.err->emit_message = jpeg_emit_message; -@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - if(row == 0) { - gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); - jpeg_destroy_compress(&cinfo); -- return; -+ return 1; - } - - rowptr[0] = row; -@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - gdFree(row); -+ return 0; - } - - -diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c -index f19a1c9..a49bdbe 100644 ---- a/src/gd_wbmp.c -+++ b/src/gd_wbmp.c -@@ -88,6 +88,8 @@ int gd_getin(void *in) - return (gdGetC((gdIOCtx *)in)); - } - -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); -+ - /* - Function: gdImageWBMPCtx - -@@ -100,6 +102,12 @@ int gd_getin(void *in) - out - the stream where to write - */ - BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) -+{ -+ _gdImageWBMPCtx(image, fg, out); -+} -+ -+/* returns 0 on success, 1 on failure */ -+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - { - int x, y, pos; - Wbmp *wbmp; -@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - /* create the WBMP */ - if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { - gd_error("Could not create WBMP\n"); -- return; -+ return 1; - } - - /* fill up the WBMP structure */ -@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) - - /* write the WBMP to a gd file descriptor */ - if(writewbmp(wbmp, &gd_putout, out)) { -+ freewbmp(wbmp); - gd_error("Could not save WBMP\n"); -+ return 1; - } - - /* des submitted this bugfix: gdFree the memory. */ - freewbmp(wbmp); -+ -+ return 0; - } - - /* -@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) - void *rv; - gdIOCtx *out = gdNewDynamicCtx(2048, NULL); - if (out == NULL) return NULL; -- gdImageWBMPCtx(im, fg, out); -- rv = gdDPExtractData(out, size); -+ if (!_gdImageWBMPCtx(im, fg, out)) { -+ rv = gdDPExtractData(out, size); -+ } else { -+ rv = NULL; -+ } - out->gd_free(out); - return rv; - } --- -2.20.1 - diff --git a/buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch b/buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch deleted file mode 100644 index 8234de45a..000000000 --- a/buildroot/package/gd/0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= -Date: Fri, 20 Dec 2019 12:03:33 -0300 -Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone() - -[Retrieved (and updated to remove .gitignore and tests) from: -https://github.com/libgd/libgd/commit/a93eac0e843148dc2d631c3ba80af17e9c8c860f] -Signed-off-by: Fabrice Fontaine ---- - src/gd.c | 9 +-------- - tests/gdimageclone/.gitignore | 1 + - tests/gdimageclone/CMakeLists.txt | 1 + - tests/gdimageclone/Makemodule.am | 3 ++- - tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++ - 5 files changed, 35 insertions(+), 9 deletions(-) - create mode 100644 tests/gdimageclone/style.c - -diff --git a/src/gd.c b/src/gd.c -index 592a0286..d564d1f9 100644 ---- a/src/gd.c -+++ b/src/gd.c -@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { - } - } - -- if (src->styleLength > 0) { -- dst->styleLength = src->styleLength; -- dst->stylePos = src->stylePos; -- for (i = 0; i < src->styleLength; i++) { -- dst->style[i] = src->style[i]; -- } -- } -- - dst->interlace = src->interlace; - - dst->alphaBlendingFlag = src->alphaBlendingFlag; -@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { - - if (src->style) { - gdImageSetStyle(dst, src->style, src->styleLength); -+ dst->stylePos = src->stylePos; - } - - for (i = 0; i < gdMaxColors; i++) { diff --git a/buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch b/buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch deleted file mode 100644 index 11c7575dd..000000000 --- a/buildroot/package/gd/0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2e886046f86d0d6bfc14aab94a881259a081e3f4 Mon Sep 17 00:00:00 2001 -From: wilson chen -Date: Fri, 20 Dec 2019 10:12:04 +0800 -Subject: [PATCH] Fix #497: gdImageColorMatch Out Of Bounds Write on Heap - (CVE-2019-6977) - -Fixed CVE-2019-6977 and add corresponding testcase. - -Original patch by Christoph M. Bechker -https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced - -[Retrieved (and updated to remove .gitignore and tests) from: -https://github.com/libgd/libgd/commit/2e886046f86d0d6bfc14aab94a881259a081e3f4] -Signed-off-by: Fabrice Fontaine ---- - src/gd_color_match.c | 5 ++--- - tests/gdimagecolormatch/.gitignore | 1 + - tests/gdimagecolormatch/CMakeLists.txt | 1 + - tests/gdimagecolormatch/Makemodule.am | 1 + - tests/gdimagecolormatch/cve_2019_6977.c | 25 +++++++++++++++++++++++++ - 5 files changed, 30 insertions(+), 3 deletions(-) - create mode 100644 tests/gdimagecolormatch/cve_2019_6977.c - -diff --git a/src/gd_color_match.c b/src/gd_color_match.c -index f0842b69..f0194302 100644 ---- a/src/gd_color_match.c -+++ b/src/gd_color_match.c -@@ -31,9 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdImagePtr im1, gdImagePtr im2) - return -4; /* At least 1 color must be allocated */ - } - -- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); -- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); -- -+ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); -+ memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); - for (x=0; x < im1->sx; x++) { - for( y=0; ysy; y++ ) { - color = im2->pixels[y][x]; diff --git a/buildroot/package/gd/gd.hash b/buildroot/package/gd/gd.hash index 1cd9e56b1..5aec317f2 100644 --- a/buildroot/package/gd/gd.hash +++ b/buildroot/package/gd/gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 libgd-2.2.5.tar.xz -sha256 d02dae2141d49b8a6b09b2b73e68a8f17d7bbeaaf02b3b841ee11fea2d9e328d COPYING +sha256 ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58 libgd-2.3.0.tar.xz +sha256 4d80b4af6c38d7a65128c881623dee2a5daee6b3a6ccab74a5cdfa0dfda96da7 COPYING diff --git a/buildroot/package/gd/gd.mk b/buildroot/package/gd/gd.mk index 419d9a638..f54c2b37a 100644 --- a/buildroot/package/gd/gd.mk +++ b/buildroot/package/gd/gd.mk @@ -4,29 +4,15 @@ # ################################################################################ -GD_VERSION = 2.2.5 +GD_VERSION = 2.3.0 GD_SOURCE = libgd-$(GD_VERSION).tar.xz GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) GD_INSTALL_STAGING = YES GD_LICENSE = GD license GD_LICENSE_FILES = COPYING -GD_CONFIG_SCRIPTS = gdlib-config GD_CONF_OPTS = --without-x --disable-rpath --disable-werror GD_DEPENDENCIES = host-pkgconf -# 0001-bmp-check-return-value-in-gdImageBmpPtr.patch -GD_IGNORE_CVES += CVE-2018-1000222 -# 0002-Fix-420-Potential-infinite-loop-in-gdImageCreateFrom.patch -GD_IGNORE_CVES += CVE-2018-5711 -# 0003-Fix-501-Uninitialized-read-in-gdImageCreateFromXbm-C.patch -GD_IGNORE_CVES += CVE-2019-11038 -# 0004-Fix-492-Potential-double-free-in-gdImage-Ptr.patch -GD_IGNORE_CVES += CVE-2019-6978 -# 0005-Fix-potential-NULL-pointer-dereference-in-gdImageClone.patch -GD_IGNORE_CVES += CVE-2018-14553 -# 0006-Fix-497-gdImageColorMatch-Out-Of-Bounds-Write-on-Heap-CVE-2019-6977.patch -GD_IGNORE_CVES += CVE-2019-6977 - # gd forgets to link utilities with -pthread even though it uses # pthreads, causing linking errors with static linking ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) @@ -47,8 +33,7 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) GD_DEPENDENCIES += libiconv -# not strictly needed for gd, but ensures -liconv ends up in -# gdlib-config --libs output +# not strictly needed for gd, but ensures -liconv ends up in gdlib.pc GD_CONF_ENV += LIBS="-liconv" endif diff --git a/buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 65% rename from buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to buildroot/package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 1672ad2a1..9369a14d2 100644 --- a/buildroot/package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/buildroot/package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From 7dd846212d46b5d0930c938222181cd305254951 Mon Sep 17 00:00:00 2001 +From 64b8ab56118d2fea027adfb7ebbc01668b29528e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Aug 2016 17:32:50 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -7,38 +7,20 @@ Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.0] +[Rebase on gdb 8.3] Signed-off-by: Romain Naour --- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ 2 files changed, 12 insertions(+) -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 47428c1529c..841a5e02b9d 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "arch/ppc-linux-common.h" - #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 3d4d4fdc563..5b93af8d3a3 100644 +index d937a65b69c..1fd54b4a0e0 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H +#if !defined(__GLIBC__) +# define pt_regs uapi_pt_regs @@ -50,6 +32,24 @@ index 3d4d4fdc563..5b93af8d3a3 100644 #include /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 337d555aee7..5d518f37268 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" -- -2.14.4 +2.29.2 diff --git a/buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 71% rename from buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to buildroot/package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch index ef2a94295..2f96d2982 100644 --- a/buildroot/package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ b/buildroot/package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -1,4 +1,4 @@ -From 6fade51aa4efd700e4a4054aaddb22eda0de7576 Mon Sep 17 00:00:00 2001 +From d205f398e1e36f9673f50f368a3f29fd1dfaa794 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 3 Jun 2017 21:23:52 +0200 Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC @@ -15,14 +15,14 @@ Signed-off-by: Thomas Petazzoni [Rebase on gdb 8.0] Signed-off-by: Romain Naour --- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ + gdbserver/linux-sh-low.cc | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index 76876f08078..ec4491474ac 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index a6d3fc60047..b83cce6b9fe 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh; #include #endif @@ -39,5 +39,5 @@ index 76876f08078..ec4491474ac 100644 #define sh_num_regs 41 -- -2.14.4 +2.29.2 diff --git a/buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/10.1/0003-use-asm-sgidefs.h.patch similarity index 90% rename from buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch rename to buildroot/package/gdb/10.1/0003-use-asm-sgidefs.h.patch index 08146d303..e04ebd1dd 100644 --- a/buildroot/package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch +++ b/buildroot/package/gdb/10.1/0003-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From b286989e94e09c992462771cdbd3dc684f660b4f Mon Sep 17 00:00:00 2001 +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use @@ -23,7 +23,7 @@ Signed-off-by: Vicente Olivert Riera 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 21b1f583b92..de525ae6b01 100644 +index 38ff461a35b..b6cf194b2bf 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -36,5 +36,5 @@ index 21b1f583b92..de525ae6b01 100644 #include #include "inf-ptrace.h" -- -2.14.4 +2.29.2 diff --git a/buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch similarity index 78% rename from buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch rename to buildroot/package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch index c8f8ffb80..846f7ed29 100644 --- a/buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch +++ b/buildroot/package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch @@ -1,4 +1,4 @@ -From 69cbbbbbd425111428db5ae91767dae5436ba63d Mon Sep 17 00:00:00 2001 +From 90ebe548922538b854de52e8b687384f44360984 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 22 Jun 2018 22:40:26 +0200 Subject: [PATCH] gdbserver: fix build for m68k @@ -28,14 +28,14 @@ Fix this by moving on top of "linux-low.h". Signed-off-by: Romain Naour --- - gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + gdbserver/linux-m68k-low.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 5594f10f927..19b4ef7b259 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -17,16 +17,17 @@ +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 838ba353b0b..36679682b9a 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -17,6 +17,11 @@ along with this program. If not, see . */ #include "server.h" @@ -46,7 +46,8 @@ index 5594f10f927..19b4ef7b259 100644 + #include "linux-low.h" - /* Defined in auto-generated file reg-m68k.c. */ + /* Linux target op definitions for the m68k architecture. */ +@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () void init_registers_m68k (void); extern const struct target_desc *tdesc_m68k; @@ -58,5 +59,5 @@ index 5594f10f927..19b4ef7b259 100644 #define m68k_num_gregs 18 -- -2.14.4 +2.29.2 diff --git a/buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 82% rename from buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to buildroot/package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch index a47dcf31e..33dce4d94 100644 --- a/buildroot/package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ b/buildroot/package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -1,4 +1,4 @@ -From fa319a6202cfe6e0415d28d6995019b18c16cd60 Mon Sep 17 00:00:00 2001 +From c8454711eca2e79437e17ed1e1e68b48b4c8d927 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Jun 2018 23:33:55 +0200 Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h @@ -30,22 +30,24 @@ Fixes the following build issue: vfork Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour --- gdb/nat/fork-inferior.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c -index ea71aad25f7..77b9e03878b 100644 +index 7ba0126871d..53e1ec72f09 100644 --- a/gdb/nat/fork-inferior.c +++ b/gdb/nat/fork-inferior.c -@@ -26,6 +26,7 @@ - #include "common-gdbthread.h" - #include "signals-state-save-restore.h" - #include "gdb_tilde_expand.h" +@@ -27,6 +27,7 @@ + #include "gdbsupport/pathstuff.h" + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" +#include "linux-ptrace.h" #include extern char **environ; -- -2.14.4 +2.29.2 diff --git a/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch b/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch deleted file mode 100644 index 989a5b134..000000000 --- a/buildroot/package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e00c211d51bec301cf04719b77076a8783ef44b5 Mon Sep 17 00:00:00 2001 -From: Raul Tambre -Date: Sat, 4 May 2019 15:48:17 -0400 -Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in - python/lib/gdb/command/prompt.py - -The 'is' operator is not meant to be used for comparisons. It currently working -is an implementation detail of CPython. CPython 3.8 has added a SyntaxWarning -for this. - -(cherry picked from commit b6484282f85bf7f11451b2441599c241d302ad9d) -[Romain: backport to gdb 8.x] -Signed-off-by: Romain Naour ---- - gdb/python/lib/gdb/command/prompt.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py -index 3d662a7d3f..04b9e49c22 100644 ---- a/gdb/python/lib/gdb/command/prompt.py -+++ b/gdb/python/lib/gdb/command/prompt.py -@@ -45,7 +45,7 @@ The currently defined substitutions are: - self.hook_set = False - - def get_show_string (self, pvalue): -- if self.value is not '': -+ if self.value: - return "The extended prompt is: " + self.value - else: - return "The extended prompt is not set." -@@ -57,7 +57,7 @@ The currently defined substitutions are: - return "" - - def before_prompt_hook(self, current): -- if self.value is not '': -+ if self.value: - return gdb.prompt.substitute_prompt(self.value) - else: - return None --- -2.25.4 - diff --git a/buildroot/package/gdb/Config.in b/buildroot/package/gdb/Config.in index 48ec3e020..b1aa5e47d 100644 --- a/buildroot/package/gdb/Config.in +++ b/buildroot/package/gdb/Config.in @@ -80,8 +80,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - # Only Python 2.x is supported by gdb for now - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/buildroot/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host index 4b868e225..9ac939ec1 100644 --- a/buildroot/package/gdb/Config.in.host +++ b/buildroot/package/gdb/Config.in.host @@ -63,21 +63,21 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_8_3 + default BR2_GDB_VERSION_9_2 depends on !BR2_arc depends on !BR2_csky help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_8_2 - bool "gdb 8.2.x" - config BR2_GDB_VERSION_8_3 bool "gdb 8.3.x" config BR2_GDB_VERSION_9_2 bool "gdb 9.2.x" +config BR2_GDB_VERSION_10 + bool "gdb 10.x" + endchoice endif @@ -87,7 +87,7 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB default "8.3.1" if BR2_GDB_VERSION_8_3 - default "9.2" if BR2_GDB_VERSION_9_2 + default "9.2" if BR2_GDB_VERSION_9_2 || !BR2_PACKAGE_HOST_GDB + default "10.1" if BR2_GDB_VERSION_10 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/buildroot/package/gdb/gdb-python-config b/buildroot/package/gdb/gdb-python-config index 0f002281d..640c35830 100755 --- a/buildroot/package/gdb/gdb-python-config +++ b/buildroot/package/gdb/gdb-python-config @@ -17,20 +17,25 @@ if [ $# -ne 2 ] ; then exit 1 fi +if [ -z "${BR_PYTHON_VERSION}" ]; then + echo "Environment variable BR_PYTHON_VERSION not set." >&2 + exit 1 +fi + # The first argument is the path to python-config.py, ignore it. case "$2" in --includes) - echo "-I${STAGING_DIR}/usr/include/python2.7" - ;; + echo "-I${STAGING_DIR}/usr/include/python${BR_PYTHON_VERSION}" + ;; --ldflags) - echo "-lpthread -ldl -lutil -lm -lpython2.7" - ;; + echo "-lpthread -ldl -lutil -lm -lpython${BR_PYTHON_VERSION}" + ;; --exec-prefix) - echo "/usr" - ;; + echo "/usr" + ;; *) - echo "Bad arg $2." >&2 - exit 1 - ;; + echo "Bad arg $2." >&2 + exit 1 + ;; esac diff --git a/buildroot/package/gdb/gdb.hash b/buildroot/package/gdb/gdb.hash index 1f14eeafa..3b4845d64 100644 --- a/buildroot/package/gdb/gdb.hash +++ b/buildroot/package/gdb/gdb.hash @@ -1,7 +1,7 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz diff --git a/buildroot/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk index f31b168bf..17e10e8b1 100644 --- a/buildroot/package/gdb/gdb.mk +++ b/buildroot/package/gdb/gdb.mk @@ -8,6 +8,12 @@ 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 @@ -25,6 +31,7 @@ endif GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB +GDB_CPE_ID_VENDOR = gnu # On gdb < 10, if you want to build only gdbserver, you need to # configure only gdb/gdbserver. @@ -188,8 +195,18 @@ GDB_CONF_OPTS += --disable-tui endif ifeq ($(BR2_PACKAGE_GDB_PYTHON),y) -GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config +ifeq ($(BR2_PACKAGE_PYTHON3),y) +# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. +GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) +GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) +GDB_DEPENDENCIES += python3 +else +# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. +GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) +GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) GDB_DEPENDENCIES += python +endif +GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else GDB_CONF_OPTS += --without-python endif diff --git a/buildroot/package/gdk-pixbuf/0001-meson.build-link-with-lintl-if-needed.patch b/buildroot/package/gdk-pixbuf/0001-meson.build-link-with-lintl-if-needed.patch new file mode 100644 index 000000000..08a3a681c --- /dev/null +++ b/buildroot/package/gdk-pixbuf/0001-meson.build-link-with-lintl-if-needed.patch @@ -0,0 +1,45 @@ +From 65c8bc8ec4ae8dd140b0205a61d0d216fa45d819 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 28 Jan 2021 07:50:44 +0100 +Subject: [PATCH] meson.build: link with lintl if needed + +Link with -lintl to avoid the following build failure: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/../../../../mips64el-buildroot-linux-uclibc/bin/ld: gdk-pixbuf/libgdk_pixbuf-2.0.so.0.4200.2.p/gdk-pixbuf-util.c.o: in function `_gdk_pixbuf_init_gettext': +gdk-pixbuf-util.c:(.text+0xbc0): undefined reference to `libintl_bindtextdomain' +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/../../../../mips64el-buildroot-linux-uclibc/bin/ld: gdk-pixbuf-util.c:(.text+0xbc8): undefined reference to `libintl_bindtextdomain' + +Fixes: + - http://autobuild.buildroot.org/results/894359558100ea9637feba16deaf99923805d0f2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/101] +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1cef125a3..973948108 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,6 +93,7 @@ if cc.has_function('lrint', dependencies: mathlib_dep) + gdk_pixbuf_conf.set('HAVE_LRINT', 1) + endif + ++intl_dep = cc.find_library('intl', required: false) + if cc.has_function('bind_textdomain_codeset', prefix: '#include ') + gdk_pixbuf_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', 1) + endif +@@ -212,7 +213,7 @@ if medialib_dep.found() + endif + + gdk_pixbuf_deps = [ mathlib_dep, glib_dep, gobject_dep, gmodule_dep, gio_dep, +- shared_mime_dep, medialib_dep ] ++ shared_mime_dep, medialib_dep, intl_dep ] + + # Check if we can build shared modules + if gmodule_dep.type_name() == 'pkgconfig' +-- +2.29.2 + diff --git a/buildroot/package/gdk-pixbuf/0002-gdk-pixbuf-gdk-pixbuf-io.c-fix-build-without-gmodule.patch b/buildroot/package/gdk-pixbuf/0002-gdk-pixbuf-gdk-pixbuf-io.c-fix-build-without-gmodule.patch new file mode 100644 index 000000000..74bc967a6 --- /dev/null +++ b/buildroot/package/gdk-pixbuf/0002-gdk-pixbuf-gdk-pixbuf-io.c-fix-build-without-gmodule.patch @@ -0,0 +1,41 @@ +From 46c7fe11bd0ed8595c3f920d42a9914fa864d893 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 7 Feb 2021 18:51:14 +0100 +Subject: [PATCH] gdk-pixbuf/gdk-pixbuf-io.c: fix build without gmodule + +Fix the following build failure: + +../gdk-pixbuf/gdk-pixbuf-io.c: In function 'gdk_pixbuf_io_init': +../gdk-pixbuf/gdk-pixbuf-io.c:681:16: error: implicit declaration of function 'gdk_pixbuf_get_module_file'; did you mean '_gdk_pixbuf_get_module'? [-Werror=implicit-function-declaration] + 681 | module_file = gdk_pixbuf_get_module_file (); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | _gdk_pixbuf_get_module + +Fixes: + - http://autobuild.buildroot.org/results/6cd54c497f5d19342ec94ece713547b887e4c02d + +Upstream status: Accepted +https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/103 + +Signed-off-by: Fabrice Fontaine +--- + gdk-pixbuf/gdk-pixbuf-io.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c +index 40eb920c8..2dc2ea6da 100644 +--- a/gdk-pixbuf/gdk-pixbuf-io.c ++++ b/gdk-pixbuf/gdk-pixbuf-io.c +@@ -678,7 +678,9 @@ gdk_pixbuf_io_init (void) + gboolean ret; + + gdk_pixbuf_io_init_builtin (); ++#ifdef USE_GMODULE + module_file = gdk_pixbuf_get_module_file (); ++#endif + ret = gdk_pixbuf_io_init_modules (module_file, NULL); + g_free (module_file); + return ret; +-- +2.29.2 + diff --git a/buildroot/package/gdk-pixbuf/gdk-pixbuf.hash b/buildroot/package/gdk-pixbuf/gdk-pixbuf.hash index 8fa178b55..be7593aeb 100644 --- a/buildroot/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/buildroot/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.sha256sum -sha256 fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334 gdk-pixbuf-2.36.12.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.2.sha256sum +sha256 83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15 gdk-pixbuf-2.42.2.tar.xz # Locally calculated -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk b/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk index 0266e0497..1bd422c0a 100644 --- a/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk @@ -4,62 +4,66 @@ # ################################################################################ -GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).12 +GDK_PIXBUF_VERSION_MAJOR = 2.42 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).2 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) -GDK_PIXBUF_LICENSE = LGPL-2.0+ +GDK_PIXBUF_LICENSE = LGPL-2.1+ GDK_PIXBUF_LICENSE_FILES = COPYING +GDK_PIXBUF_CPE_ID_VENDOR = gnome GDK_PIXBUF_INSTALL_STAGING = YES GDK_PIXBUF_DEPENDENCIES = \ host-gdk-pixbuf host-libglib2 host-pkgconf \ libglib2 $(if $(BR2_ENABLE_LOCALE),,libiconv) HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 -GDK_PIXBUF_CONF_ENV = \ - ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \ - gio_can_sniff=no +GDK_PIXBUF_CONF_OPTS = \ + -Dgio_sniffing=false \ + -Dinstalled_tests=false \ + -Dman=false -HOST_GDK_PIXBUF_CONF_ENV = \ - gio_can_sniff=no +HOST_GDK_PIXBUF_CONF_OPTS = \ + -Dgio_sniffing=false \ + -Dinstalled_tests=false \ + -Dintrospection=disabled \ + -Dman=false -GDK_PIXBUF_CONF_OPTS = --disable-glibtest -HOST_GDK_PIXBUF_CONF_OPTS = --disable-introspection +ifeq ($(BR2_STATIC_LIBS),y) +GDK_PIXBUF_CONF_OPTS += -Dbuiltin_loaders=all +endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -GDK_PIXBUF_CONF_OPTS += --enable-introspection +GDK_PIXBUF_CONF_OPTS += -Dintrospection=enabled GDK_PIXBUF_DEPENDENCIES += gobject-introspection else -GDK_PIXBUF_CONF_OPTS += --disable-introspection +GDK_PIXBUF_CONF_OPTS += -Dintrospection=disabled endif -ifneq ($(BR2_PACKAGE_LIBPNG),y) -GDK_PIXBUF_CONF_OPTS += --without-libpng -else +ifeq ($(BR2_PACKAGE_LIBPNG),y) +GDK_PIXBUF_CONF_OPTS += -Dpng=true GDK_PIXBUF_DEPENDENCIES += libpng +else +GDK_PIXBUF_CONF_OPTS += -Dpng=false endif -ifneq ($(BR2_PACKAGE_JPEG),y) -HOST_GDK_PIXBUF_CONF_OPTS += --without-libjpeg -GDK_PIXBUF_CONF_OPTS += --without-libjpeg -else +ifeq ($(BR2_PACKAGE_JPEG),y) +GDK_PIXBUF_CONF_OPTS += -Djpeg=true +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=true GDK_PIXBUF_DEPENDENCIES += jpeg HOST_GDK_PIXBUF_DEPENDENCIES += host-libjpeg -endif - -ifneq ($(BR2_PACKAGE_TIFF),y) -GDK_PIXBUF_CONF_OPTS += --without-libtiff -HOST_GDK_PIXBUF_CONF_OPTS += --without-libtiff else -GDK_PIXBUF_DEPENDENCIES += tiff -GDK_PIXBUF_CONF_ENV += \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" -HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff +GDK_PIXBUF_CONF_OPTS += -Djpeg=false +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=false endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GDK_PIXBUF_CONF_OPTS += --with-x11 -GDK_PIXBUF_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_TIFF),y) +GDK_PIXBUF_CONF_OPTS += -Dtiff=true +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=true +GDK_PIXBUF_DEPENDENCIES += tiff +HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff +else +GDK_PIXBUF_CONF_OPTS += -Dtiff=false +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=false endif # gdk-pixbuf requires the loaders.cache file populated to work properly @@ -78,12 +82,6 @@ endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE endif -# Tests don't build correctly with uClibc -define GDK_PIXBUF_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef -GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS - # Target gdk-pixbuf needs loaders.cache populated to build for the # thumbnailer. Use the host-built since it matches the target options # regarding mime types (which is the used information). @@ -93,5 +91,5 @@ define GDK_PIXBUF_COPY_LOADERS_CACHE endef GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/gensio/gensio.hash b/buildroot/package/gensio/gensio.hash index ecf9d5e15..77963abe4 100644 --- a/buildroot/package/gensio/gensio.hash +++ b/buildroot/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 bef0312c68ef541f85893c6bc85930ed gensio-2.1.5.tar.gz -sha1 f23b4017aba5a6f9066f734ffb600fa36b1399c0 gensio-2.1.5.tar.gz +md5 3feb9b586f41cdda4025eeac11000127 gensio-2.2.3.tar.gz +sha1 85eb2f063e906868672e08c8f7e282272904631c gensio-2.2.3.tar.gz # Locally computed: -sha256 e497043a0415177652bfb2b1d045e4605cd5726bbcfe790ef6f555ac25825c12 gensio-2.1.5.tar.gz +sha256 ffc849be3349ba15cd6f92d109a54c7608c15d33d210a262c02ddcf00ea76262 gensio-2.2.3.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/buildroot/package/gensio/gensio.mk b/buildroot/package/gensio/gensio.mk index 1170ec00f..e68e75e2a 100644 --- a/buildroot/package/gensio/gensio.mk +++ b/buildroot/package/gensio/gensio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENSIO_VERSION = 2.1.5 +GENSIO_VERSION = 2.2.3 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING diff --git a/buildroot/package/gesftpserver/gesftpserver.mk b/buildroot/package/gesftpserver/gesftpserver.mk index ff7ce768a..85511a3c9 100644 --- a/buildroot/package/gesftpserver/gesftpserver.mk +++ b/buildroot/package/gesftpserver/gesftpserver.mk @@ -12,6 +12,8 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors +GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling GESFTPSERVER_CONF_ENV = LIBS=-lpthread diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk index e6842631f..5b50c9440 100644 --- a/buildroot/package/ghostscript/ghostscript.mk +++ b/buildroot/package/ghostscript/ghostscript.mk @@ -8,6 +8,7 @@ GHOSTSCRIPT_VERSION = 9.53.3 GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE +GHOSTSCRIPT_CPE_ID_VENDOR = artifex GHOSTSCRIPT_DEPENDENCIES = \ host-lcms2 \ host-libjpeg \ diff --git a/buildroot/package/git/0001-Fix-build-without-threads.patch b/buildroot/package/git/0001-Fix-build-without-threads.patch new file mode 100644 index 000000000..7ce85ffaf --- /dev/null +++ b/buildroot/package/git/0001-Fix-build-without-threads.patch @@ -0,0 +1,100 @@ +From 07d66af3b0800764087c4151d4f6562d4f8cce05 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Dec 2020 23:00:33 +0100 +Subject: [PATCH] Fix build without threads + +Build without threads is broken since version 2.29.0 and +https://github.com/git/git/commit/15b52a44e0c92a0658e891194a5b0610d1f53afc: + +In file included from cache.h:4, + from blame.c:1: +git-compat-util.h:1238:20: error: static declaration of 'flockfile' follows non-static declaration + static inline void flockfile(FILE *fh) + ^~~~~~~~~ +In file included from git-compat-util.h:168, + from cache.h:4, + from blame.c:1: +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:806:13: note: previous declaration of 'flockfile' was here + extern void flockfile (FILE *__stream) __THROW; + ^~~~~~~~~ +In file included from cache.h:4, + from blame.c:1: +git-compat-util.h:1242:20: error: static declaration of 'funlockfile' follows non-static declaration + static inline void funlockfile(FILE *fh) + ^~~~~~~~~~~ +In file included from git-compat-util.h:168, + from cache.h:4, + from blame.c:1: +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:813:13: note: previous declaration of 'funlockfile' was here + extern void funlockfile (FILE *__stream) __THROW; + ^~~~~~~~~~~ + +To avoid this build failure, check if flockfile is available before +defining flockfile, funlockfile and getc_unlocked + +Fixes: + - http://autobuild.buildroot.org/results/d41638d1ad8e78dd6f654367c905996b838ee649 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 5 +++++ + configure.ac | 6 ++++++ + git-compat-util.h | 2 +- + 3 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6fb86c5862..58d0893a12 100644 +--- a/Makefile ++++ b/Makefile +@@ -232,6 +232,8 @@ all:: + # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval + # This also implies NO_SETITIMER + # ++# Define NO_FLOCKFILE if you don't have flockfile() ++# + # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is + # generally faster on your platform than accessing the working directory. + # +@@ -1638,6 +1640,9 @@ endif + ifdef NO_SETITIMER + COMPAT_CFLAGS += -DNO_SETITIMER + endif ++ifdef NO_FLOCKFILE ++ COMPAT_CFLAGS += -DNO_FLOCKFILE ++endif + ifdef NO_PREAD + COMPAT_CFLAGS += -DNO_PREAD + COMPAT_OBJS += compat/pread.o +diff --git a/configure.ac b/configure.ac +index 66aedb9288..d4295b5c69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1132,6 +1132,12 @@ GIT_CHECK_FUNC(setitimer, + [NO_SETITIMER=YesPlease]) + GIT_CONF_SUBST([NO_SETITIMER]) + # ++# Define NO_FLOCKFILE if you don't have flockfile. ++GIT_CHECK_FUNC(flockfile, ++[NO_FLOCKFILE=], ++[NO_FLOCKFILE=YesPlease]) ++GIT_CONF_SUBST([NO_FLOCKFILE]) ++# + # Define NO_STRCASESTR if you don't have strcasestr. + GIT_CHECK_FUNC(strcasestr, + [NO_STRCASESTR=], +diff --git a/git-compat-util.h b/git-compat-util.h +index 7d509c5022..279cdd941e 100644 +--- a/git-compat-util.h ++++ b/git-compat-util.h +@@ -1236,7 +1236,7 @@ int warn_on_fopen_errors(const char *path); + # define SHELL_PATH "/bin/sh" + #endif + +-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS ++#if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(NO_FLOCKFILE) + static inline void flockfile(FILE *fh) + { + ; /* nothing */ +-- +2.29.2 + diff --git a/buildroot/package/git/git.hash b/buildroot/package/git/git.hash index d04359022..375ce787e 100644 --- a/buildroot/package/git/git.hash +++ b/buildroot/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848 git-2.26.2.tar.xz +sha256 55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19 git-2.30.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/buildroot/package/git/git.mk b/buildroot/package/git/git.mk index 0a67a7e1e..55178de13 100644 --- a/buildroot/package/git/git.mk +++ b/buildroot/package/git/git.mk @@ -4,12 +4,15 @@ # ################################################################################ -GIT_VERSION = 2.26.2 +GIT_VERSION = 2.30.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 +GIT_CPE_ID_VENDOR = git-scm GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) +# We're patching configure.ac +GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl diff --git a/buildroot/package/gkrellm/Config.in b/buildroot/package/gkrellm/Config.in new file mode 100644 index 000000000..e957c058d --- /dev/null +++ b/buildroot/package/gkrellm/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_GKRELLM + bool "gkrellm" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_GKRELLM_SERVER if !BR2_PACKAGE_GKRELLM_CLIENT + select BR2_PACKAGE_LIBGLIB2 + help + GKrellM is a single process stack of system monitors which + supports applying themes to match its appearance to your + window manager, Gtk, or any other theme. + + http://gkrellm.srcbox.net/ + +if BR2_PACKAGE_GKRELLM + +config BR2_PACKAGE_GKRELLM_SERVER + bool "server" + help + Enable gkrellm server. + +config BR2_PACKAGE_GKRELLM_CLIENT + bool "client" + depends on BR2_PACKAGE_XORG7 # libgtk2 + depends on BR2_INSTALL_LIBSTDCPP # libgtk2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 + select BR2_PACKAGE_LIBGTK2 + select BR2_PACKAGE_XLIB_LIBSM + help + Enable gkrellm client. + +comment "client needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_XORG7 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +endif # BR2_PACKAGE_GKRELLM + +comment "gkrellm needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/gkrellm/gkrellm.hash b/buildroot/package/gkrellm/gkrellm.hash new file mode 100644 index 000000000..88624c336 --- /dev/null +++ b/buildroot/package/gkrellm/gkrellm.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 gkrellm-2.3.11.tar.bz2 +sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING +sha256 b81e0c0c3fb2a58f25377388484a1f729abb367f5f2b43e335a6ed3272ce8536 COPYRIGHT diff --git a/buildroot/package/gkrellm/gkrellm.mk b/buildroot/package/gkrellm/gkrellm.mk new file mode 100644 index 000000000..2a6872266 --- /dev/null +++ b/buildroot/package/gkrellm/gkrellm.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# gkrellm +# +################################################################################ + +GKRELLM_VERSION = 2.3.11 +GKRELLM_SITE = http://gkrellm.srcbox.net/releases +GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2 +GKRELLM_LICENSE = GPL-3.0+ +GKRELLM_LICENSE_FILES = COPYING COPYRIGHT +GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +GKRELLM_BUILD_OPTS = \ + STRIP="" \ + SYS_LIBS=$(TARGET_NLS_LIBS) + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +GKRELLM_DEPENDENCIES += lm-sensors +else +GKRELLM_BUILD_OPTS += without-libsensors=yes +endif + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +GKRELLM_BUILD_OPTS += enable_nls=1 +else +GKRELLM_BUILD_OPTS += enable_nls=0 +endif + +ifeq ($(BR2_PACKAGE_GKRELLM_SERVER)$(BR2_PACKAGE_GKRELLM_CLIENT),yy) +GKRELLM_BUILD_DIR = $(@D) +else ifeq ($(BR2_PACKAGE_GKRELLM_SERVER),y) +GKRELLM_BUILD_DIR = $(@D)/server +else +GKRELLM_BUILD_DIR = $(@D)/src +endif + +ifeq ($(BR2_PACKAGE_GKRELLM_CLIENT),y) +GKRELLM_DEPENDENCIES += libgtk2 xlib_libSM +GKRELLM_BUILD_OPTS += X11_LIBS="-lX11 -lSM -lICE" +GKRELLM_LICENSE += GPL (base64.c), Public Domain (md5.h, md5c.c) +endif + +define GKRELLM_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \ + -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS) +endef + +define GKRELLM_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) \ + -C $(GKRELLM_BUILD_DIR) $(GKRELLM_BUILD_OPTS) \ + INSTALLROOT=$(TARGET_DIR)/usr install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash index 336e0aa07..976a19f25 100644 --- a/buildroot/package/glib-networking/glib-networking.hash +++ b/buildroot/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.64/glib-networking-2.64.3.sha256sum -sha256 937a06b124052813bfc0b0b86bff42016ff01067582e1aca65bb6dbe0845a168 glib-networking-2.64.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum +sha256 c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 glib-networking-2.66.0.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk index 295c7516c..65630c7fe 100644 --- a/buildroot/package/glib-networking/glib-networking.mk +++ b/buildroot/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.64 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).3 +GLIB_NETWORKING_VERSION_MAJOR = 2.66 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES @@ -20,6 +20,7 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING +GLIB_NETWORKING_CPE_ID_VENDOR = gnome GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ GIO_MODULE_DIR=/usr/lib/gio/modules install diff --git a/buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash b/buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash deleted file mode 100644 index c6259a474..000000000 --- a/buildroot/package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 07f3804abbc6a23315f09568686c0e5bb81d714251cf537d25a36f826cae540b glibc-2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/buildroot/package/glibc/2.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5/glibc.hash b/buildroot/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash similarity index 70% rename from buildroot/package/glibc/2.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5/glibc.hash rename to buildroot/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash index df58d6f47..b1d5243fc 100644 --- a/buildroot/package/glibc/2.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5/glibc.hash +++ b/buildroot/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 d7495fb929497bedff9827d01091a4df681cfcbe5204de1d47fc5dab1ba7457c glibc-2.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5.tar.gz +sha256 f4710e9a435a7b83e1d23dd75434f0d36b898eba9b4249c946c32b467d852fd4 glibc-2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk index b068a006a..f84f670fc 100644 --- a/buildroot/package/glibc/glibc.mk +++ b/buildroot/package/glibc/glibc.mk @@ -11,16 +11,12 @@ 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_arc),y) -# ARC support in upstream was merged in 2.32 release -# This can be removed once BR upgrades to 2.32 or later -GLIBC_VERSION = 2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5 -else ifeq ($(BR2_RISCV_32),y) +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.31-74-gd0c84d22b6a67f85a1eed3b93aef30e6953294b5 +GLIBC_VERSION = 2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2 endif # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, @@ -33,6 +29,7 @@ endif GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES +GLIBC_CPE_ID_VENDOR = gnu # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO @@ -137,7 +134,6 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --disable-werror \ --without-gd \ - --enable-obsolete-rpc \ --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) diff --git a/buildroot/package/gmp/gmp.hash b/buildroot/package/gmp/gmp.hash index 417b9d17b..d55e312bb 100644 --- a/buildroot/package/gmp/gmp.hash +++ b/buildroot/package/gmp/gmp.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz +sha256 fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.xz # Locally calculated -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/buildroot/package/gmp/gmp.mk b/buildroot/package/gmp/gmp.mk index d124463a9..5e16ef191 100644 --- a/buildroot/package/gmp/gmp.mk +++ b/buildroot/package/gmp/gmp.mk @@ -4,12 +4,13 @@ # ################################################################################ -GMP_VERSION = 6.1.2 +GMP_VERSION = 6.2.1 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES GMP_LICENSE = LGPL-3.0+ or GPL-2.0+ GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 +GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 diff --git a/buildroot/package/gnupg/gnupg.mk b/buildroot/package/gnupg/gnupg.mk index 617def884..9729441bd 100644 --- a/buildroot/package/gnupg/gnupg.mk +++ b/buildroot/package/gnupg/gnupg.mk @@ -10,6 +10,7 @@ GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG_LICENSE = GPL-3.0+ GNUPG_LICENSE_FILES = COPYING GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GNUPG_CPE_ID_VENDOR = gnupg GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no GNUPG_CONF_OPTS = \ --disable-rpath \ diff --git a/buildroot/package/gnupg2/gnupg2.hash b/buildroot/package/gnupg2/gnupg2.hash index ac78385f7..2b376ea0b 100644 --- a/buildroot/package/gnupg2/gnupg2.hash +++ b/buildroot/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2020q3/000448.html -sha1 bd949b4af7426e4afc13667d678503063c6aa4b5 gnupg-2.2.23.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2020q4/000450.html +sha1 074b21dd07419575fa31c0c5d3116596d5544cbd gnupg-2.2.25.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.25.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c gnupg-2.2.23.tar.bz2 +sha256 c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a gnupg-2.2.25.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/buildroot/package/gnupg2/gnupg2.mk b/buildroot/package/gnupg2/gnupg2.mk index af13a8d6c..2f62890db 100644 --- a/buildroot/package/gnupg2/gnupg2.mk +++ b/buildroot/package/gnupg2/gnupg2.mk @@ -4,11 +4,13 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.23 +GNUPG2_VERSION = 2.2.25 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ GNUPG2_LICENSE_FILES = COPYING +GNUPG2_CPE_ID_VENDOR = gnupg +GNUPG2_CPE_ID_PRODUCT = gnupg GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf diff --git a/buildroot/package/gnuplot/gnuplot.mk b/buildroot/package/gnuplot/gnuplot.mk index 746831275..8d096c610 100644 --- a/buildroot/package/gnuplot/gnuplot.mk +++ b/buildroot/package/gnuplot/gnuplot.mk @@ -8,6 +8,7 @@ GNUPLOT_VERSION = 5.4.1 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright +GNUPLOT_CPE_ID_VALID = YES GNUPLOT_AUTORECONF = YES @@ -31,9 +32,7 @@ endif ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) GNUPLOT_CONF_OPTS += --with-gd -GNUPLOT_DEPENDENCIES += gd -GNUPLOT_CONF_ENV += \ - ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config +GNUPLOT_DEPENDENCIES += host-pkgconf gd else GNUPLOT_CONF_OPTS += --without-gd endif diff --git a/buildroot/package/gnuradio/Config.in b/buildroot/package/gnuradio/Config.in index c7b01b454..738088802 100644 --- a/buildroot/package/gnuradio/Config.in +++ b/buildroot/package/gnuradio/Config.in @@ -156,4 +156,13 @@ config BR2_PACKAGE_GNURADIO_TRELLIS help Trellis coded modulation blocks +config BR2_PACKAGE_GNURADIO_UHD + bool "gr-uhd support" + select BR2_PACKAGE_UHD + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_FILTER + help + UHD support + endif diff --git a/buildroot/package/gnuradio/gnuradio.mk b/buildroot/package/gnuradio/gnuradio.mk index 0a818cfc2..1f4458db9 100644 --- a/buildroot/package/gnuradio/gnuradio.mk +++ b/buildroot/package/gnuradio/gnuradio.mk @@ -149,6 +149,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_UHD),y) +GNURADIO_DEPENDENCIES += uhd +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_UHD=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON else diff --git a/buildroot/package/gnutls/gnutls.mk b/buildroot/package/gnutls/gnutls.mk index 9f5315000..65bb4893e 100644 --- a/buildroot/package/gnutls/gnutls.mk +++ b/buildroot/package/gnutls/gnutls.mk @@ -17,6 +17,7 @@ GNUTLS_LICENSE_FILES += doc/COPYING endif GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre +GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ --disable-guile \ diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index de2cf74cb..cbc82a9b6 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817 go1.15.6.src.tar.gz +sha256 540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2 go1.15.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index e9f8be778..7b7f17370 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,12 +4,13 @@ # ################################################################################ -GO_VERSION = 1.15.6 +GO_VERSION = 1.15.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE +GO_CPE_ID_VENDOR = golang HOST_GO_DEPENDENCIES = host-go-bootstrap HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path diff --git a/buildroot/package/google-breakpad/google-breakpad.hash b/buildroot/package/google-breakpad/google-breakpad.hash index 81715ec57..09f9a0cf9 100644 --- a/buildroot/package/google-breakpad/google-breakpad.hash +++ b/buildroot/package/google-breakpad/google-breakpad.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz +sha256 3504639ee5d7536e7f7939b80520dfcb98863e9b50673dd577d0ab2a07105acb google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6-br1.tar.gz sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 LICENSE diff --git a/buildroot/package/gr-osmosdr/Config.in b/buildroot/package/gr-osmosdr/Config.in index a38082af9..04fa10be8 100644 --- a/buildroot/package/gr-osmosdr/Config.in +++ b/buildroot/package/gr-osmosdr/Config.in @@ -25,10 +25,14 @@ config BR2_PACKAGE_GR_OSMOSDR_IQFILE config BR2_PACKAGE_GR_OSMOSDR_RTLSDR bool "Osmocom RTLSDR support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librtlsdr -> libusb select BR2_PACKAGE_LIBRTLSDR help Enable Osmocom RTLSDR support +comment "Osmocom RTLSDR support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP bool "RTLSDR TCP Client support" help diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.hash b/buildroot/package/gr-osmosdr/gr-osmosdr.hash index 2acd85f32..95f1137e3 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.hash +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 5a7ce7afee38a56191b5d16cb4a91c92476729ff16ed09cbba5a3851ac619713 gr-osmosdr-0.2.2.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.mk b/buildroot/package/gr-osmosdr/gr-osmosdr.mk index 919b43961..870db60c5 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.mk +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.2 +GR_OSMOSDR_VERSION = 0.2.3 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING diff --git a/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch b/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch deleted file mode 100644 index 6fac7d030..000000000 --- a/buildroot/package/graphicsmagick/0001-MNG-Fix-small-heap-overwrite-or-assertion.patch +++ /dev/null @@ -1,78 +0,0 @@ -# HG changeset patch -# User Bob Friesenhahn -# Date 1590851896 18000 -# Sat May 30 10:18:16 2020 -0500 -# Node ID 50395430a37188d0d197e71bd85ed6dd0f649ee3 -# Parent 4917a4242fc0a12f2f6baa10f1c5a9b3e68c20dd -MNG: Fix small heap overwrite or assertion if magnifying and image to be magnified has rows or columns == 1. - -[Retrieved (and updated to remove ChangeLog and version changes) from: -https://sourceforge.net/p/graphicsmagick/code/ci/50395430a37188d0d197e71bd85ed6dd0f649ee3] -Signed-off-by: Fabrice Fontaine - -diff -r 4917a4242fc0 -r 50395430a371 coders/png.c ---- a/coders/png.c Fri May 01 13:49:13 2020 -0500 -+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500 -@@ -5304,7 +5304,7 @@ - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "MAGN chunk (%lu bytes): " -- "First_magnified_object_id=%u, Last_magnified_object_id=%u, " -+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, " - "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, " - "X_method=%u, Y_method=%u", - length, -@@ -5679,6 +5679,8 @@ - /* - If magnifying and a supported method is requested then - magnify the image. -+ -+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN - */ - if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) && - ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5))) -@@ -5689,7 +5691,28 @@ - - if (logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " Processing MNG MAGN chunk"); -+ " Processing MNG MAGN chunk: MB=%u, ML=%u," -+ " MR=%u, MT=%u, MX=%u, MY=%u," -+ " X_method=%u, Y_method=%u", -+ mng_info->magn_mb,mng_info->magn_ml, -+ mng_info->magn_mr,mng_info->magn_mt, -+ mng_info->magn_mx,mng_info->magn_my, -+ mng_info->magn_methx, -+ mng_info->magn_methy); -+ -+ /* -+ If the image width is 1, then X magnification is done -+ by simple pixel replication. -+ */ -+ if (image->columns == 1) -+ mng_info->magn_methx = 1; -+ -+ /* -+ If the image height is 1, then Y magnification is done -+ by simple pixel replication. -+ */ -+ if (image->rows == 1) -+ mng_info->magn_methy = 1; - - if (mng_info->magn_methx == 1) - { -@@ -5734,12 +5757,10 @@ - Image - *large_image; - -- int -- yy; -- - long - m, -- y; -+ y, -+ yy; - - register long - x; diff --git a/buildroot/package/graphicsmagick/graphicsmagick.hash b/buildroot/package/graphicsmagick/graphicsmagick.hash index cb91ff0d0..6ad5de9d6 100644 --- a/buildroot/package/graphicsmagick/graphicsmagick.hash +++ b/buildroot/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 188a8d6108fea87a0208723e8d206ec1d4d7299022be8ce5d0a9720509250250 GraphicsMagick-1.3.35.tar.xz -sha256 1d28851631892098e0bf8653fd4e89f3524184d136391b54c664e89251ca3a9a Copyright.txt +sha256 5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46 GraphicsMagick-1.3.36.tar.xz +sha256 aed5bd8e28cbce601cbe2ca2267b663ccd63152965f2d5caea1311bf0039c325 Copyright.txt diff --git a/buildroot/package/graphicsmagick/graphicsmagick.mk b/buildroot/package/graphicsmagick/graphicsmagick.mk index 7e7187048..2a22936fc 100644 --- a/buildroot/package/graphicsmagick/graphicsmagick.mk +++ b/buildroot/package/graphicsmagick/graphicsmagick.mk @@ -4,18 +4,16 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.35 +GRAPHICSMAGICK_VERSION = 1.3.36 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT GRAPHICSMAGICK_LICENSE_FILES = Copyright.txt +GRAPHICSMAGICK_CPE_ID_VENDOR = graphicsmagick GRAPHICSMAGICK_INSTALL_STAGING = YES GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config -# 0001-MNG-Fix-small-heap-overwrite-or-assertion.patch -GRAPHICSMAGICK_IGNORE_CVES += CVE-2020-12672 - ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GRAPHICSMAGICK_CONFIG_SCRIPTS += GraphicsMagick++-config endif diff --git a/buildroot/package/graphite2/graphite2.mk b/buildroot/package/graphite2/graphite2.mk index 40206bf0f..7f9e3c516 100644 --- a/buildroot/package/graphite2/graphite2.mk +++ b/buildroot/package/graphite2/graphite2.mk @@ -11,6 +11,7 @@ GRAPHITE2_SITE = \ GRAPHITE2_INSTALL_STAGING = YES GRAPHITE2_LICENSE = LGPL-2.1+ GRAPHITE2_LICENSE_FILES = LICENSE +GRAPHITE2_CPE_ID_VENDOR = sil # Avoid building docs and tests to save time define GRAPHITE2_DISABLE_TESTS_DOC diff --git a/buildroot/package/grep/grep.hash b/buildroot/package/grep/grep.hash index fae3b73e8..9dfe2f2c2 100644 --- a/buildroot/package/grep/grep.hash +++ b/buildroot/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# http://ftp.gnu.org/gnu/grep/grep-3.5.tar.xz.sig +# http://ftp.gnu.org/gnu/grep/grep-3.6.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 b82ac77707c2ab945520c8404c9fa9f890f7791a62cf2103cf6238acad87a44a grep-3.5.tar.xz +sha256 667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e grep-3.6.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/buildroot/package/grep/grep.mk b/buildroot/package/grep/grep.mk index bdc22fa46..27d204d4c 100644 --- a/buildroot/package/grep/grep.mk +++ b/buildroot/package/grep/grep.mk @@ -4,11 +4,12 @@ # ################################################################################ -GREP_VERSION = 3.5 +GREP_VERSION = 3.6 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING +GREP_CPE_ID_VENDOR = gnu GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # install into /bin like busybox grep GREP_CONF_OPTS = --exec-prefix=/ diff --git a/buildroot/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch b/buildroot/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch new file mode 100644 index 000000000..553be8cb9 --- /dev/null +++ b/buildroot/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch @@ -0,0 +1,43 @@ +From 268815d74ea34856c686dce9e9c23106b51f2782 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Tue, 2 Feb 2021 21:46:29 +0100 +Subject: [PATCH] CMakeLists.txt: fix cross-compilation with + gRPC_BUILD_GRPC_CPP_PLUGIN=OFF + +When cross-compiling gRPC, a native version of 'grpc_cpp_plugin' is searched +in the environment. For most use cases, a cross version of this file is not +needed. + +However, when cross-building with -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF, there +are some build errors, for example: + +make[3]: *** No rule to make target 'grpc_cpp_plugin', needed by 'gens/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc'. Stop. + +This is because there is still a hard dependency on 'grpc_cpp_plugin' for +these targets, not taking into account the cross-compilation case. + +Fix by depending on the variable gRPC_CPP_PLUGIN, which is set correctly for +either cross or native case. + +Signed-off-by: Thomas De Schampheleire + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6bdae22083..08aea609f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -317,7 +317,7 @@ function(protobuf_generate_grpc_cpp) + --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN} + ${_protobuf_include_path} + ${REL_FIL} +- DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin ++ DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} ${_gRPC_CPP_PLUGIN} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}" + VERBATIM) +-- +2.26.2 + diff --git a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch deleted file mode 100644 index c6de0c183..000000000 --- a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch +++ /dev/null @@ -1,52 +0,0 @@ -From aa18148e392ef28275a182db34397ccb66fb4617 Mon Sep 17 00:00:00 2001 -From: Robert Rose -Date: Wed, 28 Nov 2018 09:41:52 -0800 -Subject: [PATCH] CMakeLists.txt: allow passing a pre-existing grpc_cpp_plugin - -The grpc_cpp_plugin is meant to be executed during the build process -of grpc. As such, in cross-compilation contexts, this program needs to -be built for the host machine and not the target machine. In order to -allow this, this commit adds an option gRPC_NATIVE_CPP_PLUGIN that can -be passed on the command line, with the path to an existing -grpc_cpp_plugin binary. If not passed, grpc_cpp_plugin is built as -usual. - -Signed-off-by: Robert Rose ---- - CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be695c2..45c2fcb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11199,6 +11199,18 @@ target_link_libraries(grpc_cli - endif() - if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN) - -+if (gRPC_NATIVE_CPP_PLUGIN) -+ -+add_executable(grpc_cpp_plugin -+ IMPORTED -+) -+ -+set_property(TARGET grpc_cpp_plugin -+ PROPERTY IMPORTED_LOCATION ${gRPC_NATIVE_CPP_PLUGIN} -+) -+ -+else() -+ - add_executable(grpc_cpp_plugin - src/compiler/cpp_plugin.cc - ) -@@ -11233,6 +11245,7 @@ if(gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif() - - endif() - if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CSHARP_PLUGIN) --- -2.26.2 - diff --git a/buildroot/package/grpc/grpc.hash b/buildroot/package/grpc/grpc.hash index b26469480..52d25fc5e 100644 --- a/buildroot/package/grpc/grpc.hash +++ b/buildroot/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a grpc-1.33.2.tar.gz +sha256 27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 grpc-1.35.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk index 04c741fe9..27b28deff 100644 --- a/buildroot/package/grpc/grpc.mk +++ b/buildroot/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.33.2 +GRPC_VERSION = 1.35.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE @@ -28,7 +28,13 @@ GRPC_CONF_OPTS = \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_NATIVE_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin + -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ + -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF # grpc can use __atomic builtins, so we need to link with # libatomic when available @@ -72,13 +78,5 @@ HOST_GRPC_CONF_OPTS = \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package -# With gcc 4.8 (at least on ubuntu) there is a bug in LTO which breaks -# the linkage of the grpc_cpp_plugin with libprotobuf and pthread. This -# additional flag fixes this. -ifeq ($(BR2_HOST_GCC_AT_LEAST_4_9),) -HOST_GRPC_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS) -Wl,--no-as-needed" -endif - $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash index e4dfe61fa..0615e06a8 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.1.tar.xz.sha256sum -sha256 42a8e0f9518b94655981ede441638f9f9395f4b1b9a4b329f068ee793975a965 gst-omx-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.3.tar.xz.sha256sum +sha256 ed0f26504e9a60e15055134410f156e40952336410f2a59bdbbda45e61e8b93f gst-omx-1.18.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk index 2a9f7b6b1..bd4045293 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.1 +GST_OMX_VERSION = 1.18.3 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash index eea0086d7..bfed3570f 100644 --- a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.1.tar.xz.sha256sum -sha256 712212babd2238233d55beecfc0fe1ea8db18e8807ac6ab05a64505b2c7ab0df gst-devtools-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.3.tar.xz.sha256sum +sha256 3025fee3607caf5069154c099533785675916e044ee92c936bbeacdda3750f26 gst-devtools-1.18.3.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 4b64c8502..5e1f0110e 100644 --- a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.1 +GST1_DEVTOOLS_VERSION = 1.18.3 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 476461148..32a24dc2a 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 4b0d8c5fabe1705ba92ac8409d7d138429df5874ba196101cdd1871936719b1a gst1-interpipe-94dea528dc9e2d0df02fdf2114deecfef6a23740.tar.gz +sha256 48ad146a57f3543b8c32985b042558bf1fe67abeac9532105ebde0b441564cba gst1-interpipe-v1.1.3-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index 9d3402d02..cc4bc6e94 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 94dea528dc9e2d0df02fdf2114deecfef6a23740 +GST1_INTERPIPE_VERSION = v1.1.3 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash index 0b4e50338..dcb99fb63 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.1.tar.xz.sha256sum -sha256 39a717bc2613efbbba19df3cf5cacff0987471fc8281ba2c5dcdeaded79c2ed8 gst-libav-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.3.tar.xz.sha256sum +sha256 ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c gst-libav-1.18.3.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk index 783bafee2..6ec4f3cd6 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.1 +GST1_LIBAV_VERSION = 1.18.3 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 573178dc2..b6edff7e1 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.1.tar.xz.sha256sum -sha256 c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2 gst-plugins-bad-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.3.tar.xz.sha256sum +sha256 b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0 gst-plugins-bad-1.18.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index a9111ebdb..83abc7fab 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.1 +GST1_PLUGINS_BAD_VERSION = 1.18.3 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch new file mode 100644 index 000000000..87cd6493f --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-plugins-base/0001-gst-libs-gst-video-gstvideoaggregator.c-fix-build-wi.patch @@ -0,0 +1,45 @@ +From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Dec 2020 07:42:55 +0100 +Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc + 4.8 + +Fix the following build failure with gcc 4.8 which has been added with +https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e: + +../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init': +../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode + for (gint i = 0; i < gst_caps_get_size (src_template); i++) { + ^ + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974] +--- + gst-libs/gst/video/gstvideoaggregator.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c +index 2e3d813be..04dad6563 100644 +--- a/gst-libs/gst/video/gstvideoaggregator.c ++++ b/gst-libs/gst/video/gstvideoaggregator.c +@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, + { + GstCaps *src_template; + GstPadTemplate *pad_template; ++ gint i; + + vagg->priv = gst_video_aggregator_get_instance_private (vagg); + vagg->priv->current_caps = NULL; +@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg, + pad_template = + gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src"); + src_template = gst_pad_template_get_caps (pad_template); +- for (gint i = 0; i < gst_caps_get_size (src_template); i++) { ++ for (i = 0; i < gst_caps_get_size (src_template); i++) { + const GValue *v = + gst_structure_get_value (gst_caps_get_structure (src_template, i), + "format"); +-- +2.29.2 + diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 87f0d4e58..62c449929 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.1.tar.xz.sha256sum -sha256 1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641 gst-plugins-base-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.3.tar.xz.sha256sum +sha256 dbfa20283848f0347a223dd8523dfb62e09e5220b21b1d157a8b0c8b67ba9f52 gst-plugins-base-1.18.3.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index f5b0e0a4e..3d41d6f81 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.1 +GST1_PLUGINS_BASE_VERSION = 1.18.3 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9960282e7..47f364a5c 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.1.tar.xz.sha256sum -sha256 e210e91a5590ecb6accc9d06c949a58ca6897d8edb3b3d55828e424c624f626c gst-plugins-good-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.3.tar.xz.sha256sum +sha256 9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb gst-plugins-good-1.18.3.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 1ea1fc4c6..c413a3283 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.1 +GST1_PLUGINS_GOOD_VERSION = 1.18.3 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 7646706f0..ade4822e4 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.1.tar.xz.sha256sum -sha256 18cd6cb829eb9611ca63cbcbf46aca0f0de1dd28b2df18caa2834326a75ff725 gst-plugins-ugly-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.3.tar.xz.sha256sum +sha256 70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992 gst-plugins-ugly-1.18.3.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 88c142a13..7f6016bae 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.1 +GST1_PLUGINS_UGLY_VERSION = 1.18.3 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING diff --git a/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch b/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch deleted file mode 100644 index edff445a7..000000000 --- a/buildroot/package/gstreamer1/gst1-python/0001-fix-builds-with-python-3.8.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 10707f437f2fc3632067c6a0efa4432f7ebaf362 Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge -Date: Fri, 13 Dec 2019 10:46:20 +0200 -Subject: [PATCH] backport of "fix build with Python 3.8 by also checking for - python-3.X-embed.pc" - -Since Python 3.8 the normal checks don't include the Python libraries -anymore and linking of the gst-python module would fail. - -See also https://github.com/mesonbuild/meson/issues/5629 - -Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 - -Upstream commit: 22f28155d86e27c4134de4ed2861264003fcfd23 - -Signed-off-by: Sebastian Dröge -Signed-off-by: Adam Duskett ---- - meson.build | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/meson.build b/meson.build -index 744b7ce..492af1a 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,6 +25,14 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d - pymod = import('python') - python = pymod.find_installation(get_option('python')) - python_dep = python.dependency(required : true) -+pythonver = python.language_version() -+ -+# Workaround for https://github.com/mesonbuild/meson/issues/5629 -+# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 -+python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false) -+if not python_dep.found() -+ python_dep = python.dependency(required : true) -+endif - - python_abi_flags = python.get_variable('ABIFLAGS', '') - pylib_loc = get_option('libpython-dir') --- -2.24.1 - diff --git a/buildroot/package/gstreamer1/gst1-python/Config.in b/buildroot/package/gstreamer1/gst1-python/Config.in index 791562fea..2f3498402 100644 --- a/buildroot/package/gstreamer1/gst1-python/Config.in +++ b/buildroot/package/gstreamer1/gst1-python/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GST1_PYTHON depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection depends on BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_GOBJECT_INTROSPECTION + select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PYTHON_GOBJECT help diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.hash b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash index 1d3c687dd..e64d5c3ab 100644 --- a/buildroot/package/gstreamer1/gst1-python/gst1-python.hash +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz.sha256sum -sha256 208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8 gst-python-1.16.2.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.3.tar.xz.sha256sum +sha256 4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a gst-python-1.18.3.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.mk b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk index 122c3dd99..9ec50f085 100644 --- a/buildroot/package/gstreamer1/gst1-python/gst1-python.mk +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.16.2 +GST1_PYTHON_VERSION = 1.18.3 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES @@ -12,6 +12,7 @@ GST1_PYTHON_LICENSE_FILES = COPYING GST1_PYTHON_LICENSE = LGPL-2.1+ GST1_PYTHON_DEPENDENCIES = \ + gst1-plugins-base \ gstreamer1 \ python-gobject diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 135dc60e3..e5e185c1e 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.1.tar.xz.sha256sum -sha256 10a82865c3d199e66731017ca4b120bad071df9889e60cfe4dd6c49d953ef754 gst-rtsp-server-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.3.tar.xz.sha256sum +sha256 4f7757293b3d73dc49768b7392791668c4d0c21d41824624ffbd75c7f9ee0168 gst-rtsp-server-1.18.3.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 944a71134..0a26375f3 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.1 +GST1_RTSP_SERVER_VERSION = 1.18.3 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash index 6f8365cb1..caa9107bd 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 aec7f0bbb81775922da2c94a4f84b64b5efd38a616f0d07eb4c3ddb5770b728d gst1-shark-v0.7.1.tar.gz +sha256 b141312603af82f600981dd7231e2ecc5a42b3550fadd2450965a0a85f62cbb2 gst1-shark-v0.7.2-br1.tar.gz # Hashes for license files: -sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING +sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk index 146d1f845..ea0c5a29c 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.1 +GST1_SHARK_VERSION = v0.7.2 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 8c7dee6c3..ae4c19413 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.1.tar.xz.sha256sum -sha256 400d3c42810b50b4566df03f37319a6bdd758f969560c40147e7d9a3b0e8a6ea gstreamer-vaapi-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.3.tar.xz.sha256sum +sha256 ae9877f15757a661d4dfe6a09755a2faa959ab60752f14ca26b7ff10765e1f12 gstreamer-vaapi-1.18.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 800cfe439..84cfb8858 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.1 +GST1_VAAPI_VERSION = 1.18.3 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch b/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch deleted file mode 100644 index 8b60299ce..000000000 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-utils.c-fix-static-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 248290c5c49b25b72b40017857c6118c51ef614e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 18 Oct 2020 16:08:36 +0200 -Subject: [PATCH] utils.c: fix static build - -Static build fails since version 1.17.1 and -https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/commit/1e488d4311420b5ca193155ad8ab05509c9a4a37 -on: - -FAILED: tools/ges-launch-1.0 -/srv/storage/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -o tools/ges-launch-1.0 tools/ges-launch-1.0.p/ges-validate.c.o tools/ges-launch-1.0.p/ges-launch.c.o tools/ges-launch-1.0.p/ges-launcher.c.o tools/ges-launch-1.0.p/utils.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,-Bsymbolic-functions -static -Wl,--start-group ges/libges-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstreamer-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgobject-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libglib-2.0.a -pthread /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcre.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libffi.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgmodule-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstbase-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstvideo-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstpbutils-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstaudio-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgsttag-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgstcontroller-1.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgio-2.0.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libblkid.a -lm -Wl,--end-group -/srv/storage/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(err.os): in function `warn': -err.c:(.text+0x1d8): multiple definition of `warn'; tools/ges-launch-1.0.p/utils.c.o:utils.c:(.text+0x9bc): first defined here - -So rename warn function to gst_warn - -Fixes: - - http://autobuild.buildroot.org/results/2a528a1185644f5b23d26eb3f2b342e99aa1e493 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/216] ---- - tools/ges-launcher.c | 2 +- - tools/utils.c | 2 +- - tools/utils.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/ges-launcher.c b/tools/ges-launcher.c -index ad2921cc..9eb1f615 100644 ---- a/tools/ges-launcher.c -+++ b/tools/ges-launcher.c -@@ -261,7 +261,7 @@ _set_rendering_details (GESLauncher * self) - } - - if (!prof) { -- warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); -+ gst_warn ("No format specified and couldn't find one from output file extension, " "falling back to theora+vorbis in ogg."); - g_free (opts->format); - - opts->format = -diff --git a/tools/utils.c b/tools/utils.c -index 7ad64522..fe79f0a1 100644 ---- a/tools/utils.c -+++ b/tools/utils.c -@@ -222,7 +222,7 @@ ok (const gchar * format, ...) - } - - void --warn (const gchar * format, ...) -+gst_warn (const gchar * format, ...) - { - va_list var_args; - -diff --git a/tools/utils.h b/tools/utils.h -index ac18ab5a..e2f0ac67 100644 ---- a/tools/utils.h -+++ b/tools/utils.h -@@ -29,9 +29,9 @@ void print_enum (GType enum_type); - - void print (GstDebugColorFlags c, gboolean err, gboolean nline, const gchar * format, va_list var_args); - void ok (const gchar * format, ...); --void warn (const gchar * format, ...); -+void gst_warn (const gchar * format, ...); - void printerr (const gchar * format, ...); - - gchar * get_file_extension (gchar * uri); - void describe_encoding_profile (GstEncodingProfile *profile); --void print_timeline(GESTimeline *timeline); -\ No newline at end of file -+void print_timeline(GESTimeline *timeline); --- -2.28.0 - diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 4b97105f3..1959a73bd 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.1.tar.xz.sha256sum -sha256 e93cb3f1896565c57defa72758e49b6eb6685e0f804abd184f395c94822a3927 gst-editing-services-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.3.tar.xz.sha256sum +sha256 8ae139b13b1646a20ba63b0b90877d35813e24cd87642d325e751fc7cb175e20 gst-editing-services-1.18.3.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index a802e824d..456467a92 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.1 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.3 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash index d970e9c64..18fb343ff 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.1.tar.xz.sha256sum -sha256 79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba gstreamer-1.18.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.3.tar.xz.sha256sum +sha256 0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100 gstreamer-1.18.3.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk index 963a7006d..a63a17676 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.1 +GSTREAMER1_VERSION = 1.18.3 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/buildroot/package/gtest/gtest.mk b/buildroot/package/gtest/gtest.mk index 7f967b8bf..f8b2339d7 100644 --- a/buildroot/package/gtest/gtest.mk +++ b/buildroot/package/gtest/gtest.mk @@ -10,6 +10,8 @@ GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3-Clause GTEST_LICENSE_FILES = googletest/LICENSE +GTEST_CPE_ID_VENDOR = google +GTEST_CPE_ID_PRODUCT = google_test ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) GTEST_DEPENDENCIES += host-gtest diff --git a/buildroot/package/guile/guile.mk b/buildroot/package/guile/guile.mk index 0e7328f19..44f4d1c85 100644 --- a/buildroot/package/guile/guile.mk +++ b/buildroot/package/guile/guile.mk @@ -29,6 +29,10 @@ GUILE_CFLAGS = \ -DHAVE_GC_GET_FREE_SPACE_DIVISOR \ -DHAVE_GC_SET_FINALIZE_ON_DEMAND +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GUILE_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif diff --git a/buildroot/package/gzip/gzip.mk b/buildroot/package/gzip/gzip.mk index 17b27b497..c8fd3ddb7 100644 --- a/buildroot/package/gzip/gzip.mk +++ b/buildroot/package/gzip/gzip.mk @@ -11,6 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip GZIP_CONF_OPTS = --exec-prefix=/ GZIP_LICENSE = GPL-3.0+ GZIP_LICENSE_FILES = COPYING +GZIP_CPE_ID_VENDOR = gnu GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes HOST_GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes # configure substitutes $(SHELL) for the shell shebang in scripts like diff --git a/buildroot/package/hackrf/Config.in b/buildroot/package/hackrf/Config.in index b86790f2b..05d01adc9 100644 --- a/buildroot/package/hackrf/Config.in +++ b/buildroot/package/hackrf/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HACKRF bool "hackrf" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBUSB @@ -10,5 +11,6 @@ config BR2_PACKAGE_HACKRF https://github.com/mossmann/hackrf/tree/master/host -comment "hackrf needs a toolchain w/ threads, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "hackrf needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index fbbd2e4ba..0e293e854 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.6.tar.gz.sha256 -sha256 be1c6754cbaceafc4837e0c6036c7f81027a3992516435cbbbc5dc749bf5a087 haproxy-2.2.6.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.8.tar.gz.sha256 +sha256 61f90e3e2a36bd8800a5bee31cba7eef37c9aa8a353b6c741edaa411510b14be haproxy-2.2.8.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index a6e07c9ad..7c05decf2 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -5,10 +5,11 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).6 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 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 +HAPROXY_CPE_ID_VENDOR = haproxy HAPROXY_MAKE_OPTS = \ LD=$(TARGET_CC) \ diff --git a/buildroot/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch b/buildroot/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch similarity index 97% rename from buildroot/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch rename to buildroot/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch index 128876dfb..6d7225cbb 100644 --- a/buildroot/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch +++ b/buildroot/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch @@ -26,7 +26,7 @@ diff --git a/meson.build b/meson.build index bf3925db..6d263d48 100644 --- a/meson.build +++ b/meson.build -@@ -284,13 +284,15 @@ endif +@@ -281,13 +281,15 @@ endif # threads thread_dep = null_dep if host_machine.system() != 'windows' diff --git a/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch b/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch deleted file mode 100644 index 700f6f85e..000000000 --- a/buildroot/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 432dfd0a1d8fe0a8df89e7ce828c520c7758f10c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 24 Sep 2020 21:00:34 +0200 -Subject: [PATCH] src/meson.build: allow introspection when cross-compiling - -introspection can be enabled when cross-compiling on certains conditions -(for example it is supported by buildroot) - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/harfbuzz/harfbuzz/pull/2692] ---- - src/meson.build | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 19290245..7db43508 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -637,11 +637,6 @@ if have_gobject - gir = find_program('g-ir-scanner', required: get_option('introspection')) - build_gir = gir.found() - -- build_gir = build_gir and not meson.is_cross_build() -- if not build_gir and get_option('introspection').enabled() -- error('Introspection support is requested but it isn\'t available in cross builds') -- endif -- - build_gir = build_gir and get_option('default_library') != 'static' - if not build_gir and get_option('introspection').enabled() - error('Introspection support is requested but the default library option should be shared or both') --- -2.28.0 - diff --git a/buildroot/package/harfbuzz/harfbuzz.hash b/buildroot/package/harfbuzz/harfbuzz.hash index dac859bbd..98b137c8b 100644 --- a/buildroot/package/harfbuzz/harfbuzz.hash +++ b/buildroot/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce harfbuzz-2.7.2.tar.xz +sha256 6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7 harfbuzz-2.7.4.tar.xz sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b COPYING diff --git a/buildroot/package/harfbuzz/harfbuzz.mk b/buildroot/package/harfbuzz/harfbuzz.mk index fae9278b7..a17283bea 100644 --- a/buildroot/package/harfbuzz/harfbuzz.mk +++ b/buildroot/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 2.7.2 +HARFBUZZ_VERSION = 2.7.4 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) diff --git a/buildroot/package/haveged/haveged.mk b/buildroot/package/haveged/haveged.mk index 924b499fa..3980f8013 100644 --- a/buildroot/package/haveged/haveged.mk +++ b/buildroot/package/haveged/haveged.mk @@ -8,6 +8,7 @@ HAVEGED_VERSION = 1.9.13 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING +HAVEGED_SELINUX_MODULES = entropyd ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) HAVEGED_CONF_OPTS += --enable-clock_gettime=yes diff --git a/buildroot/package/hdparm/hdparm.hash b/buildroot/package/hdparm/hdparm.hash index 4251b5a65..b35da4527 100644 --- a/buildroot/package/hdparm/hdparm.hash +++ b/buildroot/package/hdparm/hdparm.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 4652c49cf096a64683c05f54b4fa4679 hdparm-9.58.tar.gz -sha1 b3425a141f1c0fe9f53b18631437129c2155ee45 hdparm-9.58.tar.gz +md5 25a791d47236c58801f8b27074f3ef93 hdparm-9.60.tar.gz +sha1 f15378cf533f79dbbc040cd77183137d24292ecc hdparm-9.60.tar.gz # Locally computed -sha256 9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f hdparm-9.58.tar.gz -sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT +sha256 8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc hdparm-9.60.tar.gz +sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/buildroot/package/hdparm/hdparm.mk b/buildroot/package/hdparm/hdparm.mk index 9826dde01..d9470ef7f 100644 --- a/buildroot/package/hdparm/hdparm.mk +++ b/buildroot/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.58 +HDPARM_VERSION = 9.60 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT diff --git a/buildroot/package/hidapi/Config.in b/buildroot/package/hidapi/Config.in index d7d8cd53d..061c7883f 100644 --- a/buildroot/package/hidapi/Config.in +++ b/buildroot/package/hidapi/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HIDAPI bool "hidapi" depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -14,5 +15,7 @@ config BR2_PACKAGE_HIDAPI http://github.com/libusb/hidapi/ -comment "hidapi needs udev /dev management and a toolchain w/ NPTL threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_HAS_UDEV +comment "hidapi needs udev /dev management and a toolchain w/ NPTL, threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/hiredis/hiredis.mk b/buildroot/package/hiredis/hiredis.mk index 27a26661c..f340fb8a4 100644 --- a/buildroot/package/hiredis/hiredis.mk +++ b/buildroot/package/hiredis/hiredis.mk @@ -9,6 +9,7 @@ HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING +HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON diff --git a/buildroot/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk index 676e36d8b..efeefd8b3 100644 --- a/buildroot/package/hostapd/hostapd.mk +++ b/buildroot/package/hostapd/hostapd.mk @@ -23,6 +23,7 @@ HOSTAPD_IGNORE_CVES += CVE-2019-16275 # 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch HOSTAPD_IGNORE_CVES += CVE-2020-12695 +HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_CONFIG_SET = HOSTAPD_CONFIG_ENABLE = \ diff --git a/buildroot/package/hplip/Config.in b/buildroot/package/hplip/Config.in index f4e0fe753..bab29303e 100644 --- a/buildroot/package/hplip/Config.in +++ b/buildroot/package/hplip/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_HPLIP depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on !BR2_STATIC_LIBS # libdl select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_JPEG @@ -17,7 +18,7 @@ config BR2_PACKAGE_HPLIP http://hplipopensource.com/ -comment "hplip needs a toolchain w/ C++, threads, dynamic library" +comment "hplip needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" depends on BR2_PACKAGE_CUPS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/htop/Config.in b/buildroot/package/htop/Config.in index 7bb0fe6e0..214a9a1c9 100644 --- a/buildroot/package/htop/Config.in +++ b/buildroot/package/htop/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_HTOP bool "htop" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlopen() select BR2_PACKAGE_NCURSES help htop is an interactive text-mode process viewer for Linux. It aims to be a better top. https://htop.dev/ + +comment "htop needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/htop/htop.hash b/buildroot/package/htop/htop.hash index fb8d0bff4..647feabb8 100644 --- a/buildroot/package/htop/htop.hash +++ b/buildroot/package/htop/htop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6471d9505daca5c64073fc37dbab4d012ca4fc6a7040a925dad4a7553e3349c4 htop-3.0.2.tar.gz +sha256 19535f8f01ac08be2df880c93c9cedfc50fa92320d48e3ef92a30b6edc4d1917 htop-3.0.5.tar.gz sha256 c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be COPYING diff --git a/buildroot/package/htop/htop.mk b/buildroot/package/htop/htop.mk index 457926afe..aa2ff2475 100644 --- a/buildroot/package/htop/htop.mk +++ b/buildroot/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.0.2 +HTOP_VERSION = 3.0.5 HTOP_SITE = https://dl.bintray.com/htop/source HTOP_DEPENDENCIES = ncurses # Prevent htop build system from searching the host paths @@ -12,17 +12,17 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF HTOP_LICENSE = GPL-2.0 HTOP_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +HTOP_CONF_OPTS += --with-sensors +HTOP_DEPENDENCIES += lm-sensors +else +HTOP_CONF_OPTS += --without-sensors +endif + ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) HTOP_CONF_OPTS += --enable-unicode else HTOP_CONF_OPTS += --disable-unicode endif -# ARC uses an old uClibc that needs dladdr() for backtrace support, -# which doesn't work for static only scenario, so as a workaround, we -# pretend that execinfo.h is not available. -ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy) -HTOP_CONF_ENV += ac_cv_header_execinfo_h=no -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/htpdate/htpdate.hash b/buildroot/package/htpdate/htpdate.hash index b82b2bfa0..824266c1b 100644 --- a/buildroot/package/htpdate/htpdate.hash +++ b/buildroot/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 267003ca4d5d191122bfd8f85a0fd2d0b7d751f7b04f5fde4e8f51e570c98d0b htpdate-1.2.5.tar.gz +sha256 d2cff522b8f53b00769dcca77d8025b19238ed35d702a4739dc05e387f718909 htpdate-1.2.6.tar.gz sha256 b1c8d41afde943cacedab52cbb44ef7ffb7026e738b9c891009e89559fe31c20 LICENSE diff --git a/buildroot/package/htpdate/htpdate.mk b/buildroot/package/htpdate/htpdate.mk index 7a08738d2..52022346a 100644 --- a/buildroot/package/htpdate/htpdate.mk +++ b/buildroot/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.2.5 +HTPDATE_VERSION = 1.2.6 HTPDATE_SITE = $(call github,angeloc,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/hwdata/hwdata.hash b/buildroot/package/hwdata/hwdata.hash index 79f7b4ea3..489f47a7c 100644 --- a/buildroot/package/hwdata/hwdata.hash +++ b/buildroot/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1fb83c015ae9da1ee2a176041ca3e949ac2b71f23356a43c9c958b551ea57662 hwdata-0.335.tar.gz +sha256 f1e79131c870dce4a3b4b75edeefc5c9aef416d488a131c66cb6893be743be63 hwdata-0.342.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/buildroot/package/hwdata/hwdata.mk b/buildroot/package/hwdata/hwdata.mk index b6a79a44b..7d718baca 100644 --- a/buildroot/package/hwdata/hwdata.mk +++ b/buildroot/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.335 +HWDATA_VERSION = 0.342 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/i2pd/i2pd.hash b/buildroot/package/i2pd/i2pd.hash index 1a19ccf68..4bfaecab0 100644 --- a/buildroot/package/i2pd/i2pd.hash +++ b/buildroot/package/i2pd/i2pd.hash @@ -1,4 +1,4 @@ -# From https://github.com/PurpleI2P/i2pd/releases/download/2.33.0/SHA512SUMS -sha512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910 i2pd-2.33.0.tar.gz +# From https://github.com/PurpleI2P/i2pd/releases/download/2.35.0/SHA512SUMS +sha512 cffc41484a63eba7c7091957cd4d8b8584bb02580d70c69132f1447018be5b3cde7893ae4a0bcb914d53e95c089d4253ece6e20442c9da7810e7800a2b99b117 i2pd-2.35.0.tar.gz # Locally computed: -sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE +sha256 9c87aff490b272254d716475e3c4973f5f64af1d18f9f6962c1e61e252e1ad9a LICENSE diff --git a/buildroot/package/i2pd/i2pd.mk b/buildroot/package/i2pd/i2pd.mk index 461f483d1..ef6a467d7 100644 --- a/buildroot/package/i2pd/i2pd.mk +++ b/buildroot/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.33.0 +I2PD_VERSION = 2.35.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE @@ -16,11 +16,6 @@ I2PD_DEPENDENCIES = \ I2PD_CONF_OPTS += -DWITH_GUI=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) I2PD_CONF_OPTS += \ -DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \ diff --git a/buildroot/package/i7z/0001-fix-build-with-gcc-10.patch b/buildroot/package/i7z/0001-fix-build-with-gcc-10.patch new file mode 100644 index 000000000..a25e937b0 --- /dev/null +++ b/buildroot/package/i7z/0001-fix-build-with-gcc-10.patch @@ -0,0 +1,63 @@ +From 6e4e407a374512b5bcb5a7c184258653e472ef9f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Jan 2021 07:47:58 +0100 +Subject: [PATCH] fix build with gcc 10 + +Fix the following build failure with gcc 10 (which defaults to +-fno-common): + +/home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fno-schedule-insns2 -fno-schedule-insns -fno-inline-small-functions -fno-caller-saves -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wimplicit-function-declaration -Dx64_BIT -o i7z i7z.o helper_functions.o i7z_Single_Socket.o i7z_Dual_Socket.o -lncurses -lpthread -lrt -lm +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/10.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: i7z_Dual_Socket.o:(.bss+0x0): multiple definition of `global_ts'; i7z_Single_Socket.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/1a433611ba8676cf1ca276fccaf3633971bd562e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ajaiantilal/i7z/pull/27] +--- + i7z.c | 1 + + i7z_Dual_Socket.c | 2 +- + i7z_Single_Socket.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/i7z.c b/i7z.c +index 61e2757..910a608 100644 +--- a/i7z.c ++++ b/i7z.c +@@ -34,6 +34,7 @@ int Dual_Socket(); + + int socket_0_num=0, socket_1_num=1; + bool use_ncurses = true; ++struct timespec global_ts; + + /////////////////////LOGGING TO FILE//////////////////////////////////////// + FILE *fp_log_file_freq; +diff --git a/i7z_Dual_Socket.c b/i7z_Dual_Socket.c +index 1388339..ceafdce 100644 +--- a/i7z_Dual_Socket.c ++++ b/i7z_Dual_Socket.c +@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num); + extern struct program_options prog_options; + FILE *fp_log_file; + +-struct timespec global_ts; ++extern struct timespec global_ts; + extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2; + + extern char* CPU_FREQUENCY_LOGGING_FILE_single; +diff --git a/i7z_Single_Socket.c b/i7z_Single_Socket.c +index 16e98c1..b7266e6 100644 +--- a/i7z_Single_Socket.c ++++ b/i7z_Single_Socket.c +@@ -35,7 +35,7 @@ int Read_Thermal_Status_CPU(int cpu_num); + extern struct program_options prog_options; + extern FILE *fp_log_file_freq; + +-struct timespec global_ts; ++extern struct timespec global_ts; + + extern char* CPU_FREQUENCY_LOGGING_FILE_single; + extern char* CPU_FREQUENCY_LOGGING_FILE_dual; +-- +2.29.2 + diff --git a/buildroot/package/icu/icu.hash b/buildroot/package/icu/icu.hash index 5c10008d8..80cdd7df0 100644 --- a/buildroot/package/icu/icu.hash +++ b/buildroot/package/icu/icu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc icu4c-67_1-src.tgz -sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 LICENSE +sha256 a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d icu4c-68_1-src.tgz +sha256 7915b19db903070778581ae05d8bf4ea241b34a05deb51ca4f5cbb15ea1cbba3 LICENSE diff --git a/buildroot/package/icu/icu.mk b/buildroot/package/icu/icu.mk index c07ca2da3..8d0288578 100644 --- a/buildroot/package/icu/icu.mk +++ b/buildroot/package/icu/icu.mk @@ -7,7 +7,7 @@ # Git tags (and therefore versions on release-monitoring.org) use the # XX-Y format, but the tarballs are named XX_Y and the containing # directories XX.Y. -ICU_VERSION = 67-1 +ICU_VERSION = 68-1 ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) diff --git a/buildroot/package/ifupdown/ifupdown.mk b/buildroot/package/ifupdown/ifupdown.mk index 84d24aeda..e62c2a79c 100644 --- a/buildroot/package/ifupdown/ifupdown.mk +++ b/buildroot/package/ifupdown/ifupdown.mk @@ -9,6 +9,7 @@ IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown IFUPDOWN_LICENSE = GPL-2.0+ IFUPDOWN_LICENSE_FILES = COPYING +IFUPDOWN_CPE_ID_VENDOR = debian define IFUPDOWN_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ diff --git a/buildroot/package/igd2-for-linux/igd2-for-linux.hash b/buildroot/package/igd2-for-linux/igd2-for-linux.hash index fc215727d..fe1272338 100644 --- a/buildroot/package/igd2-for-linux/igd2-for-linux.hash +++ b/buildroot/package/igd2-for-linux/igd2-for-linux.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 e3fcc7c9da4ad1ca16227b3b1b3712bcfb3f6ec922685eee7ae4a76edfa32bb4 igd2-for-linux-2.0.tar.gz +sha256 843f2b0a7597e6cc7af85da099a7cce3401a334cbb4a6ae9d38ce252311db9b9 igd2-for-linux-2.1.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 linuxigd2/doc/LICENSE sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 linuxigd2/src/threadutil/COPYING diff --git a/buildroot/package/igd2-for-linux/igd2-for-linux.mk b/buildroot/package/igd2-for-linux/igd2-for-linux.mk index 85119a14b..8cc3c6ae1 100644 --- a/buildroot/package/igd2-for-linux/igd2-for-linux.mk +++ b/buildroot/package/igd2-for-linux/igd2-for-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGD2_FOR_LINUX_VERSION = 2.0 +IGD2_FOR_LINUX_VERSION = 2.1 IGD2_FOR_LINUX_SITE = \ $(call github,Orange-OpenSource,igd2-for-linux,v$(IGD2_FOR_LINUX_VERSION)) @@ -12,26 +12,9 @@ IGD2_FOR_LINUX_LICENSE = GPL-2.0, BSD-3-Clause IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE linuxigd2/src/threadutil/COPYING IGD2_FOR_LINUX_DEPENDENCIES = libupnp - -IGD2_FOR_LINUX_BUILD_DIR = $(@D)/linuxigd2 -IGD2_FOR_LINUX_CONF_DIR = $(IGD2_FOR_LINUX_BUILD_DIR)/configs - -define IGD2_FOR_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(IGD2_FOR_LINUX_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - LIBUPNP_PREFIX="$(STAGING_DIR)/usr" \ - all -endef - -define IGD2_FOR_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(IGD2_FOR_LINUX_BUILD_DIR)/bin/upnpd \ - $(TARGET_DIR)/usr/sbin/upnpd - $(INSTALL) -D -m 0644 $(IGD2_FOR_LINUX_CONF_DIR)/upnpd.conf \ - $(TARGET_DIR)/etc/upnpd.conf - mkdir -p $(TARGET_DIR)/etc/linuxigd/ - cp -dpfr $(IGD2_FOR_LINUX_CONF_DIR)/*.{xml,png} \ - $(TARGET_DIR)/etc/linuxigd/ -endef +# From git +IGD2_FOR_LINUX_AUTORECONF = YES +IGD2_FOR_LINUX_SUBDIR = linuxigd2 define IGD2_FOR_LINUX_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/igd2-for-linux/S99upnpd \ @@ -43,4 +26,4 @@ define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service endef -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/imagemagick/imagemagick.hash b/buildroot/package/imagemagick/imagemagick.hash index 8a111edb1..c45caf6c5 100644 --- a/buildroot/package/imagemagick/imagemagick.hash +++ b/buildroot/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fa993169a06052267eaf81cf85bbf5a30c0bf243511017d986f47abbe65ff262 imagemagick-7.0.10-51.tar.gz -sha256 7b43ee798e835f5e0dc03c92c52d288b46a771c4561d57ef2a9a8b2c76bf33cb LICENSE +sha256 84442158aea070095efa832cfe868fd99d6befdf609444f0c9e9f1b4f25480cd imagemagick-7.0.10-62.tar.gz +sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/buildroot/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk index f30d3dfc2..97517228c 100644 --- a/buildroot/package/imagemagick/imagemagick.mk +++ b/buildroot/package/imagemagick/imagemagick.mk @@ -4,10 +4,11 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.10-51 +IMAGEMAGICK_VERSION = 7.0.10-62 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE +IMAGEMAGICK_CPE_ID_VENDOR = imagemagick IMAGEMAGICK_INSTALL_STAGING = YES IMAGEMAGICK_CONFIG_SCRIPTS = \ @@ -31,9 +32,12 @@ IMAGEMAGICK_CONF_OPTS = \ --without-fpx \ --without-gslib \ --without-gvc \ + --without-heic \ --without-jbig \ + --without-jxl \ --without-lqr \ --without-openexr \ + --without-openjp2 \ --without-perl \ --without-raqm \ --without-wmf \ @@ -87,6 +91,13 @@ else IMAGEMAGICK_CONF_OPTS += --without-png endif +ifeq ($(BR2_PACKAGE_LIBRAW),y) +IMAGEMAGICK_CONF_OPTS += --with-raw +IMAGEMAGICK_DEPENDENCIES += libraw +else +IMAGEMAGICK_CONF_OPTS += --without-raw +endif + ifeq ($(BR2_PACKAGE_LIBRSVG),y) IMAGEMAGICK_CONF_OPTS += --with-rsvg IMAGEMAGICK_DEPENDENCIES += librsvg @@ -102,6 +113,20 @@ else IMAGEMAGICK_CONF_OPTS += --without-xml endif +ifeq ($(BR2_PACKAGE_LIBZIP),y) +IMAGEMAGICK_CONF_OPTS += --with-zip +IMAGEMAGICK_DEPENDENCIES += libzip +else +IMAGEMAGICK_CONF_OPTS += --without-zip +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +IMAGEMAGICK_CONF_OPTS += --with-zstd +IMAGEMAGICK_DEPENDENCIES += zstd +else +IMAGEMAGICK_CONF_OPTS += --without-zstd +endif + ifeq ($(BR2_PACKAGE_PANGO),y) IMAGEMAGICK_CONF_OPTS += --with-pango IMAGEMAGICK_DEPENDENCIES += pango @@ -162,13 +187,19 @@ HOST_IMAGEMAGICK_CONF_OPTS = \ --without-fpx \ --without-gslib \ --without-gvc \ + --without-heic \ --without-jbig \ + --without-jxl \ --without-lqr \ --without-openexr \ + --without-openjp2 \ --without-perl \ --without-raqm \ + --without-raw \ --without-wmf \ --without-x \ + --without-zip \ + --without-zstd \ --without-bzlib \ --without-fftw \ --without-lcms \ diff --git a/buildroot/package/imx-mkimage/imx-mkimage.hash b/buildroot/package/imx-mkimage/imx-mkimage.hash index 6d5a329ed..88fac9bb3 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.hash +++ b/buildroot/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7e4c1c45b0d36e088bd7891335aa3c726682750984b7ca072e3c6329def92cf imx-mkimage-rel_imx_4.19.35_1.1.0.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 2746136aa5ed79ba24cfbe877d29022a2a33f6614b1bba728e95d1b2f0448196 imx-mkimage-rel_imx_5.4.70_2.3.0-br1.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/imx-mkimage/imx-mkimage.mk b/buildroot/package/imx-mkimage/imx-mkimage.mk index ed0e435a7..626e3d873 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.mk +++ b/buildroot/package/imx-mkimage/imx-mkimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_4.19.35_1.1.0 +IMX_MKIMAGE_VERSION = rel_imx_5.4.70_2.3.0 IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/imx-usb-loader/Config.in b/buildroot/package/imx-usb-loader/Config.in index 1cc0dd8c2..9a152e091 100644 --- a/buildroot/package/imx-usb-loader/Config.in +++ b/buildroot/package/imx-usb-loader/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_IMX_USB_LOADER bool "imx-usb-loader" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help This package contains tools to download and execute code @@ -9,5 +10,6 @@ config BR2_PACKAGE_IMX_USB_LOADER https://github.com/boundarydevices/imx_usb_loader -comment "imx-usb-loader needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "imx-usb-loader needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/imx-usb-loader/Config.in.host b/buildroot/package/imx-usb-loader/Config.in.host index 04bd4cc01..78c5edea3 100644 --- a/buildroot/package/imx-usb-loader/Config.in.host +++ b/buildroot/package/imx-usb-loader/Config.in.host @@ -1,9 +1,14 @@ config BR2_PACKAGE_HOST_IMX_USB_LOADER bool "host imx-usb-loader" depends on BR2_arm || BR2_aarch64 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains tools to download and execute code on Freescale i.MX5x/6x/7x/8x and Vybrid SoCs through the Serial Download Protocol. https://github.com/boundarydevices/imx_usb_loader + +comment "host imx-usb-loader needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_aarch64 + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/inadyn/inadyn.hash b/buildroot/package/inadyn/inadyn.hash index 8480e449c..638f92d11 100644 --- a/buildroot/package/inadyn/inadyn.hash +++ b/buildroot/package/inadyn/inadyn.hash @@ -1,6 +1,5 @@ -# From https://github.com/troglobit/inadyn/releases/download/v2.7/inadyn-2.7.tar.xz.md5 -md5 3ab125df504a9755264a9ebeedbfa4de inadyn-2.7.tar.xz +# From https://github.com/troglobit/inadyn/releases/download/v2.8.1/inadyn-2.8.1.tar.xz.sha256 +sha256 1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685 inadyn-2.8.1.tar.xz # Locally computed -sha256 eb03bc9d9c09dfbbc651b43a2eb5a967d0454a8293576df23784710dac50c6a4 inadyn-2.7.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/inadyn/inadyn.mk b/buildroot/package/inadyn/inadyn.mk index 7888f5a36..c115e8926 100644 --- a/buildroot/package/inadyn/inadyn.mk +++ b/buildroot/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.7 +INADYN_VERSION = 2.8.1 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz INADYN_LICENSE = GPL-2.0+ diff --git a/buildroot/package/inih/0001-meson-optionally-depend-on-c.patch b/buildroot/package/inih/0001-meson-optionally-depend-on-c.patch new file mode 100644 index 000000000..a039dde1d --- /dev/null +++ b/buildroot/package/inih/0001-meson-optionally-depend-on-c.patch @@ -0,0 +1,34 @@ +From e192e4762749cfe3bc350e0353aa82b1a849256d Mon Sep 17 00:00:00 2001 +From: bkuhls +Date: Sun, 10 Jan 2021 21:56:56 +0100 +Subject: [PATCH] meson: optionally depend on c++ (#124) + +This fix is needed to allow building with toolchains which lack c++. + +Downloaded from upstream commit: +https://github.com/benhoyt/inih/commit/e192e4762749cfe3bc350e0353aa82b1a849256d + +Signed-off-by: Bernd Kuhls +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4602326..5393af4 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('inih', +- ['c','cpp'], ++ ['c'], + default_options : ['default_library=static'], + license : 'BSD-3-Clause', + ) +@@ -83,6 +83,7 @@ inih_dep = declare_dependency( + + #### INIReader #### + if get_option('with_INIReader') ++ add_languages('cpp') + inc_INIReader = include_directories('cpp') + + lib_INIReader = library('INIReader', diff --git a/buildroot/package/inih/Config.in b/buildroot/package/inih/Config.in new file mode 100644 index 000000000..2c6553a8c --- /dev/null +++ b/buildroot/package/inih/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_INIH + bool "inih" + help + inih (INI Not Invented Here) is a simple .INI file parser + written in C. + + https://github.com/benhoyt/inih/ diff --git a/buildroot/package/inih/inih.hash b/buildroot/package/inih/inih.hash new file mode 100644 index 000000000..2560a91fe --- /dev/null +++ b/buildroot/package/inih/inih.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 inih-52.tar.gz +sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/buildroot/package/inih/inih.mk b/buildroot/package/inih/inih.mk new file mode 100644 index 000000000..ccc549b01 --- /dev/null +++ b/buildroot/package/inih/inih.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# INIH +# +################################################################################ + +INIH_VERSION = 52 +INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) +INIH_INSTALL_STAGING = YES +INIH_LICENSE = BSD-3-Clause +INIH_LICENSE_FILES = LICENSE.txt +INIH_CONF_OPTS = -Ddistro_install=true + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +INIH_CONF_OPTS += -Dwith_INIReader=true +else +INIH_CONF_OPTS += -Dwith_INIReader=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch b/buildroot/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch new file mode 100644 index 000000000..46775e934 --- /dev/null +++ b/buildroot/package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch @@ -0,0 +1,162 @@ +From da966a2ab1f5161cc0a21a4cd7e07edf732ebee9 Mon Sep 17 00:00:00 2001 +From: Dmitry Rogozhkin +Date: Thu, 19 Mar 2020 20:59:12 -0700 +Subject: [PATCH] build: fix Werror=format-overflow under gcc-10 + +Fixes: #870 + +With upcoming gcc-10 we start to see Werror=format-overflow reporting +that we attempt to printf %s null strings. + +Change-Id: I7a62bc98bf7dd6bcd61d475d7650a06aa1a70932 +Signed-off-by: Dmitry Rogozhkin +[Retrieved from: +https://github.com/intel/media-driver/commit/da966a2ab1f5161cc0a21a4cd7e07edf732ebee9] +Signed-off-by: Fabrice Fontaine +--- + media_driver/linux/common/os/i915/xf86drm.c | 57 ++++++++++--------- + .../linux/ult/libdrm_mock/xf86drm_mock.c | 57 ++++++++++--------- + 2 files changed, 58 insertions(+), 56 deletions(-) + +diff --git a/media_driver/linux/common/os/i915/xf86drm.c b/media_driver/linux/common/os/i915/xf86drm.c +index 7594bde99..d0fc1b7ac 100644 +--- a/media_driver/linux/common/os/i915/xf86drm.c ++++ b/media_driver/linux/common/os/i915/xf86drm.c +@@ -581,37 +581,38 @@ static int drmOpenByBusid(const char *busid, int type) + + drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); + for (i = base; i < base + DRM_MAX_MINOR; i++) { +- fd = drmOpenMinor(i, 1, type); +- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); +- if (fd >= 0) { +- /* We need to try for 1.4 first for proper PCI domain support +- * and if that fails, we know the kernel is busted +- */ +- sv.drm_di_major = 1; +- sv.drm_di_minor = 4; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- if (drmSetInterfaceVersion(fd, &sv)) { ++ fd = drmOpenMinor(i, 1, type); ++ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); ++ if (fd >= 0) { ++ /* We need to try for 1.4 first for proper PCI domain support ++ * and if that fails, we know the kernel is busted ++ */ ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 4; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ if (drmSetInterfaceVersion(fd, &sv)) { + #ifndef __alpha__ +- pci_domain_ok = 0; ++ pci_domain_ok = 0; + #endif +- sv.drm_di_major = 1; +- sv.drm_di_minor = 1; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); +- drmSetInterfaceVersion(fd, &sv); +- } +- buf = drmGetBusid(fd); +- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); +- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) { +- drmFreeBusid(buf); +- return fd; ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 1; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); ++ drmSetInterfaceVersion(fd, &sv); ++ } ++ buf = drmGetBusid(fd); ++ if (buf) { ++ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); ++ if (drmMatchBusID(buf, busid, pci_domain_ok)) { ++ drmFreeBusid(buf); ++ return fd; ++ } ++ drmFreeBusid(buf); ++ } ++ close(fd); + } +- if (buf) +- drmFreeBusid(buf); +- close(fd); +- } + } + return -1; + } +diff --git a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c +index 7e5246295..2e5863798 100644 +--- a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c ++++ b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c +@@ -790,37 +790,38 @@ static int drmOpenByBusid(const char *busid, int type) + + drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); + for (i = base; i < base + DRM_MAX_MINOR; i++) { +- fd = drmOpenMinor(i, 1, type); +- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); +- if (fd >= 0) { +- /* We need to try for 1.4 first for proper PCI domain support +- * and if that fails, we know the kernel is busted +- */ +- sv.drm_di_major = 1; +- sv.drm_di_minor = 4; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- if (drmSetInterfaceVersion(fd, &sv)) { ++ fd = drmOpenMinor(i, 1, type); ++ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); ++ if (fd >= 0) { ++ /* We need to try for 1.4 first for proper PCI domain support ++ * and if that fails, we know the kernel is busted ++ */ ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 4; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ if (drmSetInterfaceVersion(fd, &sv)) { + #ifndef __alpha__ +- pci_domain_ok = 0; ++ pci_domain_ok = 0; + #endif +- sv.drm_di_major = 1; +- sv.drm_di_minor = 1; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); +- drmSetInterfaceVersion(fd, &sv); +- } +- buf = drmGetBusid(fd); +- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); +- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) { +- drmFreeBusid(buf); +- return fd; ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 1; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); ++ drmSetInterfaceVersion(fd, &sv); ++ } ++ buf = drmGetBusid(fd); ++ if (buf) { ++ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); ++ if (drmMatchBusID(buf, busid, pci_domain_ok)) { ++ drmFreeBusid(buf); ++ return fd; ++ } ++ drmFreeBusid(buf); ++ } ++ close(fd); + } +- if (buf) +- drmFreeBusid(buf); +- close(fd); +- } + } + return -1; + } diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.mk b/buildroot/package/intel-mediadriver/intel-mediadriver.mk index c3157867e..963e4b8f9 100644 --- a/buildroot/package/intel-mediadriver/intel-mediadriver.mk +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.mk @@ -22,9 +22,7 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ - -DBUILD_ALONG_WITH_CMRTLIB=1 \ - -DINSTALL_DRIVERS_SYSCONF=OFF \ - -DMEDIA_RUN_TEST_SUITE=OFF \ - -DRUN_TEST_SUITE=OFF + -DINSTALL_DRIVER_SYSCONF=OFF \ + -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package)) diff --git a/buildroot/package/intel-mediasdk/intel-mediasdk.mk b/buildroot/package/intel-mediasdk/intel-mediasdk.mk index a2ffe081d..5467c9638 100644 --- a/buildroot/package/intel-mediasdk/intel-mediasdk.mk +++ b/buildroot/package/intel-mediasdk/intel-mediasdk.mk @@ -12,6 +12,9 @@ INTEL_MEDIASDK_LICENSE_FILES = LICENSE INTEL_MEDIASDK_INSTALL_STAGING = YES INTEL_MEDIASDK_DEPENDENCIES = intel-mediadriver -INTEL_MEDIASDK_CONF_OPTS = -DMFX_INCLUDE="$(@D)/api/include" +INTEL_MEDIASDK_CONF_OPTS = \ + -DBUILD_SAMPLES=OFF \ + -DBUILD_TUTORIALS=OFF \ + -DMFX_INCLUDE="$(@D)/api/include" $(eval $(cmake-package)) diff --git a/buildroot/package/intel-microcode/intel-microcode.hash b/buildroot/package/intel-microcode/intel-microcode.hash index e8005bcff..289428b4b 100644 --- a/buildroot/package/intel-microcode/intel-microcode.hash +++ b/buildroot/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb4f939421ac6cdea3c586c9d984ec518320f00c07eb2b3d6754309c83c93371 intel-microcode-20200616.tar.gz +sha256 e42a264b7b86e80d013d6d00062467352c1f37e0aaea10fe5b51e4d8687921ab intel-microcode-20201118.tar.gz sha256 d9e989e1a7747f3ce93cb749aceca67a430d36c9bebc6e3205e0b3af3ca6304b license diff --git a/buildroot/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk index 043367770..5a13ca2cb 100644 --- a/buildroot/package/intel-microcode/intel-microcode.mk +++ b/buildroot/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20200616 +INTEL_MICROCODE_VERSION = 20201118 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license diff --git a/buildroot/package/iozone/iozone.hash b/buildroot/package/iozone/iozone.hash index f2f40473c..61e8ff3ab 100644 --- a/buildroot/package/iozone/iozone.hash +++ b/buildroot/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584 iozone3_489.tar +sha256 5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed iozone3_490.tar diff --git a/buildroot/package/iozone/iozone.mk b/buildroot/package/iozone/iozone.mk index a491faf9d..ebb624365 100644 --- a/buildroot/package/iozone/iozone.mk +++ b/buildroot/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3_489 +IOZONE_VERSION = 3_490 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) diff --git a/buildroot/package/iperf/iperf.mk b/buildroot/package/iperf/iperf.mk index 7088b0f15..5df94a1f6 100644 --- a/buildroot/package/iperf/iperf.mk +++ b/buildroot/package/iperf/iperf.mk @@ -8,6 +8,8 @@ IPERF_VERSION = 2.0.13 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING +IPERF_CPE_ID_VENDOR = iperf2_project +IPERF_CPE_ID_PRODUCT = iperf2 IPERF_CONF_OPTS = \ --disable-web100 diff --git a/buildroot/package/iperf3/iperf3.mk b/buildroot/package/iperf3/iperf3.mk index f67fa1702..7d20b86e7 100644 --- a/buildroot/package/iperf3/iperf3.mk +++ b/buildroot/package/iperf3/iperf3.mk @@ -9,6 +9,7 @@ IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE +IPERF3_CPE_ID_VENDOR = es IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" diff --git a/buildroot/package/ipmitool/ipmitool.mk b/buildroot/package/ipmitool/ipmitool.mk index 123dd274f..29a047658 100644 --- a/buildroot/package/ipmitool/ipmitool.mk +++ b/buildroot/package/ipmitool/ipmitool.mk @@ -9,6 +9,7 @@ IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING +IPMITOOL_CPE_ID_VALID = YES # 0008-fru-Fix-buffer-overflow-vulnerabilities.patch # 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch diff --git a/buildroot/package/ipsec-tools/0001-susv3-legacy.patch b/buildroot/package/ipsec-tools/0001-susv3-legacy.patch deleted file mode 100644 index ea9850562..000000000 --- a/buildroot/package/ipsec-tools/0001-susv3-legacy.patch +++ /dev/null @@ -1,35 +0,0 @@ -Replaces sysv3 legacy functions with modern equivalents. - -Signed-off-by: Julien Boibessot -Index: ipsec-tools-0.7.3/src/racoon/pfkey.c -=================================================================== ---- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200 -+++ ipsec-tools-0.7.3/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200 -@@ -3008,12 +3008,12 @@ - struct sockaddr *paddr; - - paddr = (struct sockaddr *)(xisr + 1); -- bcopy(paddr, &(*p_isr)->saidx.src, -+ memmove(&(*p_isr)->saidx.src, paddr, - sysdep_sa_len(paddr)); - - paddr = (struct sockaddr *)((caddr_t)paddr - + sysdep_sa_len(paddr)); -- bcopy(paddr, &(*p_isr)->saidx.dst, -+ memmove(&(*p_isr)->saidx.dst, paddr, - sysdep_sa_len(paddr)); - } - -Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c -=================================================================== ---- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200 -+++ ipsec-tools-0.7.3/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200 -@@ -785,7 +785,7 @@ - errx(1, "cannot read source address"); - - /* We get "ip[port]" strip the port */ -- if ((idx = index(srcaddr, '[')) == NULL) -+ if ((idx = strchr(srcaddr, '[')) == NULL) - errx(1, "unexpected source address format"); - *idx = '\0'; - diff --git a/buildroot/package/ipsec-tools/0002-configure-automake.patch b/buildroot/package/ipsec-tools/0002-configure-automake.patch deleted file mode 100644 index a006516f2..000000000 --- a/buildroot/package/ipsec-tools/0002-configure-automake.patch +++ /dev/null @@ -1,21 +0,0 @@ -Needed to fix broken autoreconf - -Downloaded from -https://sources.debian.net/src/ipsec-tools/1:0.8.2%2B20140711-8/debian/patches/automake-options/ - -Signed-off-by: Bernd Kuhls - -Index: pkg-ipsec-tools/configure.ac -=================================================================== ---- pkg-ipsec-tools.orig/configure.ac 2014-06-28 17:25:22.000000000 +0200 -+++ pkg-ipsec-tools/configure.ac 2014-06-28 17:28:13.818373322 +0200 -@@ -6,7 +6,8 @@ AC_INIT(ipsec-tools, 0.8.2) - AC_CONFIG_SRCDIR([configure.ac]) - AC_CONFIG_HEADERS(config.h) - --AM_INIT_AUTOMAKE(dist-bzip2) -+AC_CONFIG_MACRO_DIR([.]) -+AM_INIT_AUTOMAKE([dist-bzip2 foreign serial-tests]) - - AC_ENABLE_SHARED(no) - diff --git a/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch b/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch deleted file mode 100644 index 4fa0a02d5..000000000 --- a/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001 -From: Paul Barker -Date: Wed, 5 Mar 2014 13:39:14 +0000 -Subject: [PATCH] Don't link against libfl - -We can remove all references to yywrap by adding "%option noyywrap" statements -to each flex source file that doesn't override yywrap. After this, we no longer -need to link against libfl and so no longer get errors about undefined -references to yylex. - -Signed-off-by: Paul Barker -Upstream-status: Submitted 2014-03-11 - see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797 - -Downloaded from -http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch - -Signed-off-by: Bernd Kuhls ---- - src/libipsec/Makefile.am | 1 - - src/racoon/Makefile.am | 2 +- - src/racoon/cftoken.l | 2 ++ - src/setkey/Makefile.am | 1 - - src/setkey/token.l | 2 ++ - 5 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am -index 6a4e3b3..df1e106 100644 ---- a/src/libipsec/Makefile.am -+++ b/src/libipsec/Makefile.am -@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \ - # version is current:revision:age. - # See: http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32 - libipsec_la_LDFLAGS = -version-info 0:1:0 --libipsec_la_LIBADD = $(LEXLIB) - - noinst_HEADERS = ipsec_strerror.h - -diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am -index dbaded9..0662957 100644 ---- a/src/racoon/Makefile.am -+++ b/src/racoon/Makefile.am -@@ -38,7 +38,7 @@ racoon_SOURCES = \ - cftoken.l cfparse.y prsa_tok.l prsa_par.y - EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \ - isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) --racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \ -+racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \ - $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la - racoon_DEPENDENCIES = \ - $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \ -diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l -index 490242c..1701922 100644 ---- a/src/racoon/cftoken.l -+++ b/src/racoon/cftoken.l -@@ -106,6 +106,8 @@ static int incstackp = 0; - static int yy_first_time = 1; - %} - -+%option noyywrap -+ - /* common seciton */ - nl \n - ws [ \t]+ -diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am -index 746c1f1..389e6cf 100644 ---- a/src/setkey/Makefile.am -+++ b/src/setkey/Makefile.am -@@ -13,7 +13,6 @@ setkey_SOURCES = \ - - setkey_LDFLAGS = ../libipsec/libipsec.la - setkey_DEPENDENCIES = ../libipsec/libipsec.la --setkey_LDADD = $(LEXLIB) - - noinst_HEADERS = vchar.h extern.h - man8_MANS = setkey.8 -diff --git a/src/setkey/token.l b/src/setkey/token.l -index ad3d843..eb23b76 100644 ---- a/src/setkey/token.l -+++ b/src/setkey/token.l -@@ -88,6 +88,8 @@ - #endif - %} - -+%option noyywrap -+ - /* common section */ - nl \n - ws [ \t]+ --- -1.9.0 - diff --git a/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch b/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch deleted file mode 100644 index f53fe5cc1..000000000 --- a/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch +++ /dev/null @@ -1,26 +0,0 @@ -ipsec-tools: CVE-2015-4047: null pointer dereference crash in racoon - -See: https://bugs.gentoo.org/show_bug.cgi?id=550118 - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch - -See also -https://sources.debian.net/src/ipsec-tools/1:0.8.2%2B20140711-8/debian/patches/bug785778-null-pointer-deref.patch/ - -Signed-off-by: Bernd Kuhls - ---- ./src/racoon/gssapi.c 9 Sep 2006 16:22:09 -0000 1.4 -+++ ./src/racoon/gssapi.c 19 May 2015 15:16:00 -0000 1.6 -@@ -192,6 +192,11 @@ - gss_name_t princ, canon_princ; - OM_uint32 maj_stat, min_stat; - -+ if (iph1->rmconf == NULL) { -+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); -+ return -1; -+ } -+ - gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); - if (gps == NULL) { - plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); diff --git a/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch b/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch deleted file mode 100644 index 8ef3b0375..000000000 --- a/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch +++ /dev/null @@ -1,208 +0,0 @@ -Fix CVE-2016-10396 - -Description: Fix remotely exploitable DoS. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10396 -Source: vendor; https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=51682 -Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867986 - -Downloaded from -https://github.com/openwrt/packages/blob/master/net/ipsec-tools/patches/010-CVE-2016-10396.patch - -Signed-off-by: Bernd Kuhls - -Index: ipsec-tools-0.8.2/src/racoon/isakmp_frag.c -=================================================================== ---- ipsec-tools-0.8.2.orig/src/racoon/isakmp_frag.c -+++ ipsec-tools-0.8.2/src/racoon/isakmp_frag.c -@@ -1,4 +1,4 @@ --/* $NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $ */ -+/* $NetBSD: isakmp_frag.c,v 1.5.36.1 2017/04/21 16:50:42 bouyer Exp $ */ - - /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */ - -@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) - return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); - } - -+static int -+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) -+{ -+ struct isakmp_frag_item *pitem = NULL; -+ struct isakmp_frag_item *citem = iph1->frag_chain; -+ -+ /* no frag yet, just insert at beginning of list */ -+ if (iph1->frag_chain == NULL) { -+ iph1->frag_chain = item; -+ return 0; -+ } -+ -+ do { -+ /* duplicate fragment number, abort (CVE-2016-10396) */ -+ if (citem->frag_num == item->frag_num) -+ return -1; -+ -+ /* need to insert before current item */ -+ if (citem->frag_num > item->frag_num) { -+ if (pitem != NULL) -+ pitem->frag_next = item; -+ else -+ /* insert at the beginning of the list */ -+ iph1->frag_chain = item; -+ item->frag_next = citem; -+ return 0; -+ } -+ -+ pitem = citem; -+ citem = citem->frag_next; -+ } while (citem != NULL); -+ -+ /* we reached the end of the list, insert */ -+ pitem->frag_next = item; -+ return 0; -+} -+ - int - isakmp_frag_extract(iph1, msg) - struct ph1handle *iph1; -@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) - item->frag_next = NULL; - item->frag_packet = buf; - -- /* Look for the last frag while inserting the new item in the chain */ -- if (item->frag_last) -- last_frag = item->frag_num; -+ /* Check for the last frag before inserting the new item in the chain */ -+ if (item->frag_last) { -+ /* if we have the last fragment, indices must match */ -+ if (iph1->frag_last_index != 0 && -+ item->frag_last != iph1->frag_last_index) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated last fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; -+ } - -- if (iph1->frag_chain == NULL) { -- iph1->frag_chain = item; -- } else { -- struct isakmp_frag_item *current; -+ last_frag = iph1->frag_last_index = item->frag_num; -+ } - -- current = iph1->frag_chain; -- while (current->frag_next) { -- if (current->frag_last) -- last_frag = item->frag_num; -- current = current->frag_next; -- } -- current->frag_next = item; -+ /* insert fragment into chain */ -+ if (isakmp_frag_insert(iph1, item) == -1) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; - } - -- /* If we saw the last frag, check if the chain is complete */ -+ /* If we saw the last frag, check if the chain is complete -+ * we have a sorted list now, so just walk through */ - if (last_frag != 0) { -+ item = iph1->frag_chain; - for (i = 1; i <= last_frag; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -+ if (item->frag_num != i) -+ break; -+ item = item->frag_next; - if (item == NULL) /* Not found */ - break; - } - -- if (item != NULL) /* It is complete */ -+ if (i > last_frag) /* It is complete */ - return 1; - } - -@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) - } - data = buf->v; - -+ item = iph1->frag_chain; - for (i = 1; i <= frag_count; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -- if (item == NULL) { -+ if (item->frag_num != i) { - plog(LLV_ERROR, LOCATION, NULL, - "Missing fragment #%d\n", i); - vfree(buf); -@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) - } - memcpy(data, item->frag_packet->v, item->frag_packet->l); - data += item->frag_packet->l; -+ item = item->frag_next; - } - - out: -Index: ipsec-tools-0.8.2/src/racoon/isakmp_inf.c -=================================================================== ---- ipsec-tools-0.8.2.orig/src/racoon/isakmp_inf.c -+++ ipsec-tools-0.8.2/src/racoon/isakmp_inf.c -@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - -Index: ipsec-tools-0.8.2/src/racoon/isakmp.c -=================================================================== ---- ipsec-tools-0.8.2.orig/src/racoon/isakmp.c -+++ ipsec-tools-0.8.2/src/racoon/isakmp.c -@@ -1071,6 +1071,7 @@ isakmp_ph1begin_i(rmconf, remote, local) - iph1->frag = 1; - else - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -@@ -1175,6 +1176,7 @@ isakmp_ph1begin_r(msg, remote, local, et - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -Index: ipsec-tools-0.8.2/src/racoon/handler.h -=================================================================== ---- ipsec-tools-0.8.2.orig/src/racoon/handler.h -+++ ipsec-tools-0.8.2/src/racoon/handler.h -@@ -1,4 +1,4 @@ --/* $NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $ */ -+/* $NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $ */ - - /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */ - -@@ -141,6 +141,7 @@ struct ph1handle { - #endif - #ifdef ENABLE_FRAG - int frag; /* IKE phase 1 fragmentation */ -+ int frag_last_index; - struct isakmp_frag_item *frag_chain; /* Received fragments */ - #endif - diff --git a/buildroot/package/ipsec-tools/0006-openssl-1.1.patch b/buildroot/package/ipsec-tools/0006-openssl-1.1.patch deleted file mode 100644 index 39a7da988..000000000 --- a/buildroot/package/ipsec-tools/0006-openssl-1.1.patch +++ /dev/null @@ -1,1104 +0,0 @@ -From 071fec7181255b9234add44865a435dfdefee520 Mon Sep 17 00:00:00 2001 -In-Reply-To: <20180528120513.560-1-cote2004-github@yahoo.com> -References: <20180528120513.560-1-cote2004-github@yahoo.com> -From: Eneas U de Queiroz -Date: Wed, 30 May 2018 15:42:20 -0300 -Subject: [PATCH] ipsec-tools: add openssl 1.1 support -To: equeiroz@troianet.com.br - -This patch updates the calls to openssl 1.1 API, and adds a -compatibility layer so it compiles with (at least) openssl 1.0.2, I -haven't tested it with lower versions, but all that's needed is to edit -the openssl_compat.* files and add the missing functions there--they're -usually trivial. - -Signed-off-by: Eneas U de Queiroz - -Downloaded from -https://github.com/openwrt/packages/blob/master/net/ipsec-tools/patches/015-openssl-1.1.patch - -Patch was sent upstream: -https://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/20180528120513.560-1-cote2004-github%40yahoo.com/#msg36327963 - -Signed-off-by: Bernd Kuhls ---- - src/racoon/Makefile.am | 10 +-- - src/racoon/algorithm.c | 6 +- - src/racoon/cfparse.y | 2 +- - src/racoon/crypto_openssl.c | 197 +++++++++++++++++++++------------------- - src/racoon/crypto_openssl.h | 2 +- - src/racoon/eaytest.c | 7 +- - src/racoon/ipsec_doi.c | 2 +- - src/racoon/openssl_compat.c | 213 ++++++++++++++++++++++++++++++++++++++++++++ - src/racoon/openssl_compat.h | 45 ++++++++++ - src/racoon/plainrsa-gen.c | 41 +++++---- - src/racoon/prsa_par.y | 28 ++++-- - src/racoon/rsalist.c | 5 +- - 12 files changed, 431 insertions(+), 127 deletions(-) - create mode 100644 src/racoon/openssl_compat.c - create mode 100644 src/racoon/openssl_compat.h - -diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am -index dbaded9..4c585f3 100644 ---- a/src/racoon/Makefile.am -+++ b/src/racoon/Makefile.am -@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen - noinst_PROGRAMS = eaytest - include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ - schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \ -- isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h -+ isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h - lib_LTLIBRARIES = libracoon.la - - adminsockdir=${localstatedir}/racoon -@@ -32,7 +32,7 @@ racoon_SOURCES = \ - gssapi.c dnssec.c getcertsbyname.c privsep.c \ - pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \ - policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \ -- proposal.c sainfo.c strnames.c \ -+ openssl_compat.c proposal.c sainfo.c strnames.c \ - plog.c logger.c schedule.c str2val.c \ - safefile.c backupsa.c genlist.c rsalist.c \ - cftoken.l cfparse.y prsa_tok.l prsa_par.y -@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c - libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS) - - plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \ -- crypto_openssl.c logger.c -+ crypto_openssl.c logger.c openssl_compat.c - EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS) - plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o - plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o - --eaytest_SOURCES = eaytest.c plog.c logger.c -+eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c - EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c - eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \ - $(CRYPTOBJS) -@@ -75,7 +75,7 @@ noinst_HEADERS = \ - debugrm.h isakmp.h misc.h sainfo.h \ - dhgroup.h isakmp_agg.h netdb_dnssec.h schedule.h \ - isakmp_cfg.h isakmp_xauth.h isakmp_unity.h isakmp_frag.h \ -- throttle.h privsep.h \ -+ throttle.h privsep.h openssl_compat.h \ - cfparse_proto.h cftoken_proto.h genlist.h rsalist.h \ - missing/crypto/sha2/sha2.h missing/crypto/rijndael/rijndael_local.h \ - missing/crypto/rijndael/rijndael-api-fst.h \ -diff --git a/src/racoon/algorithm.c b/src/racoon/algorithm.c -index 3fd50f6..66c874b 100644 ---- a/src/racoon/algorithm.c -+++ b/src/racoon/algorithm.c -@@ -128,7 +128,7 @@ static struct enc_algorithm oakley_encdef[] = { - { "aes", algtype_aes, OAKLEY_ATTR_ENC_ALG_AES, 16, - eay_aes_encrypt, eay_aes_decrypt, - eay_aes_weakkey, eay_aes_keylen, }, --#ifdef HAVE_OPENSSL_CAMELLIA_H -+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA) - { "camellia", algtype_camellia, OAKLEY_ATTR_ENC_ALG_CAMELLIA, 16, - eay_camellia_encrypt, eay_camellia_decrypt, - eay_camellia_weakkey, eay_camellia_keylen, }, -@@ -168,7 +168,7 @@ static struct enc_algorithm ipsec_encdef[] = { - { "twofish", algtype_twofish, IPSECDOI_ESP_TWOFISH, 16, - NULL, NULL, - NULL, eay_twofish_keylen, }, --#ifdef HAVE_OPENSSL_IDEA_H -+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA) - { "3idea", algtype_3idea, IPSECDOI_ESP_3IDEA, 8, - NULL, NULL, - NULL, NULL, }, -@@ -179,7 +179,7 @@ static struct enc_algorithm ipsec_encdef[] = { - { "rc4", algtype_rc4, IPSECDOI_ESP_RC4, 8, - NULL, NULL, - NULL, NULL, }, --#ifdef HAVE_OPENSSL_CAMELLIA_H -+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA) - { "camellia", algtype_camellia, IPSECDOI_ESP_CAMELLIA, 16, - NULL, NULL, - NULL, eay_camellia_keylen, }, -diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y -index 0d9bd67..8415752 100644 ---- a/src/racoon/cfparse.y -+++ b/src/racoon/cfparse.y -@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf) - plog(LLV_DEBUG2, LOCATION, NULL, - "encklen=%d\n", s->encklen); - -- memset(types, 0, ARRAYLEN(types)); -+ memset(types, 0, sizeof types); - types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc]; - types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash]; - types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh]; -diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c -index 55b076a..8fb358f 100644 ---- a/src/racoon/crypto_openssl.c -+++ b/src/racoon/crypto_openssl.c -@@ -90,6 +90,7 @@ - #endif - #endif - #include "plog.h" -+#include "openssl_compat.h" - - #define USE_NEW_DES_API - -@@ -316,9 +317,12 @@ eay_cmp_asn1dn(n1, n2) - i = idx+1; - goto end; - } -- if ((ea->value->length == 1 && ea->value->data[0] == '*') || -- (eb->value->length == 1 && eb->value->data[0] == '*')) { -- if (OBJ_cmp(ea->object,eb->object)) { -+ ASN1_STRING *sa = X509_NAME_ENTRY_get_data(ea); -+ ASN1_STRING *sb = X509_NAME_ENTRY_get_data(eb); -+ if ((ASN1_STRING_length(sa) == 1 && ASN1_STRING_get0_data(sa)[0] == '*') || -+ (ASN1_STRING_length(sb) == 1 && ASN1_STRING_get0_data(sb)[0] == '*')) { -+ if (OBJ_cmp(X509_NAME_ENTRY_get_object(ea), -+ X509_NAME_ENTRY_get_object(eb))) { - i = idx+1; - goto end; - } -@@ -430,7 +434,7 @@ cb_check_cert_local(ok, ctx) - - if (!ok) { - X509_NAME_oneline( -- X509_get_subject_name(ctx->current_cert), -+ X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)), - buf, - 256); - /* -@@ -438,7 +442,8 @@ cb_check_cert_local(ok, ctx) - * ok if they are self signed. But we should still warn - * the user. - */ -- switch (ctx->error) { -+ int ctx_error = X509_STORE_CTX_get_error(ctx); -+ switch (ctx_error) { - case X509_V_ERR_CERT_HAS_EXPIRED: - case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: - case X509_V_ERR_INVALID_CA: -@@ -453,9 +458,9 @@ cb_check_cert_local(ok, ctx) - } - plog(log_tag, LOCATION, NULL, - "%s(%d) at depth:%d SubjectName:%s\n", -- X509_verify_cert_error_string(ctx->error), -- ctx->error, -- ctx->error_depth, -+ X509_verify_cert_error_string(ctx_error), -+ ctx_error, -+ X509_STORE_CTX_get_error_depth(ctx), - buf); - } - ERR_clear_error(); -@@ -477,10 +482,11 @@ cb_check_cert_remote(ok, ctx) - - if (!ok) { - X509_NAME_oneline( -- X509_get_subject_name(ctx->current_cert), -+ X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)), - buf, - 256); -- switch (ctx->error) { -+ int ctx_error=X509_STORE_CTX_get_error(ctx); -+ switch (ctx_error) { - case X509_V_ERR_UNABLE_TO_GET_CRL: - ok = 1; - log_tag = LLV_WARNING; -@@ -490,9 +496,9 @@ cb_check_cert_remote(ok, ctx) - } - plog(log_tag, LOCATION, NULL, - "%s(%d) at depth:%d SubjectName:%s\n", -- X509_verify_cert_error_string(ctx->error), -- ctx->error, -- ctx->error_depth, -+ X509_verify_cert_error_string(ctx_error), -+ ctx_error, -+ X509_STORE_CTX_get_error_depth(ctx), - buf); - } - ERR_clear_error(); -@@ -516,14 +522,15 @@ eay_get_x509asn1subjectname(cert) - if (x509 == NULL) - goto error; - -+ X509_NAME *subject_name = X509_get_subject_name(x509); - /* get the length of the name */ -- len = i2d_X509_NAME(x509->cert_info->subject, NULL); -+ len = i2d_X509_NAME(subject_name, NULL); - name = vmalloc(len); - if (!name) - goto error; - /* get the name */ - bp = (unsigned char *) name->v; -- len = i2d_X509_NAME(x509->cert_info->subject, &bp); -+ len = i2d_X509_NAME(subject_name, &bp); - - X509_free(x509); - -@@ -661,15 +668,16 @@ eay_get_x509asn1issuername(cert) - if (x509 == NULL) - goto error; - -+ X509_NAME *issuer_name = X509_get_issuer_name(x509); - /* get the length of the name */ -- len = i2d_X509_NAME(x509->cert_info->issuer, NULL); -+ len = i2d_X509_NAME(issuer_name, NULL); - name = vmalloc(len); - if (name == NULL) - goto error; - - /* get the name */ - bp = (unsigned char *) name->v; -- len = i2d_X509_NAME(x509->cert_info->issuer, &bp); -+ len = i2d_X509_NAME(issuer_name, &bp); - - X509_free(x509); - -@@ -850,7 +858,7 @@ eay_check_x509sign(source, sig, cert) - return -1; - } - -- res = eay_rsa_verify(source, sig, evp->pkey.rsa); -+ res = eay_rsa_verify(source, sig, EVP_PKEY_get0_RSA(evp)); - - EVP_PKEY_free(evp); - X509_free(x509); -@@ -992,7 +1000,7 @@ eay_get_x509sign(src, privkey) - if (evp == NULL) - return NULL; - -- sig = eay_rsa_sign(src, evp->pkey.rsa); -+ sig = eay_rsa_sign(src, EVP_PKEY_get0_RSA(evp)); - - EVP_PKEY_free(evp); - -@@ -1079,7 +1087,11 @@ eay_strerror() - int line, flags; - unsigned long es; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ es = 0; /* even when allowed by OPENSSL_API_COMPAT, it is defined as 0 */ -+#else - es = CRYPTO_thread_id(); -+#endif - - while ((l = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0){ - n = snprintf(ebuf + len, sizeof(ebuf) - len, -@@ -1100,7 +1112,7 @@ vchar_t * - evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc) - { - vchar_t *res; -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - - if (!e) - return NULL; -@@ -1111,7 +1123,7 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc - if ((res = vmalloc(data->l)) == NULL) - return NULL; - -- EVP_CIPHER_CTX_init(&ctx); -+ ctx = EVP_CIPHER_CTX_new(); - - switch(EVP_CIPHER_nid(e)){ - case NID_bf_cbc: -@@ -1125,54 +1137,41 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc - /* XXX: can we do that also for algos with a fixed key size ? - */ - /* init context without key/iv -- */ -- if (!EVP_CipherInit(&ctx, e, NULL, NULL, enc)) -- { -- OpenSSL_BUG(); -- vfree(res); -- return NULL; -- } -+ */ -+ if (!EVP_CipherInit(ctx, e, NULL, NULL, enc)) -+ goto out; - -- /* update key size -- */ -- if (!EVP_CIPHER_CTX_set_key_length(&ctx, key->l)) -- { -- OpenSSL_BUG(); -- vfree(res); -- return NULL; -- } -- -- /* finalize context init with desired key size -- */ -- if (!EVP_CipherInit(&ctx, NULL, (u_char *) key->v, -+ /* update key size -+ */ -+ if (!EVP_CIPHER_CTX_set_key_length(ctx, key->l)) -+ goto out; -+ -+ /* finalize context init with desired key size -+ */ -+ if (!EVP_CipherInit(ctx, NULL, (u_char *) key->v, - (u_char *) iv->v, enc)) -- { -- OpenSSL_BUG(); -- vfree(res); -- return NULL; -- } -+ goto out; - break; - default: -- if (!EVP_CipherInit(&ctx, e, (u_char *) key->v, -- (u_char *) iv->v, enc)) { -- OpenSSL_BUG(); -- vfree(res); -- return NULL; -- } -+ if (!EVP_CipherInit(ctx, e, (u_char *) key->v, -+ (u_char *) iv->v, enc)) -+ goto out; - } - - /* disable openssl padding */ -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - -- if (!EVP_Cipher(&ctx, (u_char *) res->v, (u_char *) data->v, data->l)) { -- OpenSSL_BUG(); -- vfree(res); -- return NULL; -- } -+ if (!EVP_Cipher(ctx, (u_char *) res->v, (u_char *) data->v, data->l)) -+ goto out; - -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - - return res; -+out: -+ EVP_CIPHER_CTX_free(ctx); -+ OpenSSL_BUG(); -+ vfree(res); -+ return NULL; - } - - int -@@ -1230,7 +1229,7 @@ eay_des_keylen(len) - return evp_keylen(len, EVP_des_cbc()); - } - --#ifdef HAVE_OPENSSL_IDEA_H -+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA) - /* - * IDEA-CBC - */ -@@ -1587,7 +1586,7 @@ eay_aes_keylen(len) - return len; - } - --#if defined(HAVE_OPENSSL_CAMELLIA_H) -+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA) - /* - * CAMELLIA-CBC - */ -@@ -1680,9 +1679,9 @@ eay_hmac_init(key, md) - vchar_t *key; - const EVP_MD *md; - { -- HMAC_CTX *c = racoon_malloc(sizeof(*c)); -+ HMAC_CTX *c = HMAC_CTX_new(); - -- HMAC_Init(c, key->v, key->l, md); -+ HMAC_Init_ex(c, key->v, key->l, md, NULL); - - return (caddr_t)c; - } -@@ -1761,8 +1760,7 @@ eay_hmacsha2_512_final(c) - - HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); - res->l = l; -- HMAC_cleanup((HMAC_CTX *)c); -- (void)racoon_free(c); -+ HMAC_CTX_free((HMAC_CTX *)c); - - if (SHA512_DIGEST_LENGTH != res->l) { - plog(LLV_ERROR, LOCATION, NULL, -@@ -1811,8 +1809,7 @@ eay_hmacsha2_384_final(c) - - HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); - res->l = l; -- HMAC_cleanup((HMAC_CTX *)c); -- (void)racoon_free(c); -+ HMAC_CTX_free((HMAC_CTX *)c); - - if (SHA384_DIGEST_LENGTH != res->l) { - plog(LLV_ERROR, LOCATION, NULL, -@@ -1861,8 +1858,7 @@ eay_hmacsha2_256_final(c) - - HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); - res->l = l; -- HMAC_cleanup((HMAC_CTX *)c); -- (void)racoon_free(c); -+ HMAC_CTX_free((HMAC_CTX *)c); - - if (SHA256_DIGEST_LENGTH != res->l) { - plog(LLV_ERROR, LOCATION, NULL, -@@ -1912,8 +1908,7 @@ eay_hmacsha1_final(c) - - HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); - res->l = l; -- HMAC_cleanup((HMAC_CTX *)c); -- (void)racoon_free(c); -+ HMAC_CTX_free((HMAC_CTX *)c); - - if (SHA_DIGEST_LENGTH != res->l) { - plog(LLV_ERROR, LOCATION, NULL, -@@ -1962,8 +1957,7 @@ eay_hmacmd5_final(c) - - HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l); - res->l = l; -- HMAC_cleanup((HMAC_CTX *)c); -- (void)racoon_free(c); -+ HMAC_CTX_free((HMAC_CTX *)c); - - if (MD5_DIGEST_LENGTH != res->l) { - plog(LLV_ERROR, LOCATION, NULL, -@@ -2266,6 +2260,7 @@ eay_dh_generate(prime, g, publen, pub, priv) - u_int32_t g; - { - BIGNUM *p = NULL; -+ BIGNUM *BNg = NULL; - DH *dh = NULL; - int error = -1; - -@@ -2276,25 +2271,28 @@ eay_dh_generate(prime, g, publen, pub, priv) - - if ((dh = DH_new()) == NULL) - goto end; -- dh->p = p; -- p = NULL; /* p is now part of dh structure */ -- dh->g = NULL; -- if ((dh->g = BN_new()) == NULL) -+ if ((BNg = BN_new()) == NULL) - goto end; -- if (!BN_set_word(dh->g, g)) -+ if (!BN_set_word(BNg, g)) - goto end; -+ if (! DH_set0_pqg(dh, p, NULL, BNg)) -+ goto end; -+ BNg = NULL; -+ p = NULL; /* p is now part of dh structure */ - - if (publen != 0) -- dh->length = publen; -+ DH_set_length(dh, publen); - - /* generate public and private number */ - if (!DH_generate_key(dh)) - goto end; - - /* copy results to buffers */ -- if (eay_bn2v(pub, dh->pub_key) < 0) -+ BIGNUM *pub_key, *priv_key; -+ DH_get0_key(dh, (const BIGNUM**) &pub_key, (const BIGNUM**) &priv_key); -+ if (eay_bn2v(pub, pub_key) < 0) - goto end; -- if (eay_bn2v(priv, dh->priv_key) < 0) { -+ if (eay_bn2v(priv, priv_key) < 0) { - vfree(*pub); - goto end; - } -@@ -2306,6 +2304,8 @@ end: - DH_free(dh); - if (p != 0) - BN_free(p); -+ if (BNg != 0) -+ BN_free(BNg); - return(error); - } - -@@ -2319,6 +2319,10 @@ eay_dh_compute(prime, g, pub, priv, pub2, key) - int l; - unsigned char *v = NULL; - int error = -1; -+ BIGNUM *p = BN_new(); -+ BIGNUM *BNg = BN_new(); -+ BIGNUM *pub_key = BN_new(); -+ BIGNUM *priv_key = BN_new(); - - /* make public number to compute */ - if (eay_v2bn(&dh_pub, pub2) < 0) -@@ -2327,19 +2331,21 @@ eay_dh_compute(prime, g, pub, priv, pub2, key) - /* make DH structure */ - if ((dh = DH_new()) == NULL) - goto end; -- if (eay_v2bn(&dh->p, prime) < 0) -+ if (p == NULL || BNg == NULL || pub_key == NULL || priv_key == NULL) - goto end; -- if (eay_v2bn(&dh->pub_key, pub) < 0) -+ -+ if (eay_v2bn(&p, prime) < 0) - goto end; -- if (eay_v2bn(&dh->priv_key, priv) < 0) -+ if (eay_v2bn(&pub_key, pub) < 0) - goto end; -- dh->length = pub2->l * 8; -- -- dh->g = NULL; -- if ((dh->g = BN_new()) == NULL) -+ if (eay_v2bn(&priv_key, priv) < 0) - goto end; -- if (!BN_set_word(dh->g, g)) -+ if (!BN_set_word(BNg, g)) - goto end; -+ DH_set0_key(dh, pub_key, priv_key); -+ DH_set_length(dh, pub2->l * 8); -+ DH_set0_pqg(dh, p, NULL, BNg); -+ pub_key = priv_key = p = BNg = NULL; - - if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL) - goto end; -@@ -2350,6 +2356,14 @@ eay_dh_compute(prime, g, pub, priv, pub2, key) - error = 0; - - end: -+ if (p != NULL) -+ BN_free(p); -+ if (BNg != NULL) -+ BN_free(BNg); -+ if (pub_key != NULL) -+ BN_free(pub_key); -+ if (priv_key != NULL) -+ BN_free(priv_key); - if (dh_pub != NULL) - BN_free(dh_pub); - if (dh != NULL) -@@ -2400,12 +2414,14 @@ eay_bn2v(var, bn) - void - eay_init() - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - #ifdef HAVE_OPENSSL_ENGINE_H - ENGINE_load_builtin_engines(); - ENGINE_register_all_complete(); - #endif -+#endif - } - - vchar_t * -@@ -2504,8 +2520,7 @@ binbuf_pubkey2rsa(vchar_t *binbuf) - goto out; - } - -- rsa_pub->n = mod; -- rsa_pub->e = exp; -+ RSA_set0_key(rsa_pub, mod, exp, NULL); - - out: - return rsa_pub; -@@ -2582,5 +2597,5 @@ eay_random() - const char * - eay_version() - { -- return SSLeay_version(SSLEAY_VERSION); -+ return OpenSSL_version(OPENSSL_VERSION); - } -diff --git a/src/racoon/crypto_openssl.h b/src/racoon/crypto_openssl.h -index 66fac73..ee5b765 100644 ---- a/src/racoon/crypto_openssl.h -+++ b/src/racoon/crypto_openssl.h -@@ -124,7 +124,7 @@ extern vchar_t *eay_aes_decrypt __P((vchar_t *, vchar_t *, vchar_t *)); - extern int eay_aes_weakkey __P((vchar_t *)); - extern int eay_aes_keylen __P((int)); - --#if defined(HAVE_OPENSSL_CAMELLIA_H) -+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA) - /* Camellia */ - extern vchar_t *eay_camellia_encrypt __P((vchar_t *, vchar_t *, vchar_t *)); - extern vchar_t *eay_camellia_decrypt __P((vchar_t *, vchar_t *, vchar_t *)); -diff --git a/src/racoon/eaytest.c b/src/racoon/eaytest.c -index 1474bdc..ae09db3 100644 ---- a/src/racoon/eaytest.c -+++ b/src/racoon/eaytest.c -@@ -62,6 +62,7 @@ - #include "dhgroup.h" - #include "crypto_openssl.h" - #include "gnuc.h" -+#include "openssl_compat.h" - - #include "package_version.h" - -@@ -103,7 +104,7 @@ rsa_verify_with_pubkey(src, sig, pubkey_txt) - printf ("PEM_read_PUBKEY(): %s\n", eay_strerror()); - return -1; - } -- error = eay_check_rsasign(src, sig, evp->pkey.rsa); -+ error = eay_check_rsasign(src, sig, EVP_PKEY_get0_RSA(evp)); - - return error; - } -@@ -698,7 +699,7 @@ ciphertest(ac, av) - eay_cast_encrypt, eay_cast_decrypt) < 0) - return -1; - --#ifdef HAVE_OPENSSL_IDEA_H -+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA) - if (ciphertest_1 ("IDEA", - &data, 8, - &key, key.l, -@@ -715,7 +716,7 @@ ciphertest(ac, av) - eay_rc5_encrypt, eay_rc5_decrypt) < 0) - return -1; - #endif --#if defined(HAVE_OPENSSL_CAMELLIA_H) -+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA) - if (ciphertest_1 ("CAMELLIA", - &data, 16, - &key, key.l, -diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c -index 84a4c71..b52469f 100644 ---- a/src/racoon/ipsec_doi.c -+++ b/src/racoon/ipsec_doi.c -@@ -715,7 +715,7 @@ out: - /* key length must not be specified on some algorithms */ - if (keylen) { - if (sa->enctype == OAKLEY_ATTR_ENC_ALG_DES --#ifdef HAVE_OPENSSL_IDEA_H -+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA) - || sa->enctype == OAKLEY_ATTR_ENC_ALG_IDEA - #endif - || sa->enctype == OAKLEY_ATTR_ENC_ALG_3DES) { -diff --git a/src/racoon/openssl_compat.c b/src/racoon/openssl_compat.c -new file mode 100644 -index 0000000..864b5fb ---- /dev/null -+++ b/src/racoon/openssl_compat.c -@@ -0,0 +1,213 @@ -+/* -+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. -+ * -+ * Licensed under the OpenSSL license (the "License"). You may not use -+ * this file except in compliance with the License. You can obtain a copy -+ * in the file LICENSE in the source distribution or at -+ * https://www.openssl.org/source/license.html -+ */ -+ -+#include "openssl_compat.h" -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include -+ -+static void *OPENSSL_zalloc(size_t num) -+{ -+ void *ret = OPENSSL_malloc(num); -+ -+ if (ret != NULL) -+ memset(ret, 0, num); -+ return ret; -+} -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) -+{ -+ /* If the fields n and e in r are NULL, the corresponding input -+ * parameters MUST be non-NULL for n and e. d may be -+ * left NULL (in case only the public key is used). -+ */ -+ if ((r->n == NULL && n == NULL) -+ || (r->e == NULL && e == NULL)) -+ return 0; -+ -+ if (n != NULL) { -+ BN_free(r->n); -+ r->n = n; -+ } -+ if (e != NULL) { -+ BN_free(r->e); -+ r->e = e; -+ } -+ if (d != NULL) { -+ BN_free(r->d); -+ r->d = d; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) -+{ -+ /* If the fields p and q in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->p == NULL && p == NULL) -+ || (r->q == NULL && q == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(r->p); -+ r->p = p; -+ } -+ if (q != NULL) { -+ BN_free(r->q); -+ r->q = q; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) -+{ -+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->dmp1 == NULL && dmp1 == NULL) -+ || (r->dmq1 == NULL && dmq1 == NULL) -+ || (r->iqmp == NULL && iqmp == NULL)) -+ return 0; -+ -+ if (dmp1 != NULL) { -+ BN_free(r->dmp1); -+ r->dmp1 = dmp1; -+ } -+ if (dmq1 != NULL) { -+ BN_free(r->dmq1); -+ r->dmq1 = dmq1; -+ } -+ if (iqmp != NULL) { -+ BN_free(r->iqmp); -+ r->iqmp = iqmp; -+ } -+ -+ return 1; -+} -+ -+void RSA_get0_key(const RSA *r, -+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) -+{ -+ if (n != NULL) -+ *n = r->n; -+ if (e != NULL) -+ *e = r->e; -+ if (d != NULL) -+ *d = r->d; -+} -+ -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) -+{ -+ if (p != NULL) -+ *p = r->p; -+ if (q != NULL) -+ *q = r->q; -+} -+ -+void RSA_get0_crt_params(const RSA *r, -+ const BIGNUM **dmp1, const BIGNUM **dmq1, -+ const BIGNUM **iqmp) -+{ -+ if (dmp1 != NULL) -+ *dmp1 = r->dmp1; -+ if (dmq1 != NULL) -+ *dmq1 = r->dmq1; -+ if (iqmp != NULL) -+ *iqmp = r->iqmp; -+} -+ -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ /* If the fields p and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. q may remain NULL. -+ */ -+ if ((dh->p == NULL && p == NULL) -+ || (dh->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) { -+ BN_free(dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) { -+ BN_free(dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) { -+ dh->length = BN_num_bits(q); -+ } -+ -+ return 1; -+} -+ -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) -+{ -+ /* If the field pub_key in dh is NULL, the corresponding input -+ * parameters MUST be non-NULL. The priv_key field may -+ * be left NULL. -+ */ -+ if (dh->pub_key == NULL && pub_key == NULL) -+ return 0; -+ -+ if (pub_key != NULL) { -+ BN_free(dh->pub_key); -+ dh->pub_key = pub_key; -+ } -+ if (priv_key != NULL) { -+ BN_free(dh->priv_key); -+ dh->priv_key = priv_key; -+ } -+ -+ return 1; -+} -+ -+int DH_set_length(DH *dh, long length) -+{ -+ dh->length = length; -+ return 1; -+} -+ -+HMAC_CTX *HMAC_CTX_new(void) -+{ -+ return OPENSSL_zalloc(sizeof(HMAC_CTX)); -+} -+ -+void HMAC_CTX_free(HMAC_CTX *ctx) -+{ -+ HMAC_CTX_cleanup(ctx); -+ OPENSSL_free(ctx); -+} -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) -+{ -+ if (pkey->type != EVP_PKEY_RSA) { -+ return NULL; -+ } -+ return pkey->pkey.rsa; -+} -+ -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -diff --git a/src/racoon/openssl_compat.h b/src/racoon/openssl_compat.h -new file mode 100644 -index 0000000..9e152c2 ---- /dev/null -+++ b/src/racoon/openssl_compat.h -@@ -0,0 +1,45 @@ -+#ifndef OPENSSL_COMPAT_H -+#define OPENSSL_COMPAT_H -+ -+#include -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include -+#include -+#include -+#include -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp); -+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d); -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q); -+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp); -+ -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key); -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key); -+int DH_set_length(DH *dh, long length); -+ -+HMAC_CTX *HMAC_CTX_new(void); -+void HMAC_CTX_free(HMAC_CTX* ctx); -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey); -+ -+#define ASN1_STRING_length(s) s->length -+#define ASN1_STRING_get0_data(s) s->data -+ -+#define X509_get_subject_name(x) x->cert_info->subject -+#define X509_get_issuer_name(x) x->cert_info->issuer -+#define X509_NAME_ENTRY_get_data(n) n->value -+#define X509_NAME_ENTRY_get_object(n) n->object -+#define X509_STORE_CTX_get_current_cert(ctx) ctx->current_cert -+#define X509_STORE_CTX_get_error(ctx) ctx->error -+#define X509_STORE_CTX_get_error_depth(ctx) ctx->error_depth -+ -+#define OPENSSL_VERSION SSLEAY_VERSION -+#define OpenSSL_version SSLeay_version -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -+ -+#endif /* OPENSSL_COMPAT_H */ -diff --git a/src/racoon/plainrsa-gen.c b/src/racoon/plainrsa-gen.c -index cad1861..b949b08 100644 ---- a/src/racoon/plainrsa-gen.c -+++ b/src/racoon/plainrsa-gen.c -@@ -60,6 +60,7 @@ - #include "vmbuf.h" - #include "plog.h" - #include "crypto_openssl.h" -+#include "openssl_compat.h" - - #include "package_version.h" - -@@ -90,12 +91,14 @@ mix_b64_pubkey(const RSA *key) - char *binbuf; - long binlen, ret; - vchar_t *res; -- -- binlen = 1 + BN_num_bytes(key->e) + BN_num_bytes(key->n); -+ const BIGNUM *e, *n; -+ -+ RSA_get0_key(key, &n, &e, NULL); -+ binlen = 1 + BN_num_bytes(e) + BN_num_bytes(n); - binbuf = malloc(binlen); - memset(binbuf, 0, binlen); -- binbuf[0] = BN_bn2bin(key->e, (unsigned char *) &binbuf[1]); -- ret = BN_bn2bin(key->n, (unsigned char *) (&binbuf[binbuf[0] + 1])); -+ binbuf[0] = BN_bn2bin(e, (unsigned char *) &binbuf[1]); -+ ret = BN_bn2bin(n, (unsigned char *) (&binbuf[binbuf[0] + 1])); - if (1 + binbuf[0] + ret != binlen) { - plog(LLV_ERROR, LOCATION, NULL, - "Pubkey generation failed. This is really strange...\n"); -@@ -131,16 +134,20 @@ print_rsa_key(FILE *fp, const RSA *key) - - fprintf(fp, "# : PUB 0s%s\n", pubkey64->v); - fprintf(fp, ": RSA\t{\n"); -- fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(key->n)); -+ const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp; -+ RSA_get0_key(key, &n, &e, &d); -+ RSA_get0_factors(key, &p, &q); -+ RSA_get0_crt_params(key, &dmp1, &dmq1, &iqmp); -+ fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(n)); - fprintf(fp, "\t# pubkey=0s%s\n", pubkey64->v); -- fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(key->n))); -- fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(key->e))); -- fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(key->d))); -- fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(key->p))); -- fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(key->q))); -- fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(key->dmp1))); -- fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(key->dmq1))); -- fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(key->iqmp))); -+ fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(n))); -+ fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(e))); -+ fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(d))); -+ fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(p))); -+ fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(q))); -+ fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(dmp1))); -+ fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(dmq1))); -+ fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(iqmp))); - fprintf(fp, " }\n"); - - vfree(pubkey64); -@@ -203,11 +210,13 @@ int - gen_rsa_key(FILE *fp, size_t bits, unsigned long exp) - { - int ret; -- RSA *key; -+ RSA *key = RSA_new(); -+ BIGNUM *e = BN_new(); - -- key = RSA_generate_key(bits, exp, NULL, NULL); -- if (!key) { -+ BN_set_word(e, exp); -+ if (! RSA_generate_key_ex(key, bits, e, NULL)) { - fprintf(stderr, "RSA_generate_key(): %s\n", eay_strerror()); -+ RSA_free(key); - return -1; - } - -diff --git a/src/racoon/prsa_par.y b/src/racoon/prsa_par.y -index 1987e4d..27ce4c6 100644 ---- a/src/racoon/prsa_par.y -+++ b/src/racoon/prsa_par.y -@@ -68,6 +68,7 @@ - #include "isakmp_var.h" - #include "handler.h" - #include "crypto_openssl.h" -+#include "openssl_compat.h" - #include "sockmisc.h" - #include "rsalist.h" - -@@ -85,7 +86,18 @@ char *prsa_cur_fname = NULL; - struct genlist *prsa_cur_list = NULL; - enum rsa_key_type prsa_cur_type = RSA_TYPE_ANY; - --static RSA *rsa_cur; -+struct my_rsa_st { -+ BIGNUM *n; -+ BIGNUM *e; -+ BIGNUM *d; -+ BIGNUM *p; -+ BIGNUM *q; -+ BIGNUM *dmp1; -+ BIGNUM *dmq1; -+ BIGNUM *iqmp; -+}; -+ -+static struct my_rsa_st *rsa_cur; - - void - prsaerror(const char *s, ...) -@@ -201,8 +213,12 @@ rsa_statement: - rsa_cur->iqmp = NULL; - } - } -- $$ = rsa_cur; -- rsa_cur = RSA_new(); -+ RSA * rsa_tmp = RSA_new(); -+ RSA_set0_key(rsa_tmp, rsa_cur->n, rsa_cur->e, rsa_cur->d); -+ RSA_set0_factors(rsa_tmp, rsa_cur->p, rsa_cur->q); -+ RSA_set0_crt_params(rsa_tmp, rsa_cur->dmp1, rsa_cur->dmq1, rsa_cur->iqmp); -+ $$ = rsa_tmp; -+ memset(rsa_cur, 0, sizeof(struct my_rsa_st)); - } - | TAG_PUB BASE64 - { -@@ -351,10 +367,12 @@ prsa_parse_file(struct genlist *list, char *fname, enum rsa_key_type type) - prsa_cur_fname = fname; - prsa_cur_list = list; - prsa_cur_type = type; -- rsa_cur = RSA_new(); -+ rsa_cur = malloc(sizeof(struct my_rsa_st)); -+ memset(rsa_cur, 0, sizeof(struct my_rsa_st)); - ret = prsaparse(); - if (rsa_cur) { -- RSA_free(rsa_cur); -+ memset(rsa_cur, 0, sizeof(struct my_rsa_st)); -+ free(rsa_cur); - rsa_cur = NULL; - } - fclose (fp); -diff --git a/src/racoon/rsalist.c b/src/racoon/rsalist.c -index f152c82..96e8363 100644 ---- a/src/racoon/rsalist.c -+++ b/src/racoon/rsalist.c -@@ -52,6 +52,7 @@ - #include "genlist.h" - #include "remoteconf.h" - #include "crypto_openssl.h" -+#include "openssl_compat.h" - - #ifndef LIST_FIRST - #define LIST_FIRST(head) ((head)->lh_first) -@@ -98,7 +99,9 @@ rsa_key_dup(struct rsa_key *key) - return NULL; - - if (key->rsa) { -- new->rsa = key->rsa->d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa); -+ const BIGNUM *d; -+ RSA_get0_key(key->rsa, NULL, NULL, &d); -+ new->rsa = (d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa)); - if (new->rsa == NULL) - goto dup_error; - } --- -2.16.1 - diff --git a/buildroot/package/ipsec-tools/Config.in b/buildroot/package/ipsec-tools/Config.in deleted file mode 100644 index 59154123e..000000000 --- a/buildroot/package/ipsec-tools/Config.in +++ /dev/null @@ -1,75 +0,0 @@ -config BR2_PACKAGE_IPSEC_TOOLS - bool "ipsec-tools" - depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_FLEX - help - This package is required to support IPSec for Linux 2.6+ - - http://ipsec-tools.sourceforge.net/ - -if BR2_PACKAGE_IPSEC_TOOLS - -config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT - bool "Enable racoonctl(8)" - default y - help - Lets racoon to listen to racoon admin port, which is to - be contacted by racoonctl(8). - -config BR2_PACKAGE_IPSEC_TOOLS_NATT - bool "Enable NAT-Traversal" - help - This needs kernel support, which is available on Linux. On - NetBSD, NAT-Traversal kernel support has not been integrated - yet, you can get it from here: - - http://ipsec-tools.sourceforge.net/netbsd_nat-t.diff If you - - live in a country where software patents are legal, using - NAT-Traversal might infringe a patent. - -config BR2_PACKAGE_IPSEC_TOOLS_FRAG - bool "Enable IKE fragmentation" - help - Enable IKE fragmentation, which is a workaround for - broken routers that drop fragmented packets - -config BR2_PACKAGE_IPSEC_TOOLS_DPD - bool "Enable DPD (Dead Peer Detection)" - help - Enable dead peer detection support - -config BR2_PACKAGE_IPSEC_TOOLS_STATS - bool "Enable statistics logging function" - default y - -config BR2_PACKAGE_IPSEC_TOOLS_READLINE - bool "Enable readline input support" - select BR2_PACKAGE_READLINE - -config BR2_PACKAGE_IPSEC_TOOLS_HYBRID - bool "Enable hybrid, both mode-cfg and xauth support" - help - Hybrid mode is required for successful interoperability - (e.g. Cisco VPN Client). - -choice - prompt "Security context" - default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE - help - Selects whether or not to enable security context support. - -config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE - bool "Disable security context support" - -config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE - bool "Enable SELinux security context support" - -config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL - bool "Enable kernel security context" - -endchoice - -endif diff --git a/buildroot/package/ipsec-tools/ipsec-tools.hash b/buildroot/package/ipsec-tools/ipsec-tools.hash deleted file mode 100644 index 7a944eb8e..000000000 --- a/buildroot/package/ipsec-tools/ipsec-tools.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/0.8.2/ -md5 d53ec14a0a3ece64e09e5e34b3350b41 ipsec-tools-0.8.2.tar.bz2 -sha1 7d92cae9fde59fb4f125636698c43b0a3df3d0f0 ipsec-tools-0.8.2.tar.bz2 - -# Locally calculated -sha256 3f4af4aef0b2599928bee9875935b8fad8449ddbb98ea7da74c20c3dff5cdef7 src/setkey/setkey.c diff --git a/buildroot/package/ipsec-tools/ipsec-tools.mk b/buildroot/package/ipsec-tools/ipsec-tools.mk deleted file mode 100644 index 72bd8c196..000000000 --- a/buildroot/package/ipsec-tools/ipsec-tools.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# ipsec-tools -# -################################################################################ - -IPSEC_TOOLS_VERSION = 0.8.2 -IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2 -IPSEC_TOOLS_SITE = http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/$(IPSEC_TOOLS_VERSION) -IPSEC_TOOLS_LICENSE = BSD-3-Clause -IPSEC_TOOLS_LICENSE_FILES = src/setkey/setkey.c -IPSEC_TOOLS_INSTALL_STAGING = YES -IPSEC_TOOLS_MAKE = $(MAKE1) -IPSEC_TOOLS_DEPENDENCIES = openssl flex host-pkgconf host-flex host-bison -# we patch configure.ac -IPSEC_TOOLS_AUTORECONF = YES - -# 0004-CVE-2015-4047.patch -IPSEC_TOOLS_IGNORE_CVES += CVE-2015-4047 -# 0005-CVE-2016-10396.patch -IPSEC_TOOLS_IGNORE_CVES += CVE-2016-10396 - -# configure hardcodes -Werror, so override CFLAGS on make invocation -IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)' - -IPSEC_TOOLS_CONF_ENV = LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` - -IPSEC_TOOLS_CONF_OPTS = \ - --without-libpam \ - --disable-gssapi \ - --with-kernel-headers=$(STAGING_DIR)/usr/include - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT),y) -IPSEC_TOOLS_CONF_OPTS += --enable-adminport -else -IPSEC_TOOLS_CONF_OPTS += --disable-adminport -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT),y) -IPSEC_TOOLS_CONF_OPTS += --enable-natt -else -IPSEC_TOOLS_CONF_OPTS += --disable-natt -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG),y) -IPSEC_TOOLS_CONF_OPTS += --enable-frag -else -IPSEC_TOOLS_CONF_OPTS += --disable-frag -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_DPD),y) -IPSEC_TOOLS_CONF_OPTS += --enable-dpd -else -IPSEC_TOOLS_CONF_OPTS += --disable-dpd -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS),y) -IPSEC_TOOLS_CONF_OPTS += --enable-stats -else -IPSEC_TOOLS_CONF_OPTS += --disable-stats -endif - -ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE),y) -IPSEC_TOOLS_CONF_OPTS += --without-readline -else -IPSEC_TOOLS_DEPENDENCIES += readline -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_HYBRID),y) -IPSEC_TOOLS_CONF_OPTS += --enable-hybrid -else -IPSEC_TOOLS_CONF_OPTS += --disable-hybrid -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no -endif -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes -endif -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/ipset/ipset.mk b/buildroot/package/ipset/ipset.mk index 869763d32..4c5a44a56 100644 --- a/buildroot/package/ipset/ipset.mk +++ b/buildroot/package/ipset/ipset.mk @@ -11,6 +11,8 @@ IPSET_DEPENDENCIES = libmnl host-pkgconf IPSET_CONF_OPTS = --with-kmod=no IPSET_LICENSE = GPL-2.0 IPSET_LICENSE_FILES = COPYING +IPSET_CPE_ID_VENDOR = netfilter IPSET_INSTALL_STAGING = YES +IPSET_SELINUX_MODULES = iptables $(eval $(autotools-package)) diff --git a/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch b/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch deleted file mode 100644 index 8d364b378..000000000 --- a/buildroot/package/iptables/0001-libxtables-compiler-warning-fixes-for-NO_SHARED_LIBS.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6cb8af1ff3951e47def7a16db39289dc9d9c61fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Tue, 23 Jun 2020 16:09:02 -0700 -Subject: libxtables: compiler warning fixes for NO_SHARED_LIBS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes two issues with NO_SHARED_LIBS: - - #include is ifdef'ed out and thus dlclose() - triggers an undeclared function compiler warning - - dlreg_add() is unused and thus triggers an unused - function warning - -Test: builds without warnings -Signed-off-by: Maciej Żenczykowski -Signed-off-by: Pablo Neira Ayuso - -[Retrieved from: -https://git.netfilter.org/iptables/commit/libxtables/xtables.c?id=6cb8af1ff3951e47def7a16db39289dc9d9c61fe] -Signed-off-by: Fabrice Fontaine ---- - libxtables/xtables.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libxtables/xtables.c b/libxtables/xtables.c -index 7fe42580..8907ba20 100644 ---- a/libxtables/xtables.c -+++ b/libxtables/xtables.c -@@ -206,6 +206,7 @@ struct xtables_target *xtables_targets; - static bool xtables_fully_register_pending_match(struct xtables_match *me); - static bool xtables_fully_register_pending_target(struct xtables_target *me); - -+#ifndef NO_SHARED_LIBS - /* registry for loaded shared objects to close later */ - struct dlreg { - struct dlreg *next; -@@ -237,6 +238,7 @@ static void dlreg_free(void) - dlreg = next; - } - } -+#endif - - void xtables_init(void) - { -@@ -267,7 +269,9 @@ void xtables_init(void) - - void xtables_fini(void) - { -+#ifndef NO_SHARED_LIBS - dlreg_free(); -+#endif - } - - void xtables_set_nfproto(uint8_t nfproto) --- -cgit v1.2.3 - diff --git a/buildroot/package/iptables/iptables.hash b/buildroot/package/iptables/iptables.hash index 725770543..120e7e4a8 100644 --- a/buildroot/package/iptables/iptables.hash +++ b/buildroot/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309 iptables-1.8.5.tar.bz2 +sha256 a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767 iptables-1.8.6.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/iptables/iptables.mk b/buildroot/package/iptables/iptables.mk index 442639f15..dc0146660 100644 --- a/buildroot/package/iptables/iptables.mk +++ b/buildroot/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.5 +IPTABLES_VERSION = 1.8.6 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES @@ -12,6 +12,9 @@ IPTABLES_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) IPTABLES_LICENSE = GPL-2.0 IPTABLES_LICENSE_FILES = COPYING +IPTABLES_CPE_ID_VENDOR = netfilter +IPTABLES_SELINUX_MODULES = iptables + # Building static causes ugly warnings on some plugins IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \ $(if $(BR2_STATIC_LIBS),,--disable-static) diff --git a/buildroot/package/iputils/iputils.hash b/buildroot/package/iputils/iputils.hash index 11f46bac2..3e30ca938 100644 --- a/buildroot/package/iputils/iputils.hash +++ b/buildroot/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/s20200821/sha256sum.asc -sha256 f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b iputils-20200821.tar.gz +# https://github.com/iputils/iputils/releases/download/20210202/sha256sum.asc +sha256 3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab iputils-20210202.tar.gz # Locally computed sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/buildroot/package/iputils/iputils.mk b/buildroot/package/iputils/iputils.mk index 4f8d9cb76..1ee64dabe 100644 --- a/buildroot/package/iputils/iputils.mk +++ b/buildroot/package/iputils/iputils.mk @@ -11,8 +11,8 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20200821 -IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION)) +IPUTILS_VERSION = 20210202 +IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) @@ -27,6 +27,15 @@ IPUTILS_CONF_OPTS += \ -DBUILD_TRACEROUTE6=$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),true,false) \ -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) +# Selectively select the appropriate SELinux refpolicy modules +IPUTILS_SELINUX_MODULES = \ + $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),netutils) \ + $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) \ + $(if $(BR2_PACKAGE_IPUTILS_TFTPD),tftp) + # # arping # @@ -75,11 +84,6 @@ endif ifeq ($(BR2_PACKAGE_IPUTILS_TFTPD),y) IPUTILS_CONF_OPTS += -DBUILD_TFTPD=true -define IPUTILS_MOVE_TFTPD_BINARY - mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd -endef -IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_TFTPD_BINARY - else IPUTILS_CONF_OPTS += -DBUILD_TFTPD=false endif diff --git a/buildroot/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch b/buildroot/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch new file mode 100644 index 000000000..95a9616c7 --- /dev/null +++ b/buildroot/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch @@ -0,0 +1,105 @@ +From 0cdc7a22d5156440fecff14c438d4e24261ac793 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 20 Feb 2021 23:38:56 +0100 +Subject: [PATCH] fix uint64_t printf format (use PRIu64) + +Fixes (on arm 32-bit): + + $ irqbalance-ui + Invalid data sent. Unexpected token: (null)TYPE + +And strace showed the following: + + 237 sendmsg(3, {msg_name=NULL, msg_namelen=0, msg_iov=[{iov_base="stats", iov_len=5}], msg_iovlen=1, msg_control=[{cmsg_len=24, cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, cmsg_data={pid=237, uid=0, gid=0}}], msg_controllen=24, msg_flags=0}, 0) = 5 + 237 recv(3, "TYPE 3 NUMBER -1 LOAD 0 SAVE_MODE 0 (null)TYPE 2 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 3 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 1 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 1 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 2 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 2 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 3 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)", 8192, 0) = 411 + +[backported from upstream] +Signed-off-by: Peter Seiderer +--- + cputree.c | 3 ++- + irqbalance.c | 5 +++-- + ui/ui.c | 5 +++-- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/cputree.c b/cputree.c +index fda0200..a8dba73 100644 +--- a/cputree.c ++++ b/cputree.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + +@@ -417,7 +418,7 @@ static void dump_irq(struct irq_info *info, void *data) + indent[i] = log_indent[0]; + + indent[i] = '\0'; +- log(TO_CONSOLE, LOG_INFO, "%sInterrupt %i node_num is %d (%s/%lu:%lu) \n", indent, ++ log(TO_CONSOLE, LOG_INFO, "%sInterrupt %i node_num is %d (%s/%" PRIu64 ":%" PRIu64 ") \n", indent, + info->irq, irq_numa_node(info)->number, classes[info->class], info->load, (info->irq_count - info->last_irq_count)); + free(indent); + } +diff --git a/irqbalance.c b/irqbalance.c +index 9baa955..458bb07 100644 +--- a/irqbalance.c ++++ b/irqbalance.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_GETOPT_LONG + #include + #endif +@@ -357,7 +358,7 @@ void get_irq_data(struct irq_info *irq, void *data) + *irqdata = newptr; + + sprintf(*irqdata + strlen(*irqdata), +- "IRQ %d LOAD %lu DIFF %lu CLASS %d ", irq->irq, irq->load, ++ "IRQ %d LOAD %" PRIu64 " DIFF %" PRIu64 " CLASS %d ", irq->irq, irq->load, + (irq->irq_count - irq->last_irq_count), irq->class); + } + +@@ -395,7 +396,7 @@ void get_object_stat(struct topo_obj *object, void *data) + + *stats = newptr; + +- sprintf(*stats + strlen(*stats), "TYPE %d NUMBER %d LOAD %lu SAVE_MODE %d %s", ++ sprintf(*stats + strlen(*stats), "TYPE %d NUMBER %d LOAD %" PRIu64 " SAVE_MODE %d %s", + object->obj_type, object->number, object->load, + object->powersave_mode, irq_data ? irq_data : ""); + free(irq_data); +diff --git a/ui/ui.c b/ui/ui.c +index 06ec472..4cf68bf 100644 +--- a/ui/ui.c ++++ b/ui/ui.c +@@ -1,4 +1,5 @@ + ++#include + #include + #include "ui.h" + +@@ -563,7 +564,7 @@ void settings() + + char info[128] = "Current sleep interval between rebalancing: \0"; + uint8_t sleep_input_offset = strlen(info) + 3; +- snprintf(info + strlen(info), 128 - strlen(info), "%lu\n", setup.sleep); ++ snprintf(info + strlen(info), 128 - strlen(info), "%" PRIu64 "\n", setup.sleep); + attrset(COLOR_PAIR(1)); + mvprintw(2, 3, info); + print_all_cpus(); +@@ -588,7 +589,7 @@ void settings() + if(new_sleep != setup.sleep) { + setup.sleep = new_sleep; + char settings_data[128]; +- snprintf(settings_data, 128, "%s %lu", SET_SLEEP, new_sleep); ++ snprintf(settings_data, 128, "%s %" PRIu64, SET_SLEEP, new_sleep); + send_settings(settings_data); + } + break; +-- +2.25.1 + diff --git a/buildroot/package/irqbalance/S13irqbalance b/buildroot/package/irqbalance/S13irqbalance index b06a3372e..f6ed9291b 100644 --- a/buildroot/package/irqbalance/S13irqbalance +++ b/buildroot/package/irqbalance/S13irqbalance @@ -10,6 +10,8 @@ PID="/var/run/irqbalance.pid" case "$1" in start) printf "Starting irqbalance: " + # for irqbalance socket /run/irqbalance/irqbalance.sock + mkdir -p /run/irqbalance start-stop-daemon -S -q -x $EXEC -- $ARGS if [ $? != 0 ]; then echo "FAILED" diff --git a/buildroot/package/irqbalance/irqbalance.service b/buildroot/package/irqbalance/irqbalance.service index 9ba3be43b..39574877f 100644 --- a/buildroot/package/irqbalance/irqbalance.service +++ b/buildroot/package/irqbalance/irqbalance.service @@ -3,6 +3,7 @@ Description=irqbalance daemon After=syslog.target [Service] +RuntimeDirectory=irqbalance ExecStart=/usr/sbin/irqbalance --foreground [Install] diff --git a/buildroot/package/iw/iw.hash b/buildroot/package/iw/iw.hash index 0aa51563f..126b1cb67 100644 --- a/buildroot/package/iw/iw.hash +++ b/buildroot/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f iw-5.4.tar.xz +sha256 293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2 iw-5.9.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/buildroot/package/iw/iw.mk b/buildroot/package/iw/iw.mk index 2250ea413..32ecf93c1 100644 --- a/buildroot/package/iw/iw.mk +++ b/buildroot/package/iw/iw.mk @@ -4,11 +4,12 @@ # ################################################################################ -IW_VERSION = 5.4 +IW_VERSION = 5.9 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC IW_LICENSE_FILES = COPYING +IW_CPE_ID_VENDOR = kernel IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ diff --git a/buildroot/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch b/buildroot/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch new file mode 100644 index 000000000..37dbdb18e --- /dev/null +++ b/buildroot/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch @@ -0,0 +1,61 @@ +From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Dec 2020 07:51:04 +0100 +Subject: [PATCH] configure.ac: fix static build with readline + +Retrieve the dependencies of readline through pkg-config (and fallback +to -lreadline) to avoid the following build failure: + +/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr': +display.c:(.text+0x1ab): undefined reference to `tputs' + +Fixes: + - http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://lists.01.org/hyperkitty/list/iwd@lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/] +--- + Makefile.am | 4 ++-- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3cd7eaa6..493d06cc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \ + client/network.h client/network.c \ + client/properties.h client/properties.c \ + client/wsc.c client/station.c +-client_iwctl_LDADD = $(ell_ldadd) -lreadline ++client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS) + + if MANUAL_PAGES + man_MANS += client/iwctl.1 +@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \ + client/display.h client/display.c \ + client/network.h client/network.c \ + client/properties.h client/properties.c +-unit_test_client_LDADD = $(ell_ldadd) -lreadline ++unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS) + endif + + unit_test_sae_SOURCES = unit/test-sae.c \ +diff --git a/configure.ac b/configure.ac +index 7bd917a4..52f27ed9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], + if (test "${enable_client}" != "no"); then + AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, + AC_MSG_ERROR(readline header files are required)) ++ PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline) ++ AC_SUBST(READLINE_CFLAGS) ++ AC_SUBST(READLINE_LIBS) + fi + AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") + +-- +2.29.2 + diff --git a/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch b/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch deleted file mode 100644 index 97f8c5a8e..000000000 --- a/buildroot/package/iwd/0001-src-ap.c-fix-build-with-uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 377df79e83e2127a087e1aa5ba6173e195e50933 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Sep 2020 07:47:14 +0200 -Subject: [PATCH] src/ap.c: fix build with uclibc - -explicit_bzero is used in src/ap.c since commit -d55e00b31d7bccdbb2ea1cdeb0a749df77a51e47 but src/missing.h is not -included, as a result build with uclibc fails on: - -/srv/storage/autobuild/run/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/ap.o: in function `ap_probe_req_cb': -ap.c:(.text+0x23d8): undefined reference to `explicit_bzero' - -Fixes: - - http://autobuild.buildroot.org/results/c7a0096a269bfc52bd8e23d453d36d5bfb61441d - -Signed-off-by: Fabrice Fontaine -[Upstream: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=0a6de7932a61ec82aca4f78f71dab7247c897860] ---- - src/ap.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ap.c b/src/ap.c -index c972cfcb..ac705c31 100644 ---- a/src/ap.c -+++ b/src/ap.c -@@ -31,6 +31,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/iwd.h" - #include "src/module.h" - #include "src/scan.h" --- -2.28.0 - diff --git a/buildroot/package/iwd/Config.in b/buildroot/package/iwd/Config.in index 4e85fb4fd..59d442230 100644 --- a/buildroot/package/iwd/Config.in +++ b/buildroot/package/iwd/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_IWD depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell - depends on !BR2_STATIC_LIBS # ell depends on BR2_USE_WCHAR # ell select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_ELL @@ -14,8 +13,8 @@ config BR2_PACKAGE_IWD https://iwd.wiki.kernel.org/ -comment "iwd needs a toolchain w/ threads, dynamic library, wchar, headers >= 4.12" +comment "iwd needs a toolchain w/ threads, wchar, headers >= 4.12" depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/buildroot/package/iwd/iwd.hash b/buildroot/package/iwd/iwd.hash index 16e01ed47..f1ee23dc5 100644 --- a/buildroot/package/iwd/iwd.hash +++ b/buildroot/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e4178a105021ef1b7b7c23cbc6f8e45cbab3bb0830da588b406ff4a281e9f948 iwd-1.9.tar.gz +sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/iwd/iwd.mk b/buildroot/package/iwd/iwd.mk index 58d332dc0..652beb838 100644 --- a/buildroot/package/iwd/iwd.mk +++ b/buildroot/package/iwd/iwd.mk @@ -4,13 +4,16 @@ # ################################################################################ -IWD_VERSION = 1.9 +IWD_VERSION = 1.10 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+ IWD_LICENSE_FILES = COPYING +IWD_CPE_ID_VENDOR = intel +IWD_CPE_ID_PRODUCT = inet_wireless_daemon # sources from git, no configure script provided IWD_AUTORECONF = YES +IWD_SELINUX_MODULES = networkmanager IWD_CONF_OPTS = \ --disable-manual-pages \ diff --git a/buildroot/package/jack2/jack2.hash b/buildroot/package/jack2/jack2.hash index aec56e24a..df708f7ca 100644 --- a/buildroot/package/jack2/jack2.hash +++ b/buildroot/package/jack2/jack2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c jack2-1.9.14.tar.gz +sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/buildroot/package/jack2/jack2.mk b/buildroot/package/jack2/jack2.mk index db63b7f4b..e6a036bac 100644 --- a/buildroot/package/jack2/jack2.mk +++ b/buildroot/package/jack2/jack2.mk @@ -4,9 +4,11 @@ # ################################################################################ -JACK2_VERSION = 1.9.14 +JACK2_VERSION = 1.9.17 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) +JACK2_LICENSE_FILES = COPYING +JACK2_CPE_ID_VENDOR = jackaudio JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib JACK2_INSTALL_STAGING = YES diff --git a/buildroot/package/jansson/jansson.mk b/buildroot/package/jansson/jansson.mk index 83fb37016..4ac64b69e 100644 --- a/buildroot/package/jansson/jansson.mk +++ b/buildroot/package/jansson/jansson.mk @@ -8,6 +8,7 @@ JANSSON_VERSION = 2.13.1 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE +JANSSON_CPE_ID_VALID = YES JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm" diff --git a/buildroot/package/jasper/jasper.hash b/buildroot/package/jasper/jasper.hash index 2a0a4fdff..d4ed191f9 100644 --- a/buildroot/package/jasper/jasper.hash +++ b/buildroot/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20facc904bd9d38c20e0c090b1be3ae02ae5b2703b803013be2ecad586a18927 jasper-2.0.23.tar.gz +sha256 f5bc48e2884bcabd2aca1737baff4ca962ec665b6eb673966ced1f7adea07edb jasper-2.0.25.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/buildroot/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk index 338610832..d487e8e2d 100644 --- a/buildroot/package/jasper/jasper.mk +++ b/buildroot/package/jasper/jasper.mk @@ -4,11 +4,12 @@ # ################################################################################ -JASPER_VERSION = 2.0.23 +JASPER_VERSION = 2.0.25 JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE +JASPER_CPE_ID_VALID = YES JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ diff --git a/buildroot/package/jhead/jhead.mk b/buildroot/package/jhead/jhead.mk index d56ee0daf..9c0d4d123 100644 --- a/buildroot/package/jhead/jhead.mk +++ b/buildroot/package/jhead/jhead.mk @@ -8,6 +8,7 @@ JHEAD_VERSION = 3.04 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt +JHEAD_CPE_ID_VALID = YES define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/buildroot/package/jitterentropy-library/jitterentropy-library.mk b/buildroot/package/jitterentropy-library/jitterentropy-library.mk index 3db04b27d..d9dc031c3 100644 --- a/buildroot/package/jitterentropy-library/jitterentropy-library.mk +++ b/buildroot/package/jitterentropy-library/jitterentropy-library.mk @@ -10,6 +10,7 @@ JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2 JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes +JITTERENTROPY_LIBRARY_SELINUX_MODULES = entropyd ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static diff --git a/buildroot/package/jquery/jquery.mk b/buildroot/package/jquery/jquery.mk index 88ab84fa0..8febed36c 100644 --- a/buildroot/package/jquery/jquery.mk +++ b/buildroot/package/jquery/jquery.mk @@ -8,6 +8,7 @@ JQUERY_VERSION = 3.5.1 JQUERY_SITE = http://code.jquery.com JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js JQUERY_LICENSE = MIT +JQUERY_CPE_ID_VENDOR = jquery define JQUERY_EXTRACT_CMDS cp $(JQUERY_DL_DIR)/$(JQUERY_SOURCE) $(@D) diff --git a/buildroot/package/json-c/json-c.mk b/buildroot/package/json-c/json-c.mk index 5e27c9b23..a55831432 100644 --- a/buildroot/package/json-c/json-c.mk +++ b/buildroot/package/json-c/json-c.mk @@ -9,6 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING +JSON_C_CPE_ID_VALID = YES $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash index 4d540f240..eb9270b31 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7d0edf65f2ac7390af5e5a0b323b31202a6c11d744a74b588dc30f5a8c9865ba json-3.8.0.tar.gz +sha256 9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b json-3.9.0.tar.gz sha256 50be9457e5c9faaba5e60d9c73f8eabe9e0737a2d9c3e58357d856661862c18e LICENSE.MIT diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk index afc900b7d..6e21723fd 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.8.0 +JSON_FOR_MODERN_CPP_VERSION = 3.9.0 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT diff --git a/buildroot/package/jsoncpp/jsoncpp.mk b/buildroot/package/jsoncpp/jsoncpp.mk index cfded2bf0..a8d863a3e 100644 --- a/buildroot/package/jsoncpp/jsoncpp.mk +++ b/buildroot/package/jsoncpp/jsoncpp.mk @@ -8,6 +8,7 @@ JSONCPP_VERSION = 1.9.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE +JSONCPP_CPE_ID_VALID = YES JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false diff --git a/buildroot/package/jszip/Config.in b/buildroot/package/jszip/Config.in new file mode 100644 index 000000000..455891ab1 --- /dev/null +++ b/buildroot/package/jszip/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_JSZIP + bool "jszip" + help + JSZip is a javascript library for creating, reading and + editing .zip files, with a lovely and simple API. + + https://stuk.github.io/jszip diff --git a/buildroot/package/jszip/jszip.hash b/buildroot/package/jszip/jszip.hash new file mode 100644 index 000000000..13a2076ad --- /dev/null +++ b/buildroot/package/jszip/jszip.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e5343decfb781b15c54c0df9ddedd6c8518c800a4667a0a95741c694a4f38d34 jszip-3.2.2.tar.gz +sha256 14450c78405ad2a2173e25740b56406556779149df9c4c83523a8c63d0686210 LICENSE.markdown diff --git a/buildroot/package/jszip/jszip.mk b/buildroot/package/jszip/jszip.mk new file mode 100644 index 000000000..04bd0a7b3 --- /dev/null +++ b/buildroot/package/jszip/jszip.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# jszip +# +################################################################################ + +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 + +define JSZIP_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \ + $(TARGET_DIR)/var/www/jszip/js/jszip.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch b/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch deleted file mode 100644 index e2c28a2eb..000000000 --- a/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e70968bcbca86dd448d619c40cdeaae8b7dcee98 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 24 Nov 2020 23:01:55 +0100 -Subject: [PATCH] configure.ac: don't override LDFLAGS with CPPFLAGS - -Don't override LDFLAGS with CPPFLAGS to avoid a build failure when -building statically with uclibc due to -static keyword being lost: - -/home/buildroot/autobuild/run/instance-3/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o kismet_cap_linux_wifi ../interface_control.c.o ../wifi_ht_channels.c.o linux_wireless_control.c.o linux_netlink_control.c.o linux_nexmon_control.c.o linux_wireless_rfkill.c.o capture_linux_wifi.c.o ../libkismetdatasource.a -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpcap -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/home/buildroot/autobuild/run/instance-3/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/.libs -lnl-genl-3 -lnl-3 -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpthread -lnl-genl-3 -lnl-3 -lpthread -lpthread -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lprotobuf-c -lm -/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/libgcc.a(unwind-dw2-fde-dip.o): in function `_Unwind_Find_registered_FDE': -/home/buildroot/autobuild/run/instance-3/output-1/build/host-gcc-final-9.3.0/build/xtensa-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde.c:1040: undefined reference to `dl_iterate_phdr' -collect2: error: ld returned 1 exit status - -To fix this build failure, just drop OCPPFLAGS and OLDFLAGS which are -not used anymore - -Fixes: - - http://autobuild.buildroot.org/results/b859eb3850c0beb23e18010dc2f07cd0f5c14440 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/kismetwireless/kismet/pull/326 (merged)] ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aab47fb0..4df37a29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -619,11 +619,6 @@ else - AC_MSG_RESULT([no]) - fi - --OCPPFLAGS=$CPPFLAGS --CPPFLAGS="$CPPFLAGS" --OLDFLAGS=$LDFLAGS --LDFLAGS="$CPPFLAGS" -- - # Do we need libm for math functions? - AC_MSG_CHECKING([for libm math function in std libs]) - OCFL="$CFLAGS" --- -2.29.2 - diff --git a/buildroot/package/kismet/Config.in b/buildroot/package/kismet/Config.in index 4ef84731d..02046e7ef 100644 --- a/buildroot/package/kismet/Config.in +++ b/buildroot/package/kismet/Config.in @@ -61,7 +61,6 @@ config BR2_PACKAGE_KISMET_SERVER depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future - select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF comment "server needs a toolchain w/ dynamic library, gcc >= 4.8" diff --git a/buildroot/package/kismet/kismet.hash b/buildroot/package/kismet/kismet.hash index c55e31ef9..2b0baa100 100644 --- a/buildroot/package/kismet/kismet.hash +++ b/buildroot/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 79c9c343cc055523ec1c8607bf63f26bb826d8ffaccc1e6e033c945c8ada664d kismet-2020-09-R4.tar.xz +sha256 52a8eddd560688693552bcd8ff033f662a1a57b47650d6434c5e2c6d83e2bb33 kismet-2020-12-R3.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/buildroot/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk index 0a4ae00f0..b39b58d81 100644 --- a/buildroot/package/kismet/kismet.mk +++ b/buildroot/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2020-09-R4 +KISMET_VERSION = 2020-12-R3 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -17,8 +17,6 @@ KISMET_DEPENDENCIES = \ zlib KISMET_LICENSE = GPL-2.0+ KISMET_LICENSE_FILES = LICENSE -# We're patching configure.ac -KISMET_AUTORECONF = YES KISMET_CONF_OPTS = --disable-debuglibs KISMET_CXXFLAGS = $(TARGET_CXXFLAGS) @@ -47,6 +45,13 @@ else KISMET_CONF_OPTS += --disable-libusb endif +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) +KISMET_DEPENDENCIES += libwebsockets +KISMET_CONF_OPTS += --enable-libwebsockets +else +KISMET_CONF_OPTS += --disable-libwebsockets +endif + ifeq ($(BR2_PACKAGE_LM_SENSORS),y) KISMET_DEPENDENCIES += lm-sensors KISMET_CONF_OPTS += --enable-lmsensors @@ -77,7 +82,6 @@ KISMET_INSTALL_TARGET_OPTS += \ SUIDGROUP=$(shell id -g) ifeq ($(BR2_PACKAGE_KISMET_SERVER),y) -KISMET_DEPENDENCIES += libmicrohttpd KISMET_CONF_OPTS += --disable-capture-tools-only KISMET_INSTALL_TARGET_OPTS += install else diff --git a/buildroot/package/kmod/kmod.hash b/buildroot/package/kmod/kmod.hash index 3cb60b2dd..f0bd436dc 100644 --- a/buildroot/package/kmod/kmod.hash +++ b/buildroot/package/kmod/kmod.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c kmod-27.tar.xz +sha256 3969fc0f13daa98084256337081c442f8749310089e48aa695c9b4dfe1b3a26c kmod-28.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING diff --git a/buildroot/package/kmod/kmod.mk b/buildroot/package/kmod/kmod.mk index 69615452c..7fed252c2 100644 --- a/buildroot/package/kmod/kmod.mk +++ b/buildroot/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 27 +KMOD_VERSION = 28 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES @@ -15,6 +15,8 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf KMOD_LICENSE = LGPL-2.1+ (library) KMOD_LICENSE_FILES = libkmod/COPYING +KMOD_CPE_ID_VENDOR = kernel + # --gc-sections triggers binutils ld segfault # https://sourceware.org/bugzilla/show_bug.cgi?id=21180 ifeq ($(BR2_microblaze),y) diff --git a/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch b/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch deleted file mode 100644 index 6ec080af9..000000000 --- a/buildroot/package/kmsxx/0001-fix-compiler-errors-with-gcc-10.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aa54634ce7cbbfc844de945e73a9f34cdcb9bb12 Mon Sep 17 00:00:00 2001 -From: Peter Trompeter -Date: Fri, 15 May 2020 15:20:47 +0200 -Subject: [PATCH] fix compiler errors with gcc 10 - -[Retrieved from: -https://github.com/tomba/kmsxx/commit/aa54634ce7cbbfc844de945e73a9f34cdcb9bb12] -Signed-off-by: Fabrice Fontaine ---- - kms++/inc/kms++/pixelformats.h | 1 + - kms++util/src/opts.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/kms++/inc/kms++/pixelformats.h b/kms++/inc/kms++/pixelformats.h -index 784717d..4e73d5d 100644 ---- a/kms++/inc/kms++/pixelformats.h -+++ b/kms++/inc/kms++/pixelformats.h -@@ -2,6 +2,7 @@ - - #include - #include -+#include - - namespace kms - { -diff --git a/kms++util/src/opts.cpp b/kms++util/src/opts.cpp -index afef452..5a14b84 100644 ---- a/kms++util/src/opts.cpp -+++ b/kms++util/src/opts.cpp -@@ -1,4 +1,5 @@ - #include -+#include - - #include - #include diff --git a/buildroot/package/kmsxx/0001-meson-add-use-system-fmt-option.patch b/buildroot/package/kmsxx/0001-meson-add-use-system-fmt-option.patch new file mode 100644 index 000000000..e9d67b120 --- /dev/null +++ b/buildroot/package/kmsxx/0001-meson-add-use-system-fmt-option.patch @@ -0,0 +1,46 @@ +From 61db7d5520f50564da8f2c9ac952eadb31f70727 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 29 Nov 2020 11:13:41 +0100 +Subject: [PATCH] meson: add use-system-fmt option + +[Upstream: https://github.com/tomba/kmsxx/pull/60] +Signed-off-by: Peter Seiderer +--- + meson.build | 10 +++++++--- + meson_options.txt | 2 ++ + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 9652009..29080f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,9 +31,13 @@ endif + + add_global_link_arguments(link_arguments, language : 'cpp') + +-libfmt_includes = include_directories('ext/fmt/include') +-libfmt_dep = declare_dependency(include_directories : libfmt_includes, +- compile_args : '-DFMT_HEADER_ONLY') ++if get_option('use-system-fmt') ++ libfmt_dep = dependency('fmt') ++else ++ libfmt_includes = include_directories('ext/fmt/include') ++ libfmt_dep = declare_dependency(include_directories : libfmt_includes, ++ compile_args : '-DFMT_HEADER_ONLY') ++endif + + pybind11_includes = include_directories('ext/pybind11/include') + pybind11_dep = declare_dependency(include_directories : pybind11_includes) +diff --git a/meson_options.txt b/meson_options.txt +index cd854ab..48176a8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,3 +3,5 @@ option('pykms', type : 'feature', value : 'auto') + option('omap', type : 'feature', value : 'auto') + option('static-libc', type : 'boolean', value : false) + option('utils', type : 'boolean', value : true) ++ ++option('use-system-fmt', type : 'boolean', value : false) +-- +2.29.2 + diff --git a/buildroot/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch b/buildroot/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch deleted file mode 100644 index 3febac40e..000000000 --- a/buildroot/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001 -From: Tobias Off -Date: Thu, 8 Oct 2020 22:37:55 +0200 -Subject: [PATCH] added #include to card.h to follow gcc10 porting - guide - -[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch] -Signed-off-by: Peter Seiderer ---- - kms++/inc/kms++/card.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h -index 90ad1f6..f055e27 100644 ---- a/kms++/inc/kms++/card.h -+++ b/kms++/inc/kms++/card.h -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include "decls.h" - #include "pipeline.h" --- -2.29.2 - diff --git a/buildroot/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch b/buildroot/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch new file mode 100644 index 000000000..be58b65b4 --- /dev/null +++ b/buildroot/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch @@ -0,0 +1,43 @@ +From 27f15549ce67194e4152c57db2b762b7a443b4c7 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 29 Nov 2020 11:14:41 +0100 +Subject: [PATCH] meson: add use-system-pybind11 option + +[Upstream: https://github.com/tomba/kmsxx/pull/60] +Signed-off-by: Peter Seiderer +--- + meson.build | 8 ++++++-- + meson_options.txt | 1 + + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 29080f4..4b3e7c3 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,8 +39,12 @@ else + compile_args : '-DFMT_HEADER_ONLY') + endif + +-pybind11_includes = include_directories('ext/pybind11/include') +-pybind11_dep = declare_dependency(include_directories : pybind11_includes) ++if get_option('use-system-pybind11') ++ pybind11_dep = dependency('pybind11') ++else ++ pybind11_includes = include_directories('ext/pybind11/include') ++ pybind11_dep = declare_dependency(include_directories : pybind11_includes) ++endif + + libdrmomap_dep = dependency('libdrm_omap', required : get_option('omap')) + +diff --git a/meson_options.txt b/meson_options.txt +index 48176a8..095c6f2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -5,3 +5,4 @@ option('static-libc', type : 'boolean', value : false) + option('utils', type : 'boolean', value : true) + + option('use-system-fmt', type : 'boolean', value : false) ++option('use-system-pybind11', type : 'boolean', value : false) +-- +2.29.2 + diff --git a/buildroot/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch b/buildroot/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch new file mode 100644 index 000000000..a90852138 --- /dev/null +++ b/buildroot/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch @@ -0,0 +1,48 @@ +From 0ef36b2e22c2ac0331b3096b7adc69fb08044048 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 29 Nov 2020 11:37:26 +0100 +Subject: [PATCH] meson: only build py in case pykms is enabled + +[Upstream: https://github.com/tomba/kmsxx/pull/60] +Signed-off-by: Peter Seiderer +--- + meson.build | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 4b3e7c3..1810b17 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,11 +39,13 @@ else + compile_args : '-DFMT_HEADER_ONLY') + endif + +-if get_option('use-system-pybind11') +- pybind11_dep = dependency('pybind11') +-else +- pybind11_includes = include_directories('ext/pybind11/include') +- pybind11_dep = declare_dependency(include_directories : pybind11_includes) ++if get_option('pykms').enabled() ++ if get_option('use-system-pybind11') ++ pybind11_dep = dependency('pybind11') ++ else ++ pybind11_includes = include_directories('ext/pybind11/include') ++ pybind11_dep = declare_dependency(include_directories : pybind11_includes) ++ endif + endif + + libdrmomap_dep = dependency('libdrm_omap', required : get_option('omap')) +@@ -55,7 +57,9 @@ if get_option('utils') + subdir('utils') + endif + +-subdir('py') ++if get_option('pykms').enabled() ++ subdir('py') ++endif + + if get_option('kmscube') + subdir('kmscube') +-- +2.29.2 + diff --git a/buildroot/package/kmsxx/Config.in b/buildroot/package/kmsxx/Config.in index 1d174c18b..fa327ba18 100644 --- a/buildroot/package/kmsxx/Config.in +++ b/buildroot/package/kmsxx/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_KMSXX bool "kms++" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_USE_WCHAR # fmt + select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBDRM help libkms++ is a C++11 library for kernel mode setting. @@ -21,6 +23,7 @@ config BR2_PACKAGE_KMSXX_INSTALL_TESTS endif -comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 3.8" +comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 4.11, wchar" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 \ + || !BR2_USE_WCHAR diff --git a/buildroot/package/kmsxx/kmsxx.hash b/buildroot/package/kmsxx/kmsxx.hash index b8d06ac47..1eeb1e6a7 100644 --- a/buildroot/package/kmsxx/kmsxx.hash +++ b/buildroot/package/kmsxx/kmsxx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28892e50c1d1c83fddff9ec683e3bdbd465f5032d0014ceeab43563b813807e1 kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9.tar.gz -sha256 022b4d51da34a380d74dc24eea8e2c4e1a4c8776a52171f8d9e941cf56daf888 LICENSE +sha256 4a682328b03c28ff1f6cfcafc48d30c3feb5ef98ed07e5dd3bbd9e6a1d4a47cc kmsxx-548905611c130ea9d31929a0caf7a198d8bac462.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/buildroot/package/kmsxx/kmsxx.mk b/buildroot/package/kmsxx/kmsxx.mk index 829beb1d6..fd40ff8e7 100644 --- a/buildroot/package/kmsxx/kmsxx.mk +++ b/buildroot/package/kmsxx/kmsxx.mk @@ -4,62 +4,46 @@ # ################################################################################ -KMSXX_VERSION = cb0786049f960f2bd383617151b01318e02e9ff9 +KMSXX_VERSION = 548905611c130ea9d31929a0caf7a198d8bac462 KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION)) KMSXX_LICENSE = MPL-2.0 KMSXX_LICENSE_FILES = LICENSE KMSXX_INSTALL_STAGING = YES -KMSXX_DEPENDENCIES = libdrm host-pkgconf -KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF +KMSXX_DEPENDENCIES = fmt libdrm host-pkgconf +KMSXX_CONF_OPTS = \ + -Dkmscube=false \ + -Dpykms=disabled \ + -Domap=disabled \ + -Duse-system-fmt=true \ + -Duse-system-pybind11=true -KMSXX_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -KMSXX_CXXFLAGS += -O0 +ifeq ($(BR2_STATIC_LIBS),y) +KMSXX_CONF_OPTS += -Dstatic-libc=true +else +KMSXX_CONF_OPTS += -Dstatic-libc=false endif -KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(KMSXX_CXXFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +KMSXX_CXXFLAGS += $(TARGET_CXXFLAGS) -O0 +endif ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) -KMSXX_TESTS = \ - fbtest kmsblank kmscapture \ - kmsprint kmstest kmsview wbcap \ - wbm2m - -define KMSXX_INSTALL_TARGET_TESTS - $(foreach t,$(KMSXX_TESTS),\ - $(INSTALL) -D -m 0755 $(@D)/bin/$(t) \ +KMSXX_CONF_OPTS += -Dutils=true +# extra handling for some utils not installed by default +KMSXX_EXTRA_UTILS = kmsview kmscapture omap-wbcap omap-wbm2m +ifeq ($(BR2_PACKAGE_LIBEVDEV),y) +KMSXX_DEPENDENCIES += libevdev +KMSXX_EXTRA_UTILS += kmstouch +endif +define KMSXX_INSTALL_EXTRA_UTILS + $(foreach t,$(KMSXX_EXTRA_UTILS),\ + $(INSTALL) -D -m 0755 $(@D)/build/utils/$(t) \ $(TARGET_DIR)/usr/bin/$(t) ) endef +KMSXX_POST_INSTALL_TARGET_HOOKS += KMSXX_INSTALL_EXTRA_UTILS +else +KMSXX_CONF_OPTS += -Dutils=false endif -KMSXX_LIBS = kms++ kms++util - -define KMSXX_INSTALL_TARGET_CMDS - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(foreach l,$(KMSXX_LIBS),\ - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(TARGET_DIR)/usr/lib/lib$(l).so - ) - ) - $(KMSXX_INSTALL_TARGET_TESTS) -endef - -# kmsxx only builds shared or static libraries, so when -# BR2_SHARED_STATIC_LIBS=y, we don't have any static library to -# install -define KMSXX_INSTALL_STAGING_CMDS - $(foreach l,$(KMSXX_LIBS),\ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(STAGING_DIR)/usr/lib/lib$(l).so) - $(if $(BR2_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \ - $(STAGING_DIR)/usr/lib/lib$(l).a) - mkdir -p $(STAGING_DIR)/usr/include/$(l) - cp -dpfr $(@D)/$(l)/inc/$(l)/* $(STAGING_DIR)/usr/include/$(l)/ - ) -endef - -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/kodi-inputstream-adaptive/Config.in b/buildroot/package/kodi-inputstream-adaptive/Config.in index f9ba20adc..21f1cff17 100644 --- a/buildroot/package/kodi-inputstream-adaptive/Config.in +++ b/buildroot/package/kodi-inputstream-adaptive/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE help Kodi inputstream addon for several manifest types - https://github.com/peak3d/inputstream.adaptive + https://github.com/xbmc/inputstream.adaptive diff --git a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 30fbaf525..a8024951d 100644 --- a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -5,7 +5,7 @@ ################################################################################ KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.6-Leia -KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) +KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi/Config.in b/buildroot/package/kodi/Config.in index 31ad8630d..ecc5a0532 100644 --- a/buildroot/package/kodi/Config.in +++ b/buildroot/package/kodi/Config.in @@ -88,7 +88,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LZO select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL @@ -258,11 +257,15 @@ config BR2_PACKAGE_KODI_LIBUSB # https://github.com/xbmc/xbmc/blob/Jarvis/configure.ac#L1554 # "if libudev is available, we don't need libusb" depends on !BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help Enable libusb support. +comment "usb support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_KODI_LIBVA bool "va" depends on \ diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk index 80a8d4e6b..3f22db48a 100644 --- a/buildroot/package/kodi/kodi.mk +++ b/buildroot/package/kodi/kodi.mk @@ -37,7 +37,6 @@ KODI_DEPENDENCIES = \ libcurl \ libfribidi \ libplist \ - libsamplerate \ lzo \ ncurses \ openssl \ diff --git a/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash b/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash index 345877893..ad500d04f 100644 --- a/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2 kvm-unit-tests-kvm-unit-tests-20171020.tar.gz +sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/buildroot/package/kvmtool/kvmtool.hash b/buildroot/package/kvmtool/kvmtool.hash index fd841c354..8747ae1d2 100644 --- a/buildroot/package/kvmtool/kvmtool.hash +++ b/buildroot/package/kvmtool/kvmtool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz +sha256 e2eb2cd8b31d24484e3095923cfe8c36d4b92741b76965cafaed6be3835369c6 kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e-br1.tar.gz sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/buildroot/package/lcms2/lcms2.mk b/buildroot/package/lcms2/lcms2.mk index d42c8c9a1..44b9965a8 100644 --- a/buildroot/package/lcms2/lcms2.mk +++ b/buildroot/package/lcms2/lcms2.mk @@ -8,7 +8,11 @@ LCMS2_VERSION = 2.11 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING +LCMS2_CPE_ID_VENDOR = littlecms +LCMS2_CPE_ID_PRODUCT = little_cms LCMS2_INSTALL_STAGING = YES +# tiff is only used by tificc sample +LCMS2_CONF_OPTS = --without-tiff ifeq ($(BR2_PACKAGE_JPEG),y) LCMS2_CONF_OPTS += --with-jpeg @@ -17,13 +21,6 @@ else LCMS2_CONF_OPTS += --without-jpeg endif -ifeq ($(BR2_PACKAGE_TIFF),y) -LCMS2_CONF_OPTS += --with-tiff -LCMS2_DEPENDENCIES += tiff -else -LCMS2_CONF_OPTS += --without-tiff -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) LCMS2_CONF_OPTS += --with-zlib LCMS2_DEPENDENCIES += zlib diff --git a/buildroot/package/leptonica/leptonica.hash b/buildroot/package/leptonica/leptonica.hash index 56f864335..6ef1a0912 100644 --- a/buildroot/package/leptonica/leptonica.hash +++ b/buildroot/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88 leptonica-1.78.0.tar.gz -sha256 ca0ac11c7c0acad9599d54990942cc11c9f6d9b569f1a360d774a628819c3518 leptonica-license.txt +sha256 ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4 leptonica-1.80.0.tar.gz +sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/buildroot/package/leptonica/leptonica.mk b/buildroot/package/leptonica/leptonica.mk index 309c65052..93d1e47c2 100644 --- a/buildroot/package/leptonica/leptonica.mk +++ b/buildroot/package/leptonica/leptonica.mk @@ -4,10 +4,11 @@ # ################################################################################ -LEPTONICA_VERSION = 1.78.0 +LEPTONICA_VERSION = 1.80.0 LEPTONICA_SITE = http://www.leptonica.org/source LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt +LEPTONICA_CPE_ID_VENDOR = leptonica LEPTONICA_INSTALL_STAGING = YES LEPTONICA_DEPENDENCIES = host-pkgconf @@ -51,8 +52,15 @@ endif ifeq ($(BR2_PACKAGE_WEBP),y) LEPTONICA_DEPENDENCIES += webp LEPTONICA_CONF_OPTS += --with-libwebp +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) +LEPTONICA_CONF_OPTS += --with-libwebpmux else -LEPTONICA_CONF_OPTS += --without-libwebp +LEPTONICA_CONF_OPTS += --without-libwebpmux +endif +else +LEPTONICA_CONF_OPTS += \ + --without-libwebp \ + --without-libwebpmux endif ifeq ($(BR2_PACKAGE_ZLIB),y) diff --git a/buildroot/package/less/less.hash b/buildroot/package/less/less.hash index 57a857efe..e675569cd 100644 --- a/buildroot/package/less/less.hash +++ b/buildroot/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# http://www.greenwoodsoftware.com/less/less-551.sig -sha256 ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d less-551.tar.gz +# http://www.greenwoodsoftware.com/less/less-563.sig +sha256 ce5b6d2b9fc4442d7a07c93ab128d2dff2ce09a1d4f2d055b95cf28dd0dc9a9a less-563.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/less/less.mk b/buildroot/package/less/less.mk index 3e58d39ca..89962f952 100644 --- a/buildroot/package/less/less.mk +++ b/buildroot/package/less/less.mk @@ -4,7 +4,7 @@ # ################################################################################ -LESS_VERSION = 551 +LESS_VERSION = 563 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING diff --git a/buildroot/package/lftp/lftp.mk b/buildroot/package/lftp/lftp.mk index 1348e137d..483ca298c 100644 --- a/buildroot/package/lftp/lftp.mk +++ b/buildroot/package/lftp/lftp.mk @@ -9,6 +9,7 @@ LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING +LFTP_CPE_ID_VALID = YES LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib diff --git a/buildroot/package/libabseil-cpp/libabseil-cpp.hash b/buildroot/package/libabseil-cpp/libabseil-cpp.hash index 63c4b86d3..b17604356 100644 --- a/buildroot/package/libabseil-cpp/libabseil-cpp.hash +++ b/buildroot/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bf3f13b13a0095d926b25640e060f7e13881bd8a792705dd9e161f3c2b9aa976 libabseil-cpp-20200923.2.tar.gz +sha256 ebe2ad1480d27383e4bf4211e2ca2ef312d5e6a09eba869fd2e8a5c5d553ded2 libabseil-cpp-20200923.3.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/buildroot/package/libabseil-cpp/libabseil-cpp.mk b/buildroot/package/libabseil-cpp/libabseil-cpp.mk index 9cff8f0ff..d614a5e5f 100644 --- a/buildroot/package/libabseil-cpp/libabseil-cpp.mk +++ b/buildroot/package/libabseil-cpp/libabseil-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20200923.2 +LIBABSEIL_CPP_VERSION = 20200923.3 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch b/buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch deleted file mode 100644 index 9c876bdc5..000000000 --- a/buildroot/package/libaio/0001-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4dc04ef55710f7f5c1e55ebb5cba8e22a126404e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Aug 2016 22:14:26 +0200 -Subject: [PATCH] src/Makefile: add ENABLE_SHARED boolean to allow static-only - build - -Currently, the libaio builds sytem builds a shared library -unconditionally. In some environments, this is not possible or -desirable. This commit adds a new Makefile variable, ENABLE_SHARED, -which defaults to "1" (i.e shared library enabled) and that allows to -override this behavior, and therefore to disable the build and -installation of the shared library. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index eadb336..cfab240 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,12 +8,17 @@ SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= - LINK_FLAGS+=$(LDFLAGS) -+ENABLE_SHARED ?= 1 - - soname=libaio.so.1 - minor=0 - micro=1 - libname=$(soname).$(minor).$(micro) --all_targets += libaio.a $(libname) -+all_targets += libaio.a -+ -+ifeq ($(ENABLE_SHARED),1) -+all_targets += $(libname) -+endif - - all: $(all_targets) - -@@ -55,9 +60,11 @@ $(libname): $(libaio_sobjs) libaio.map - install: $(all_targets) - install -D -m 644 libaio.h $(includedir)/libaio.h - install -D -m 644 libaio.a $(libdir)/libaio.a -+ifeq ($(ENABLE_SHARED),1) - install -D -m 755 $(libname) $(libdir)/$(libname) - ln -sf $(libname) $(libdir)/$(soname) - ln -sf $(libname) $(libdir)/libaio.so -+endif - - $(libaio_objs): libaio.h - --- -2.14.4 - diff --git a/buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch b/buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch deleted file mode 100644 index 49b9892ea..000000000 --- a/buildroot/package/libaio/0002-Makefile-add-missing-DESTDIR-variable-use.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 517d9fbe63fbd7e72445dce1cb3f3d8457d838cb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 14 Aug 2018 23:17:25 +0200 -Subject: [PATCH] Makefile: add missing DESTDIR variable use - -Patch borrowed from OpenEmbedded, available at -recipes/libaio/libaio-0.3.106/destdir.patch in their source tree. - -It just adds support for the traditional DESTDIR variable to install -the library in a different sysroot than the normal /. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e9dbdb0..c1fb831 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,7 +14,7 @@ all: - @$(MAKE) -C src - - install: -- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) -+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - check: - @$(MAKE) -C harness check --- -2.14.4 - diff --git a/buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch b/buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch deleted file mode 100644 index 17204be75..000000000 --- a/buildroot/package/libaio/0003-Link-against-libgcc-to-avoid-unresolved-symbols.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 672eaebd131c789a528e3a9cd089b4b69a82012b Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Fri, 28 Sep 2018 13:15:54 +0300 -Subject: [PATCH] Link against libgcc to avoid unresolved symbols - -We need to link agaisnt -lgcc, on at least hppa, PPC and ARC. -That's because in some corner-cases like compilation with -Os -on ARC and PPC so-called millicode (basically function prologue and -epilogue) implemented in libgcc.a is used. So we end up with -GLOBAL UNDEFINED symbol in libaio.so and then on linkage of the final -applicaiton LD fails to proceed saying: ---------------------------->8---------------------- -hidden symbol '__ld_r13_to_r15_ret' in .../libgcc.a(_millicodethunk_ret.o) is referenced by DSO ---------------------------->8---------------------- - -Also it looks like in general it is not the best idea to use either -"-nostartfiles" or "-nostdlib" when linking shared libs because -default construtor/destructor functions won't be executed, see -"5.2. Library constructor and destructor functions" in [1] - -So let's stop passing "-nostdlib" and "-nostartfiles" and get required -stuff built-in libaio. - -Initial patch taken from Debian [2]. - -Fixes build failures in Buildroot like blktrace [3], lvm2 [4]. - -Was submitted upstream via pull-request [5]. - -[1] http://tldp.org/HOWTO/Program-Library-HOWTO/miscellaneous.html -[2] https://sources.debian.org/patches/libaio/0.3.111-1/01_link_libs.patch/ -[3] http://autobuild.buildroot.net/results/17461209755038a30118d76acb4f43469a22a139/ -[4] http://autobuild.buildroot.net/results/a5dfc87f94b97135e5cc84f6a876114891ed9dd9/ -[5] https://pagure.io/libaio/pull-request/7 - -Signed-off-by: Guillem Jover -Signed-off-by: Alexey Brodkin ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index eadb336b47e3..5911c810c766 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -3,7 +3,7 @@ includedir=$(prefix)/include - libdir=$(prefix)/lib - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= --- -2.17.1 - diff --git a/buildroot/package/libaio/libaio.hash b/buildroot/package/libaio/libaio.hash index 17dd1ff70..ac815a73b 100644 --- a/buildroot/package/libaio/libaio.hash +++ b/buildroot/package/libaio/libaio.hash @@ -1,5 +1,5 @@ # From https://releases.pagure.org/libaio/CHECKSUMS -sha256 62cf871ad8fd09eb3418f00aca7a7d449299b8e1de31c65f28bf6a2ef1fa502a libaio-0.3.111.tar.gz +sha256 ab0462f2c9d546683e5147b1ce9c195fe95d07fac5bf362f6c01637955c3b492 libaio-0.3.112.tar.gz # Hash for license file: -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/buildroot/package/libaio/libaio.mk b/buildroot/package/libaio/libaio.mk index a215ca653..34f08b75e 100644 --- a/buildroot/package/libaio/libaio.mk +++ b/buildroot/package/libaio/libaio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAIO_VERSION = 0.3.111 +LIBAIO_VERSION = 0.3.112 LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libao/libao.mk b/buildroot/package/libao/libao.mk index 501ea0c9f..19a4c165c 100644 --- a/buildroot/package/libao/libao.mk +++ b/buildroot/package/libao/libao.mk @@ -10,6 +10,7 @@ LIBAO_DEPENDENCIES = host-pkgconf LIBAO_INSTALL_STAGING = YES LIBAO_LICENSE = GPL-2.0+ LIBAO_LICENSE_FILES = COPYING +LIBAO_CPE_ID_VENDOR = xiph LIBAO_CONF_OPTS = \ --disable-esd \ --disable-wmm \ diff --git a/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch b/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch deleted file mode 100644 index 2d5114337..000000000 --- a/buildroot/package/libapparmor/3.0.0/0001-libapparmor-add-missing-include-for-socklen_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt -Date: Sat, 3 Oct 2020 20:37:55 +0200 -Subject: [PATCH] libapparmor: add missing include for `socklen_t` - -While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't -include the `` header to make its declaration available. -While this works on systems using glibc via transitive includes, it -breaks compilation on musl libc. - -Fix the issue by including the header. - -Signed-off-by: Patrick Steinhardt -[Retrieved from: -https://gitlab.com/apparmor/apparmor/-/commit/47263a3a74d7973e7a54b17db6aa903701468ffd] -Signed-off-by: Fabrice Fontaine ---- - libraries/libapparmor/include/sys/apparmor.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h -index 32892d065..d70eff947 100644 ---- a/libraries/libapparmor/include/sys/apparmor.h -+++ b/libraries/libapparmor/include/sys/apparmor.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - - #ifdef __cplusplus --- -GitLab - diff --git a/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch b/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch deleted file mode 100644 index 0510489d5..000000000 --- a/buildroot/package/libapparmor/3.0.0/0002-parser-Makefile-dont-force-host-cpp-to-detect-reallocarray.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0dbcbee70097ecde66708064ec1dedfa64e581e8 Mon Sep 17 00:00:00 2001 -From: Armin Kuster -Date: Wed, 7 Oct 2020 20:50:38 -0700 -Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray - -In cross build environments, using the hosts cpp gives incorrect -detection of reallocarray. Change cpp to a variable. - -fixes: -parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)': -| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope -| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1); - -Signed-off-by: Armin Kuster -[Retrieved from: -https://gitlab.com/ffontaine/apparmor/-/commit/0dbcbee70097ecde66708064ec1dedfa64e581e8] -Signed-off-by: Fabrice Fontaine ---- - parser/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser/Makefile b/parser/Makefile -index acef3d77a..8250ac451 100644 ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -54,7 +54,7 @@ endif - CPPFLAGS += -D_GNU_SOURCE - - STDLIB_INCLUDE:="\#include " --HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true) -+HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true) - - WARNINGS = -Wall - CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS} --- -GitLab - diff --git a/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch b/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch deleted file mode 100644 index 83981bfec..000000000 --- a/buildroot/package/libapparmor/3.0.0/0003-aa_status-Fix-build-issue-with-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a2a0d14b9c5046b76124c828a53b0e9cbc1bc5c8 Mon Sep 17 00:00:00 2001 -From: Armin Kuster -Date: Wed, 7 Oct 2020 08:27:11 -0700 -Subject: [PATCH] aa_status: Fix build issue with musl - -add limits.h - -aa_status.c:269:22: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'? -| 269 | real_exe = calloc(PATH_MAX + 1, sizeof(char)); - -Signed-off-by: Armin Kuster -[Retrieved from: -https://gitlab.com/apparmor/apparmor/-/commit/a2a0d14b9c5046b76124c828a53b0e9cbc1bc5c8] -Signed-off-by: Fabrice Fontaine ---- - binutils/aa_status.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/binutils/aa_status.c b/binutils/aa_status.c -index 78b034090..41f1954e9 100644 ---- a/binutils/aa_status.c -+++ b/binutils/aa_status.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -GitLab - diff --git a/buildroot/package/libapparmor/libapparmor.hash b/buildroot/package/libapparmor/libapparmor.hash index 0550a1846..37e1ff522 100644 --- a/buildroot/package/libapparmor/libapparmor.hash +++ b/buildroot/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ # From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 66fd751fe51eb427d2aa864ee035b12d01d212fd595579275219b0148c43755e apparmor-3.0.0.tar.gz +sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/buildroot/package/libapparmor/libapparmor.mk b/buildroot/package/libapparmor/libapparmor.mk index 5ece89b08..255432e45 100644 --- a/buildroot/package/libapparmor/libapparmor.mk +++ b/buildroot/package/libapparmor/libapparmor.mk @@ -6,9 +6,9 @@ # When updating the version here, please also update the apparmor package LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).0 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).1 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz -LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION_MAJOR)/+download +LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 LIBAPPARMOR_LICENSE_FILES = LICENSE libraries/libapparmor/COPYING.LGPL diff --git a/buildroot/package/libarchive/libarchive.hash b/buildroot/package/libarchive/libarchive.hash index 066037809..bf0d6e4fd 100644 --- a/buildroot/package/libarchive/libarchive.hash +++ b/buildroot/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39 libarchive-3.4.3.tar.gz +sha256 9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a libarchive-3.5.1.tar.gz # Locally computed: -sha256 e1e3d4ba9d0b0ccba333b5f5539f7c6c9a3ef3d57a96cd165d2c45eaa1cd026d COPYING +sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/buildroot/package/libarchive/libarchive.mk b/buildroot/package/libarchive/libarchive.mk index 708ce637c..9cc69fd45 100644 --- a/buildroot/package/libarchive/libarchive.mk +++ b/buildroot/package/libarchive/libarchive.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.4.3 +LIBARCHIVE_VERSION = 3.5.1 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 LIBARCHIVE_LICENSE_FILES = COPYING +LIBARCHIVE_CPE_ID_VENDOR = libarchive ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) diff --git a/buildroot/package/libass/libass.mk b/buildroot/package/libass/libass.mk index 818bff234..8bdfd9dd4 100644 --- a/buildroot/package/libass/libass.mk +++ b/buildroot/package/libass/libass.mk @@ -12,6 +12,7 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING +LIBASS_CPE_ID_VALID = YES LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ diff --git a/buildroot/package/libassuan/libassuan.hash b/buildroot/package/libassuan/libassuan.hash index bb008d6ed..3506b4f85 100644 --- a/buildroot/package/libassuan/libassuan.hash +++ b/buildroot/package/libassuan/libassuan.hash @@ -1,8 +1,8 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 6d81bf42fa91ed2894df8b65764ce899e39776f8 libassuan-2.5.3.tar.bz2 +sha1 55a35918e95566ef94e8843879a7dd3f87de3781 libassuan-2.5.4.tar.bz2 # Locally calculated after checking signature -# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.3.tar.bz2.sig +# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.4.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 libassuan-2.5.3.tar.bz2 -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0 libassuan-2.5.4.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/libassuan/libassuan.mk b/buildroot/package/libassuan/libassuan.mk index 034a9bfdf..8b618197f 100644 --- a/buildroot/package/libassuan/libassuan.mk +++ b/buildroot/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.3 +LIBASSUAN_VERSION = 2.5.4 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) diff --git a/buildroot/package/libblockdev/libblockdev.hash b/buildroot/package/libblockdev/libblockdev.hash index 1c4b1ec7b..101b99f1a 100644 --- a/buildroot/package/libblockdev/libblockdev.hash +++ b/buildroot/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dc207c70dbef52c818a8abbcb6b8e298a6b63c0b78a5e1f2773b5f7b89300773 libblockdev-2.24.tar.gz +sha256 555aa42a2db39649ad83253bdc902ab5bd63d39c123e0c8055c4de7fe7571668 libblockdev-2.25.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/buildroot/package/libblockdev/libblockdev.mk b/buildroot/package/libblockdev/libblockdev.mk index a38912514..39ae9230d 100644 --- a/buildroot/package/libblockdev/libblockdev.mk +++ b/buildroot/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 2.24 +LIBBLOCKDEV_VERSION = 2.25 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libbluray/libbluray.hash b/buildroot/package/libbluray/libbluray.hash index c92d9f954..430d47748 100644 --- a/buildroot/package/libbluray/libbluray.hash +++ b/buildroot/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.2.0/libbluray-1.2.0.tar.bz2.sha512 -sha512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324 libbluray-1.2.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.2.1/libbluray-1.2.1.tar.bz2.sha512 +sha512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4 libbluray-1.2.1.tar.bz2 # Locally computed -sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING +sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/buildroot/package/libbluray/libbluray.mk b/buildroot/package/libbluray/libbluray.mk index 67ea139d5..36f59190b 100644 --- a/buildroot/package/libbluray/libbluray.mk +++ b/buildroot/package/libbluray/libbluray.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.2.0 +LIBBLURAY_VERSION = 1.2.1 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES LIBBLURAY_LICENSE = LGPL-2.1+ LIBBLURAY_LICENSE_FILES = COPYING +LIBBLURAY_CPE_ID_VENDOR = videolan LIBBLURAY_DEPENDENCIES = host-pkgconf LIBBLURAY_CONF_OPTS = --disable-bdjava-jar diff --git a/buildroot/package/libbroadvoice/libbroadvoice.hash b/buildroot/package/libbroadvoice/libbroadvoice.hash index 6d5afa8db..0a22817e2 100644 --- a/buildroot/package/libbroadvoice/libbroadvoice.hash +++ b/buildroot/package/libbroadvoice/libbroadvoice.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b68c91d5af6e493c3d4fc3be04825e109a7593fe4de8c18ec75546004eeb4749 libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564.tar.gz -sha256 2550586c993ce4a8c23c8b11968ea36192116a896a2504799cc65307d769c094 COPYING +sha256 777e5dccc3d189514b7f8e85b6c941d3b9d16d2d68d72cad055cbdfb571d3681 libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564-br1.tar.gz +sha256 2550586c993ce4a8c23c8b11968ea36192116a896a2504799cc65307d769c094 COPYING diff --git a/buildroot/package/libbsd/Config.in b/buildroot/package/libbsd/Config.in index e54f5e6f2..845a22162 100644 --- a/buildroot/package/libbsd/Config.in +++ b/buildroot/package/libbsd/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS config BR2_PACKAGE_LIBBSD bool "libbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR help @@ -21,6 +22,7 @@ config BR2_PACKAGE_LIBBSD http://libbsd.freedesktop.org/ -comment "libbsd needs a toolchain w/ threads, wchar" +comment "libbsd needs a toolchain w/ dynamic library, threads, wchar" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch b/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch deleted file mode 100644 index 4c9b96020..000000000 --- a/buildroot/package/libbytesize/0001-remove-msgcat-dependency.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ac16b1a905dbdb06ac7bba6ac105686aa7958093 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 24 Jul 2020 11:49:14 -0700 -Subject: [PATCH] remove msgcat dependency - -Gettext-tiny does not include the msgcat utility, which causes issues when -building libbytesize for embedded systems, as many embedded systems do not -build the full gettext, but instead use the gettext-tiny library. - -Because msgcat is not needed to build libbytesize, it's safe to remove the -dependency. - -Upstream-status: pending -https://github.com/storaged-project/libbytesize/pull/76 -Signed-off-by: Adam Duskett ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2ec4062..7d7f218 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,8 +13,7 @@ AC_CONFIG_MACRO_DIR([m4]) - AC_PATH_PROG([XGETTEXT], [xgettext]) - AC_PATH_PROG([MSGFMT], [msgfmt]) - AC_PATH_PROG([MSGMERGE], [msgmerge]) --AC_PATH_PROG([MSGCAT], [msgcat]) --AS_IF([test -z "$XGETTEXT" -o -z "$MSGFMT" -o -z "$MSGMERGE" -o -z "$MSGCAT"], -+AS_IF([test -z "$XGETTEXT" -o -z "$MSGFMT" -o -z "$MSGMERGE"], - [AC_MSG_FAILURE([gettext not found])]) - - # Define this so gettext.h works without requiring the whole gettext macro --- -2.26.2 - diff --git a/buildroot/package/libbytesize/libbytesize.hash b/buildroot/package/libbytesize/libbytesize.hash index 34cb3b210..51fa43aef 100644 --- a/buildroot/package/libbytesize/libbytesize.hash +++ b/buildroot/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c74113fc8cd1a2fbd8870fa0ed7cef2ef24d60ef91e7145fbc041f9aa144479 libbytesize-2.3.tar.gz +sha256 6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda libbytesize-2.5.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/buildroot/package/libbytesize/libbytesize.mk b/buildroot/package/libbytesize/libbytesize.mk index b1309c173..0ba380dc7 100644 --- a/buildroot/package/libbytesize/libbytesize.mk +++ b/buildroot/package/libbytesize/libbytesize.mk @@ -4,15 +4,12 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.3 +LIBBYTESIZE_VERSION = 2.5 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE LIBBYTESIZE_INSTALL_STAGING = YES -# 0001-remove-msgcat-dependency.patch -LIBBYTESIZE_AUTORECONF = YES - LIBBYTESIZE_DEPENDENCIES = \ host-pkgconf \ host-gettext \ diff --git a/buildroot/package/libcamera/libcamera.hash b/buildroot/package/libcamera/libcamera.hash index 41416da71..e2131f01e 100644 --- a/buildroot/package/libcamera/libcamera.hash +++ b/buildroot/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 a7800b54584dee321874610ef70b1b7690c79d8340c5b134ea35176657681e29 libcamera-e59713c68678f3eb6b6ebe97cabdc88c7042567f.tar.gz +sha256 e9c02a370a15188163f247210cdcba4427d5bcf7b681c7fea5cb1dde23f71a15 libcamera-ab72e6641c56e876f91edee57a8969982a3ab9b7-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/buildroot/package/libcamera/libcamera.mk b/buildroot/package/libcamera/libcamera.mk index e6cd71420..391dea756 100644 --- a/buildroot/package/libcamera/libcamera.mk +++ b/buildroot/package/libcamera/libcamera.mk @@ -5,16 +5,18 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = e59713c68678f3eb6b6ebe97cabdc88c7042567f +LIBCAMERA_VERSION = ab72e6641c56e876f91edee57a8969982a3ab9b7 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ + host-python3-jinja2 \ + host-python3-ply \ host-python3-pyyaml \ gnutls LIBCAMERA_CONF_OPTS = \ - -Dandroid=false \ - -Ddocumentation=false \ + -Dandroid=disabled \ + -Ddocumentation=disabled \ -Dtest=false \ -Dwerror=false LIBCAMERA_INSTALL_STAGING = YES @@ -83,4 +85,11 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCAMERA_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) +LIBCAMERA_CONF_OPTS += -Dtracing=enabled +LIBCAMERA_DEPENDENCIES += lttng-libust +else +LIBCAMERA_CONF_OPTS += -Dtracing=disabled +endif + $(eval $(meson-package)) diff --git a/buildroot/package/libcap-ng/libcap-ng.hash b/buildroot/package/libcap-ng/libcap-ng.hash index d52f46608..f775ae6fc 100644 --- a/buildroot/package/libcap-ng/libcap-ng.hash +++ b/buildroot/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f14d23b60ae1465b032e4e8cbd4112006572c69a6017d55d5d3c6aad622a9e21 libcap-ng-0.8.tar.gz +sha256 52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 libcap-ng-0.8.2.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/buildroot/package/libcap-ng/libcap-ng.mk b/buildroot/package/libcap-ng/libcap-ng.mk index 03949d740..d4c9336e2 100644 --- a/buildroot/package/libcap-ng/libcap-ng.mk +++ b/buildroot/package/libcap-ng/libcap-ng.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.8 +LIBCAP_NG_VERSION = 0.8.2 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB +LIBCAP_NG_CPE_ID_VALID = YES LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no diff --git a/buildroot/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch b/buildroot/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch deleted file mode 100644 index 856b7b1bb..000000000 --- a/buildroot/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 9b1c003748d4df78416d50fce139f0875224440b Mon Sep 17 00:00:00 2001 -From: "Andrew G. Morgan" -Date: Tue, 10 Nov 2020 20:47:45 -0800 -Subject: [PATCH] Migrate building progs/tcapsh-static to sudotest - -This addresses: - - https://bugzilla.kernel.org/show_bug.cgi?id=210135 - https://bugs.busybox.net/show_bug.cgi?id=13296 - -Some notes on expectations: - -When building DYNAMIC=yes folk want to avoid depending on a -static libc.a file in their build tree. The best we can do is -to move building static test tool objects to sudotest. - - make DYNAMIC=yes clean all test - -will build the progs binaries and run the tests with all dynamic -linking. It will, however, build the libcap.a etc libraries too -even though they are not used for linking. - - make DYNAMIC=no clean all test - -will build the progs binaries and run the tests with all static -linking. It will, however, build the libcap.so etc libraries too -even though they are not used for linking. - - make SHARED=no clean all test - -will build and link progs and test binaries statically against -libcap.a. No shared libraries (libcap.so etc) will be built. - -In all cases, whether linked against or not, libcap.a is built. - -Signed-off-by: Andrew G. Morgan -[Patch taken from upstream: -https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=9b1c003748d4df78416d50fce139f0875224440b] -Signed-off-by: Heiko Thiery ---- - tests/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/Makefile b/tests/Makefile -index fc39fee..1e7039d 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -17,13 +17,13 @@ install: all - - ifeq ($(DYNAMIC),yes) - LINKEXTRA=-Wl,-rpath,../libcap --DEPS=../libcap/libcap.so ../progs/tcapsh-static -+DEPS=../libcap/libcap.so - ifeq ($(PTHREADS),yes) - DEPS += ../libcap/libpsx.so - endif - else - LDFLAGS += --static --DEPS=../libcap/libcap.a ../progs/tcapsh-static -+DEPS=../libcap/libcap.a - ifeq ($(PTHREADS),yes) - DEPS += ../libcap/libpsx.a - endif -@@ -71,10 +71,10 @@ libcap_psx_test: libcap_psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged --run_libcap_launch_test: libcap_launch_test noop -+run_libcap_launch_test: libcap_launch_test noop ../progs/tcapsh-static - sudo ./libcap_launch_test - --run_libcap_psx_launch_test: libcap_psx_launch_test -+run_libcap_psx_launch_test: libcap_psx_launch_test ../progs/tcapsh-static - sudo ./libcap_psx_launch_test - - libcap_launch_test: libcap_launch_test.c $(DEPS) --- -2.20.1 - diff --git a/buildroot/package/libcap/Config.in b/buildroot/package/libcap/Config.in index 1fb2e7cae..e1971b7bb 100644 --- a/buildroot/package/libcap/Config.in +++ b/buildroot/package/libcap/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBCAP capabilities are a partitioning of the all powerful root privilege into a set of distinct privileges. - http://sites.google.com/site/fullycapable/ + https://sites.google.com/site/fullycapable/ if BR2_PACKAGE_LIBCAP diff --git a/buildroot/package/libcap/libcap.hash b/buildroot/package/libcap/libcap.hash index 32986a41d..7499f2468 100644 --- a/buildroot/package/libcap/libcap.hash +++ b/buildroot/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286 libcap-2.45.tar.xz +sha256 4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2 libcap-2.48.tar.xz # Hash for license file: sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License diff --git a/buildroot/package/libcap/libcap.mk b/buildroot/package/libcap/libcap.mk index 7bb8f5767..d3a069e82 100644 --- a/buildroot/package/libcap/libcap.mk +++ b/buildroot/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.45 +LIBCAP_VERSION = 2.48 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause diff --git a/buildroot/package/libcdio/libcdio.mk b/buildroot/package/libcdio/libcdio.mk index 4bf55d334..df26d9a7a 100644 --- a/buildroot/package/libcdio/libcdio.mk +++ b/buildroot/package/libcdio/libcdio.mk @@ -10,6 +10,7 @@ LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_INSTALL_STAGING = YES LIBCDIO_LICENSE = GPL-3.0+ LIBCDIO_LICENSE_FILES = COPYING +LIBCDIO_CPE_ID_VENDOR = gnu LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb ifeq ($(BR2_ENABLE_LOCALE),) diff --git a/buildroot/package/libclc/libclc.hash b/buildroot/package/libclc/libclc.hash index 29728fbc7..2af64bc8e 100644 --- a/buildroot/package/libclc/libclc.hash +++ b/buildroot/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5ea2cd2fa7fa1474d3e0580064e7a22014ef8d64dbbd7c546277fa4beb5acf86 libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060.tar.gz -sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT +sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz +sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/buildroot/package/libcli/Config.in b/buildroot/package/libcli/Config.in index 3b625c364..b2829cad3 100644 --- a/buildroot/package/libcli/Config.in +++ b/buildroot/package/libcli/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_LIBCLI bool "libcli" help Libcli provides a shared library for including a Cisco-like - command- line interface into other software. It's a telnet + command-line interface into other software. It's a telnet interface which supports command-line editing, history, authentication and callbacks for a user-definable function tree. - http://sites.dparrish.com/libcli + https://github.com/dparrish/libcli diff --git a/buildroot/package/libcli/libcli.hash b/buildroot/package/libcli/libcli.hash index ce4373e92..a17a176fe 100644 --- a/buildroot/package/libcli/libcli.hash +++ b/buildroot/package/libcli/libcli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 190f0a315dbc291400e9d33f701f9a66894102a6c29e1aebb63f01239bb164d0 libcli-1.10.2.tar.gz -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING +sha256 43efade6f3deb621e1e226b7854274a869fca57e12e74e61c5496d5dea7c445d libcli-1.10.4.tar.gz +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/buildroot/package/libcli/libcli.mk b/buildroot/package/libcli/libcli.mk index bc4608254..2dedc9d5d 100644 --- a/buildroot/package/libcli/libcli.mk +++ b/buildroot/package/libcli/libcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCLI_VERSION = 1.10.2 +LIBCLI_VERSION = 1.10.4 LIBCLI_SITE = $(call github,dparrish,libcli,V$(LIBCLI_VERSION)) LIBCLI_LICENSE = LGPL-2.1 LIBCLI_LICENSE_FILES = COPYING diff --git a/buildroot/package/libcoap/libcoap.hash b/buildroot/package/libcoap/libcoap.hash index 579a052c8..347200622 100644 --- a/buildroot/package/libcoap/libcoap.hash +++ b/buildroot/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271 libcoap-4.2.0.tar.gz -sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 3821a9f881344ad53c543c84675ad4b6a29e913ca500cfa160ab52e4e6965b15 LICENSE +sha256 29a0394a265d3febee41e5e2dc03d34292a0aede37f5f80334e529ac0dab2321 libcoap-4.2.1.tar.gz +sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING +sha256 c51e85271aca3fbdd79bb4ee45dcfd854724538dad83b70afbbdfc62415e3e7f LICENSE diff --git a/buildroot/package/libcoap/libcoap.mk b/buildroot/package/libcoap/libcoap.mk index bea0e6888..9a5e04d4f 100644 --- a/buildroot/package/libcoap/libcoap.mk +++ b/buildroot/package/libcoap/libcoap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCOAP_VERSION = 4.2.0 +LIBCOAP_VERSION = 4.2.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.hash b/buildroot/package/libcpprestsdk/libcpprestsdk.hash index e76522f6e..8e398d0c5 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.hash +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681 libcpprestsdk-2.10.16.tar.gz +sha256 6bd74a637ff182144b6a4271227ea8b6b3ea92389f88b25b215e6f94fd4d41cb libcpprestsdk-2.10.18.tar.gz sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.mk b/buildroot/package/libcpprestsdk/libcpprestsdk.mk index d8525cfe1..68d4cf68c 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.mk +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCPPRESTSDK_VERSION = 2.10.16 -LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION)) +LIBCPPRESTSDK_VERSION = 2.10.18 +LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION)) LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 8e851bb90..368b8f67f 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.74.0.tar.xz.asc +# https://curl.haxx.se/download/curl-7.75.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b curl-7.74.0.tar.xz -sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING +sha256 fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675 curl-7.75.0.tar.xz +sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index 9484f41ff..6a9a5a3d3 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.74.0 +LIBCURL_VERSION = 7.75.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -12,6 +12,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING +LIBCURL_CPE_ID_VENDOR = haxx +LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM support because it uses fork(), which doesn't work diff --git a/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch b/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch deleted file mode 100644 index ba84114f1..000000000 --- a/buildroot/package/libdrm/0003-xf86drm.c-fix-build-failure.patch +++ /dev/null @@ -1,84 +0,0 @@ -From c7d89412884de2dbfa543720d185027377e62f21 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Fri, 5 Jun 2020 23:46:52 +0200 -Subject: [PATCH] xf86drm.c: fix build failure - -./xf86drm.c: In function 'drmNodeIsDRM': -../xf86drm.c:2825:7: error: "__FreeBSD__" is not defined [-Werror=undef] - #elif __FreeBSD__ - ^ -../xf86drm.c: In function 'drmGetMinorNameForFD': -../xf86drm.c:2938:7: error: "__FreeBSD__" is not defined [-Werror=undef] - #elif __FreeBSD__ - ^ -../xf86drm.c: In function 'drmParsePciBusInfo': -../xf86drm.c:3258:7: error: "__FreeBSD__" is not defined [-Werror=undef] - #elif __FreeBSD__ - ^ -../xf86drm.c: In function 'drmParsePciDeviceInfo': -../xf86drm.c:3427:7: error: "__FreeBSD__" is not defined [-Werror=undef] - #elif __FreeBSD__ - ^ -../xf86drm.c: In function 'drmGetDeviceNameFromFd2': -../xf86drm.c:4305:7: error: "__FreeBSD__" is not defined [-Werror=undef] - #elif __FreeBSD__ - ^ - -Signed-off-by: Heiko Thiery -[A merge-request with this fix is opened at https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/75] ---- - xf86drm.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xf86drm.c b/xf86drm.c -index 07a18c44..50a6f092 100644 ---- a/xf86drm.c -+++ b/xf86drm.c -@@ -2822,7 +2822,7 @@ static bool drmNodeIsDRM(int maj, int min) - snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm", - maj, min); - return stat(path, &sbuf) == 0; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) - char name[SPECNAMELEN]; - - if (!devname_r(makedev(maj, min), S_IFCHR, name, sizeof(name))) -@@ -2935,7 +2935,7 @@ static char *drmGetMinorNameForFD(int fd, int type) - - closedir(sysdir); - return NULL; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) - struct stat sbuf; - char dname[SPECNAMELEN]; - const char *mname; -@@ -3255,7 +3255,7 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) - info->func = pinfo.func; - - return 0; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) - return get_sysctl_pci_bus_info(maj, min, info); - #else - #warning "Missing implementation of drmParsePciBusInfo" -@@ -3424,7 +3424,7 @@ static int drmParsePciDeviceInfo(int maj, int min, - device->subdevice_id = pinfo.subdevice_id; - - return 0; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) - drmPciBusInfo info; - struct pci_conf_io pc; - struct pci_match_conf patterns[1]; -@@ -4302,7 +4302,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd) - free(value); - - return strdup(path); --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) - return drmGetDeviceNameFromFd(fd); - #else - struct stat sbuf; --- -2.20.1 - diff --git a/buildroot/package/libdrm/libdrm.hash b/buildroot/package/libdrm/libdrm.hash index 72330165d..48f6b6948 100644 --- a/buildroot/package/libdrm/libdrm.hash +++ b/buildroot/package/libdrm/libdrm.hash @@ -1,3 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html -sha256 8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b libdrm-2.4.102.tar.xz -sha512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2021-January/293654.html +sha256 d66ad8b5c2441015ac1333e40137bb803c3bde3612ff040286fcc12158ea1bcb libdrm-2.4.104.tar.xz +sha512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e libdrm-2.4.104.tar.xz + +# Hash for license file +sha256 2ece103921b7b5619198b9572fb9242db7bbfa6d3b33f9f93f22e1fb738ed8ac xf86drm.c diff --git a/buildroot/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk index 9348b8329..25f848478 100644 --- a/buildroot/package/libdrm/libdrm.mk +++ b/buildroot/package/libdrm/libdrm.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.102 +LIBDRM_VERSION = 2.4.104 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT +LIBDRM_LICENSE_FILES = xf86drm.c LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ diff --git a/buildroot/package/libdvbsi/libdvbsi.hash b/buildroot/package/libdvbsi/libdvbsi.hash index 184da5286..5f731a190 100644 --- a/buildroot/package/libdvbsi/libdvbsi.hash +++ b/buildroot/package/libdvbsi/libdvbsi.hash @@ -1,8 +1,3 @@ -# From http://www.saftware.de/libdvbsi++/libdvbsi++-0.3.8.tar.bz2.md5 -md5 c8e6ef55ef4b96dacdee250779219d2a libdvbsi++-0.3.8.tar.bz2 - # Locally calculated -sha256 a5b3fa767aa45267178c169268df886b3e79431f335a24d779edf610e8372f89 libdvbsi++-0.3.8.tar.bz2 - -# Hash for license file: -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 a57949b842d94efedd895f2bd8e483c9f258e698092e35f1c3fdccb45b790953 libdvbsi++-0.3.9.tar.bz2 +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libdvbsi/libdvbsi.mk b/buildroot/package/libdvbsi/libdvbsi.mk index d1646c0ef..65191b81a 100644 --- a/buildroot/package/libdvbsi/libdvbsi.mk +++ b/buildroot/package/libdvbsi/libdvbsi.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBDVBSI_VERSION = 0.3.8 +LIBDVBSI_VERSION = 0.3.9 LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 -LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++ +LIBDVBSI_SITE = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VERSION) LIBDVBSI_INSTALL_STAGING = YES LIBDVBSI_LICENSE = LGPL-2.1 LIBDVBSI_LICENSE_FILES = COPYING diff --git a/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch b/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch deleted file mode 100644 index b69455bd7..000000000 --- a/buildroot/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001 -From: Aymeric Moizard -Date: Fri, 13 Mar 2020 16:34:41 +0100 -Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll - implementation - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f] ---- - src/eXconf.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/eXconf.c b/src/eXconf.c -index baf90be..6165eb3 100644 ---- a/src/eXconf.c -+++ b/src/eXconf.c -@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext) - } - - if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) { -+#ifndef OSIP_MONOTHREAD - struct epoll_event ev; -+#endif - excontext->epfdctl = epoll_create (1); - if (excontext->epfdctl < 0) { - return OSIP_UNDEFINED_ERROR; - } - -+#ifndef OSIP_MONOTHREAD - memset(&ev, 0, sizeof(struct epoll_event)); - ev.events = EPOLLIN; - ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event); -@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext) - _eXosip_closesocket (excontext->epfdctl); - return OSIP_UNDEFINED_ERROR; - } -+#endif - } - #endif - --- -cgit v1.2.1 - diff --git a/buildroot/package/libeXosip2/libeXosip2.hash b/buildroot/package/libeXosip2/libeXosip2.hash index a7d3c56d0..53e27e929 100644 --- a/buildroot/package/libeXosip2/libeXosip2.hash +++ b/buildroot/package/libeXosip2/libeXosip2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 e3ae88df8573c9e08dbc24fe6195a118845e845109a8e291c91ecd6a2a3b7225 libexosip2-5.2.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/libeXosip2/libeXosip2.mk b/buildroot/package/libeXosip2/libeXosip2.mk index 4bd8922b4..dba2b63a0 100644 --- a/buildroot/package/libeXosip2/libeXosip2.mk +++ b/buildroot/package/libeXosip2/libeXosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEXOSIP2_VERSION = 5.1.1 +LIBEXOSIP2_VERSION = 5.2.0 # Since version 5.0, letter 'X' in library's name is in lower case LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip diff --git a/buildroot/package/libebml/libebml.mk b/buildroot/package/libebml/libebml.mk index 911093f5c..7ae31d3e2 100644 --- a/buildroot/package/libebml/libebml.mk +++ b/buildroot/package/libebml/libebml.mk @@ -10,5 +10,6 @@ LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES LIBEBML_LICENSE = LGPL-2.1+ LIBEBML_LICENSE_FILES = LICENSE.LGPL +LIBEBML_CPE_ID_VENDOR = matroska $(eval $(cmake-package)) diff --git a/buildroot/package/libedit/libedit.hash b/buildroot/package/libedit/libedit.hash index 7b84909d8..d405e47b4 100644 --- a/buildroot/package/libedit/libedit.hash +++ b/buildroot/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae libedit-20190324-3.1.tar.gz -sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING +sha256 dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071 libedit-20191231-3.1.tar.gz +sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/buildroot/package/libedit/libedit.mk b/buildroot/package/libedit/libedit.mk index 0a9b28afa..cb18b97f6 100644 --- a/buildroot/package/libedit/libedit.mk +++ b/buildroot/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20190324-3.1 +LIBEDIT_VERSION = 20191231-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses diff --git a/buildroot/package/libepoxy/libepoxy.hash b/buildroot/package/libepoxy/libepoxy.hash index a37e3949a..79876ad01 100644 --- a/buildroot/package/libepoxy/libepoxy.hash +++ b/buildroot/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.4.sha256sum -sha256 0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2 libepoxy-1.5.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.5.sha256sum +sha256 261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556 libepoxy-1.5.5.tar.xz # Hashes for license files: sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/buildroot/package/libepoxy/libepoxy.mk b/buildroot/package/libepoxy/libepoxy.mk index efc23a763..bb578fb02 100644 --- a/buildroot/package/libepoxy/libepoxy.mk +++ b/buildroot/package/libepoxy/libepoxy.mk @@ -5,7 +5,7 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).4 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).5 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/buildroot/package/liberation/liberation.hash b/buildroot/package/liberation/liberation.hash index f8b0bdac5..6606142d8 100644 --- a/buildroot/package/liberation/liberation.hash +++ b/buildroot/package/liberation/liberation.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8ee2c16fe0f055e60dd8375449aff72d25dd623b9cc6f24790ce9d2e91446fca liberation-fonts-ttf-2.1.1.tar.gz +sha256 14694930f28391675008c67b18889d1a7dfea74b16adf50394f8057b57eaf8e0 liberation-fonts-ttf-2.1.2.tar.gz sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE diff --git a/buildroot/package/liberation/liberation.mk b/buildroot/package/liberation/liberation.mk index 061830a92..522a038dd 100644 --- a/buildroot/package/liberation/liberation.mk +++ b/buildroot/package/liberation/liberation.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBERATION_VERSION = 2.1.1 -LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/4743886 +LIBERATION_VERSION = 2.1.2 +LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/5722233 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation LIBERATION_LICENSE = OFL-1.1 diff --git a/buildroot/package/libesmtp/libesmtp.mk b/buildroot/package/libesmtp/libesmtp.mk index 9c336793a..ad896fc94 100644 --- a/buildroot/package/libesmtp/libesmtp.mk +++ b/buildroot/package/libesmtp/libesmtp.mk @@ -12,5 +12,6 @@ LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB +LIBESMTP_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libestr/libestr.mk b/buildroot/package/libestr/libestr.mk index 30960f725..6ce22efae 100644 --- a/buildroot/package/libestr/libestr.mk +++ b/buildroot/package/libestr/libestr.mk @@ -8,6 +8,7 @@ LIBESTR_VERSION = 0.1.11 LIBESTR_SITE = http://libestr.adiscon.com/files/download LIBESTR_LICENSE = LGPL-2.1+ LIBESTR_LICENSE_FILES = COPYING +LIBESTR_CPE_ID_VENDOR = adiscon LIBESTR_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libevdev/libevdev.hash b/buildroot/package/libevdev/libevdev.hash index 3003dc33f..584a9941c 100644 --- a/buildroot/package/libevdev/libevdev.hash +++ b/buildroot/package/libevdev/libevdev.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2020-October/001545.html -md5 c6239ef0d61c4f4911f25bb8426a0b82 libevdev-1.10.0.tar.xz -sha1 3eedd43652a238f687595ffd722fd3bb94359216 libevdev-1.10.0.tar.xz -sha256 3522c26e2c148be0ad68ce26fbced408a4185dea90bfe8079dc82b8ace962d4a libevdev-1.10.0.tar.xz -sha512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f libevdev-1.10.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2021-February/001557.html +sha256 63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0 libevdev-1.11.0.tar.xz +sha512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d libevdev-1.11.0.tar.xz # Hash for license files: -sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING +sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/buildroot/package/libevdev/libevdev.mk b/buildroot/package/libevdev/libevdev.mk index 0453028f2..f6172809f 100644 --- a/buildroot/package/libevdev/libevdev.mk +++ b/buildroot/package/libevdev/libevdev.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.10.0 +LIBEVDEV_VERSION = 1.11.0 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz -LIBEVDEV_LICENSE = X11 +LIBEVDEV_LICENSE = MIT LIBEVDEV_LICENSE_FILES = COPYING LIBEVDEV_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) diff --git a/buildroot/package/libexif/libexif.mk b/buildroot/package/libexif/libexif.mk index 594e8855c..9d29cbf59 100644 --- a/buildroot/package/libexif/libexif.mk +++ b/buildroot/package/libexif/libexif.mk @@ -12,6 +12,7 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING +LIBEXIF_CPE_ID_VALID = YES # 0001-fixed-another-unsigned-integer-overflow.patch LIBEXIF_IGNORE_CVES += CVE-2020-0198 # 0002-fixed-a-incorrect-overflow-check.patch diff --git a/buildroot/package/libfastjson/libfastjson.hash b/buildroot/package/libfastjson/libfastjson.hash index 07ea88f11..218a738b3 100644 --- a/buildroot/package/libfastjson/libfastjson.hash +++ b/buildroot/package/libfastjson/libfastjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e49057b26a5a9e3c6623e024f95f9fd9a14b571b9150aeb89d6d475fc3633e3 libfastjson-0.99.8.tar.gz +sha256 881f954633aa76931e4c756ece0bda6fd8a673c6e66955a3db3b2bb9d6bbff72 libfastjson-0.99.9.tar.gz sha256 b29370bbfa98816e1fca0901f18149d920736771bfd68b4ee0eb00c78b38d245 COPYING diff --git a/buildroot/package/libfastjson/libfastjson.mk b/buildroot/package/libfastjson/libfastjson.mk index ecca72f56..7ab978dc6 100644 --- a/buildroot/package/libfastjson/libfastjson.mk +++ b/buildroot/package/libfastjson/libfastjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFASTJSON_VERSION = 0.99.8 +LIBFASTJSON_VERSION = 0.99.9 LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,v$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' @@ -12,5 +12,6 @@ LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBFASTJSON_AUTORECONF = YES LIBFASTJSON_LICENSE = MIT LIBFASTJSON_LICENSE_FILES = COPYING +LIBFASTJSON_CPE_ID_VENDOR = rsyslog $(eval $(autotools-package)) diff --git a/buildroot/package/libfcgi/libfcgi.mk b/buildroot/package/libfcgi/libfcgi.mk index c158df239..ee61c22c4 100644 --- a/buildroot/package/libfcgi/libfcgi.mk +++ b/buildroot/package/libfcgi/libfcgi.mk @@ -8,6 +8,8 @@ LIBFCGI_VERSION = 2.4.2 LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS +LIBFCGI_CPE_ID_VENDOR = fastcgi +LIBFCGI_CPE_ID_PRODUCT = fcgi LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES diff --git a/buildroot/package/libffi/libffi.mk b/buildroot/package/libffi/libffi.mk index 722a03dca..f8b656834 100644 --- a/buildroot/package/libffi/libffi.mk +++ b/buildroot/package/libffi/libffi.mk @@ -6,6 +6,8 @@ LIBFFI_VERSION = 3.3 LIBFFI_SITE = $(call github,libffi,libffi,v$(LIBFFI_VERSION)) +LIBFFI_CPE_ID_VERSION = 3.3 +LIBFFI_CPE_ID_UPDATE = rc0 LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES diff --git a/buildroot/package/libftdi/Config.in b/buildroot/package/libftdi/Config.in index 23dae1be1..fdeac28a6 100644 --- a/buildroot/package/libftdi/Config.in +++ b/buildroot/package/libftdi/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBFTDI bool "libftdi" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -23,5 +24,6 @@ comment "libftdi C++ bindings need a toolchain w/ wchar, C++" endif # BR2_PACKAGE_LIBFTDI -comment "libftdi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libftdi needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libftdi1/Config.in b/buildroot/package/libftdi1/Config.in index d47321345..2d3257356 100644 --- a/buildroot/package/libftdi1/Config.in +++ b/buildroot/package/libftdi1/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBFTDI1 bool "libftdi1" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Userspace access to FTDI USB interface chips (version 1.x) @@ -33,5 +34,6 @@ config BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM endif # BR2_PACKAGE_LIBFTDI1 -comment "libftdi1 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libftdi1 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch b/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch deleted file mode 100644 index 79b2f8c65..000000000 --- a/buildroot/package/libfuse3/0001-remove-old-uclibc-hack.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4ebb018e78b53a8afe0368e7cd7a17a67c52e3df Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Wed, 28 Oct 2020 19:20:35 -0700 -Subject: [PATCH] remove old uclibc hack - -This actually prevents sshfs linking to it as fuse_new becomes -unavailable. - -According to the git history, this seems to predate 2006. - -Signed-off-by: Rosen Penev -[Retrieved from: -https://github.com/libfuse/libfuse/commit/4ebb018e78b53a8afe0368e7cd7a17a67c52e3df] -Signed-off-by: Fabrice Fontaine ---- - lib/fuse_misc.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h -index a8b59617..f384aeab 100644 ---- a/lib/fuse_misc.h -+++ b/lib/fuse_misc.h -@@ -10,10 +10,9 @@ - - /* - Versioned symbols cannot be used in some cases because it -- - confuse the dynamic linker in uClibc - - not supported on MacOSX (in MachO binary format) - */ --#if (!defined(__UCLIBC__) && !defined(__APPLE__)) -+#ifndef __APPLE__ - # if HAVE_SYMVER_ATTRIBUTE - # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2))) - # else diff --git a/buildroot/package/libfuse3/libfuse3.hash b/buildroot/package/libfuse3/libfuse3.hash index 4e03ba4a8..9b2f8cc14 100644 --- a/buildroot/package/libfuse3/libfuse3.hash +++ b/buildroot/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 52bbb52035f7eeaa54d139e21805d357f848f6e02ac956831d04988165a92c7b libfuse3-3.10.0.tar.gz +sha256 a16f93cc083264afd0d2958a0dc88f24c6c5d40a9f3842c645b1909e13edb75f libfuse3-3.10.2.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/buildroot/package/libfuse3/libfuse3.mk b/buildroot/package/libfuse3/libfuse3.mk index 0a896d8da..f805eda50 100644 --- a/buildroot/package/libfuse3/libfuse3.mk +++ b/buildroot/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.10.0 +LIBFUSE3_VERSION = 3.10.2 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libg7221/libg7221.hash b/buildroot/package/libg7221/libg7221.hash index 09023f954..b2174e8b4 100644 --- a/buildroot/package/libg7221/libg7221.hash +++ b/buildroot/package/libg7221/libg7221.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 330dafa58d37a585a866167bc33f8fbe06dbcfc9a69cad43fab0b6702ebf2393 libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34.tar.gz -sha256 26cc5f718279b45dbe34e25a2d29b2c8ca487bd9ab11b2d68c9318ff59d5c645 COPYING +sha256 7f00d6a4f435a91ab3bc96e6c95aa1334bd416f80d98843b4f178067239ee832 libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34-br1.tar.gz +sha256 26cc5f718279b45dbe34e25a2d29b2c8ca487bd9ab11b2d68c9318ff59d5c645 COPYING diff --git a/buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch b/buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch deleted file mode 100644 index 032cb7c84..000000000 --- a/buildroot/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7fec3ac22efb86fce90a9edc5696e16ee88a65c7 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 24 Oct 2018 14:29:45 +0900 -Subject: [PATCH] build: Don't default to underscore=yes for cross-build. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* acinclude.m4: Don't set ac_cv_sys_symbol_underscore -for cross build. - --- - -It made sense in the past when cross compile were basically for a.out -system, but nowadays, it's better not to assume that. - -Fetched from: 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad - -Signed-off-by: NIIBE Yutaka -Signed-off-by: Jörg Krause ---- - acinclude.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index fc208c53..6f7789d0 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -111,14 +111,10 @@ case "${host}" in - ac_cv_sys_symbol_underscore=yes - ;; - *) -- if test "$cross_compiling" = yes; then -- if test "x$ac_cv_sys_symbol_underscore" = x ; then -- ac_cv_sys_symbol_underscore=yes -- fi -- else -+ if test "$cross_compiling" != yes; then - tmp_do_check="yes" - fi -- ;; -+ ;; - esac - if test "$tmp_do_check" = "yes"; then - AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) --- -2.22.0 - diff --git a/buildroot/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch b/buildroot/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch similarity index 100% rename from buildroot/package/libgcrypt/0002-configure.ac-add-an-option-to-disable-tests.patch rename to buildroot/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch diff --git a/buildroot/package/libgcrypt/libgcrypt.hash b/buildroot/package/libgcrypt/libgcrypt.hash index c8aae17c1..c9a8bac9c 100644 --- a/buildroot/package/libgcrypt/libgcrypt.hash +++ b/buildroot/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2020q3/000445.html -sha1 406b02873833427898d16bcc8483bc5c91c73d4a libgcrypt-1.8.6.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 a15ce7355b028f28a33428eaa0147154861b29d4 libgcrypt-1.9.1.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.1.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975 libgcrypt-1.8.6.tar.bz2 +sha256 c5a67a8b9b2bd370fb415ed1ee31c7172e5683076493cf4a3678a0fbdf0265d9 libgcrypt-1.9.1.tar.bz2 sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/buildroot/package/libgcrypt/libgcrypt.mk b/buildroot/package/libgcrypt/libgcrypt.mk index b2c1ea3cb..7c105058a 100644 --- a/buildroot/package/libgcrypt/libgcrypt.mk +++ b/buildroot/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.8.6 +LIBGCRYPT_VERSION = 1.9.1 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB @@ -12,9 +12,9 @@ LIBGCRYPT_SITE = https://gnupg.org/ftp/gcrypt/libgcrypt LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config +LIBGCRYPT_CPE_ID_VENDOR = gnupg -# Patching acinclude.m4 in 0001 -# Patching configure.ac and Makefile.am in 0002 +# Patching configure.ac and Makefile.am in 0001 LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --disable-tests \ @@ -30,11 +30,4 @@ ifeq ($(BR2_arm),y) LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" endif -# Tests use fork() -define LIBGCRYPT_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef - -LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS - $(eval $(autotools-package)) diff --git a/buildroot/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch b/buildroot/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch new file mode 100644 index 000000000..94748dcdb --- /dev/null +++ b/buildroot/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch @@ -0,0 +1,37 @@ +From 16848d6da27140caf922f71a233f96a508fb061e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 24 Jan 2021 12:38:37 +0100 +Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libgeos/geos/pull/395] +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8b39bac..8ca6b829 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,6 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON) + set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)") + + ## GEOS custom variables ++option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON) + cmake_dependent_option(GEOS_BUILD_DEVELOPER + "Build with compilation flags useful for development" ON + "GEOS_BUILD_FROM_GIT" OFF) +@@ -292,7 +293,9 @@ endif() + #----------------------------------------------------------------------------- + # Benchmarks + #----------------------------------------------------------------------------- +-add_subdirectory(benchmarks) ++if(BUILD_BENCHMARKS) ++ add_subdirectory(benchmarks) ++endif() + + #----------------------------------------------------------------------------- + # Utils +-- +2.29.2 + diff --git a/buildroot/package/libgeos/Config.in b/buildroot/package/libgeos/Config.in new file mode 100644 index 000000000..9f02c8b13 --- /dev/null +++ b/buildroot/package/libgeos/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBGEOS + bool "libgeos" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + help + GEOS (Geometry Engine - Open Source) is a C++ port of the + JTS Topology Suite (JTS). It aims to contain the complete + functionality of JTS in C++. This includes all the OpenGIS + Simple Features for SQL spatial predicate functions and + spatial operators, as well as specific JTS enhanced functions. + + https://trac.osgeo.org/geos + +comment "libgeos needs a toolchain w/ C++, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/buildroot/package/libgeos/libgeos.hash b/buildroot/package/libgeos/libgeos.hash new file mode 100644 index 000000000..5b5e44c7c --- /dev/null +++ b/buildroot/package/libgeos/libgeos.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269 geos-3.9.0.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libgeos/libgeos.mk b/buildroot/package/libgeos/libgeos.mk new file mode 100644 index 000000000..a355732af --- /dev/null +++ b/buildroot/package/libgeos/libgeos.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# libgeos +# +################################################################################ + +LIBGEOS_VERSION = 3.9.0 +LIBGEOS_SITE = http://download.osgeo.org/geos +LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 +LIBGEOS_LICENSE = LGPL-2.1 +LIBGEOS_LICENSE_FILES = COPYING +LIBGEOS_INSTALL_STAGING = YES +LIBGEOS_CONFIG_SCRIPTS = geos-config +LIBGEOS_CONF_OPTS = -DBUILD_BENCHMARKS=OFF + +LIBGEOS_CXXFLAGS = $(TARGET_CXXCFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +LIBGEOS_CXXFLAGS += -O0 +endif + +ifeq ($(BR2_arm)$(BR2_armeb),y) +LIBGEOS_CONF_OPTS += -DDISABLE_GEOS_INLINE=ON +endif + +LIBGEOS_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(LIBGEOS_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/buildroot/package/libgit2/libgit2.mk b/buildroot/package/libgit2/libgit2.mk index 30e6f2488..14709a093 100644 --- a/buildroot/package/libgit2/libgit2.mk +++ b/buildroot/package/libgit2/libgit2.mk @@ -8,6 +8,7 @@ LIBGIT2_VERSION = 1.1.0 LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION) LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) LIBGIT2_LICENSE_FILES = COPYING +LIBGIT2_CPE_ID_VALID = YES LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ diff --git a/buildroot/package/libglew/Config.in b/buildroot/package/libglew/Config.in index 099c9461a..1d28c018b 100644 --- a/buildroot/package/libglew/Config.in +++ b/buildroot/package/libglew/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_LIBGLEW and extension functionality is exposed in a single header file. - http://glew.sourceforge.net + https://github.com/nigels-com/glew comment "libglew depends on X.org and needs an OpenGL backend" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/libglew/libglew.hash b/buildroot/package/libglew/libglew.hash index 2e1b1f3c3..29e63fa30 100644 --- a/buildroot/package/libglew/libglew.hash +++ b/buildroot/package/libglew/libglew.hash @@ -1,6 +1,3 @@ -# From https://sourceforge.net/projects/glew/files/glew/2.1.0/ -sha1 18eca05460d0b61709fc115e632b6fe320718b44 glew-2.1.0.tgz -md5 b2ab12331033ddfaa50dc39345343980 glew-2.1.0.tgz # Locally computed: -sha256 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 glew-2.1.0.tgz -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt +sha256 d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1 glew-2.2.0.tgz +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt diff --git a/buildroot/package/libglew/libglew.mk b/buildroot/package/libglew/libglew.mk index fa2629256..c9c49e698 100644 --- a/buildroot/package/libglew/libglew.mk +++ b/buildroot/package/libglew/libglew.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGLEW_VERSION = 2.1.0 +LIBGLEW_VERSION = 2.2.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz -LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) +LIBGLEW_SITE = https://github.com/nigels-com/glew/releases/download/glew-$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3-Clause, MIT LIBGLEW_LICENSE_FILES = LICENSE.txt LIBGLEW_INSTALL_STAGING = YES diff --git a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch index 7e447a9ef..25cb23c23 100644 --- a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch +++ b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.64.4', + version : '2.66.7', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/buildroot/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash index 55f0bb167..7886bb5c5 100644 --- a/buildroot/package/libglib2/libglib2.hash +++ b/buildroot/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.64/glib-2.64.4.sha256sum -sha256 f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50 glib-2.64.4.tar.xz +# https://download.gnome.org/sources/glib/2.66/glib-2.66.7.sha256sum +sha256 09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502 glib-2.66.7.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk index 6e9dbd7b2..ffbb4c96b 100644 --- a/buildroot/package/libglib2/libglib2.mk +++ b/buildroot/package/libglib2/libglib2.mk @@ -4,12 +4,14 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.64 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.66 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).7 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING +LIBGLIB2_CPE_ID_VENDOR = gnome +LIBGLIB2_CPE_ID_PRODUCT = glib LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_CFLAGS = $(TARGET_CFLAGS) diff --git a/buildroot/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch b/buildroot/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch new file mode 100644 index 000000000..5f5147e0d --- /dev/null +++ b/buildroot/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch @@ -0,0 +1,54 @@ +From 77c89f62f106d88ef2b5963f4a13755c337c793d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 15 Feb 2021 07:56:29 +0100 +Subject: [PATCH] configure.ac: fix build without threads + +Cross-compilation of libgpg-error fails on toolchain without threads +since commit 988211d3d4c1f3d5cfa6b460210f65ab636763b5, +9ee011259f819a3cf50fe7019fa4366dbc437e0e and +50e62b36ea01ed25d12c443088b85d4f41a2b3e1 + +Indeed, since that time, libgpg-error assumes that pthread.h is always +available resulting in the following error at configure time: + +checking for arm-unknown-linux-gnueabi-objdump... (cached) /tmp/instance-1/output-1/host/bin/arm-linux-objdump +conftest.c:1:10: fatal error: pthread.h: No such file or directory + 1 | #include + | ^~~~~~~~~~~ +compilation terminated. +configure: generated src/lock-obj-pub.native.h using arm-unknown-linux-gnueabi-objdump and gawk +checking whether to enable log_clock... no + +This error will in turn results in a build failure because +"Can't determine mutex size" is echoed by gen-lock-obj.sh: + +In file included from strsource-sym.c:27: +./gpg-error.h:1115:4: warning: missing terminating ' character + 1115 | Can't determine mutex size + | ^ + +Full build log: +http://autobuild.buildroot.org/results/334/3344c96e5627a9327b0eabe0b27f34490bbabc0d/build-end.log + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://dev.gnupg.org/T5296] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b9a2a3e..15d9fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ if test x$cross_compiling = xyes; then + case $host in + *-*-linux*) + AC_CHECK_TOOL(OBJDUMP, [objdump]) +- if test -n "$OBJDUMP"; then ++ if test -n "$OBJDUMP" -a x"$gl_use_threads" != xno; then + lock_obj_h_generated=yes + if test ! -d src; then mkdir src; fi + LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ +-- +2.30.0 + diff --git a/buildroot/package/libgpg-error/Config.in b/buildroot/package/libgpg-error/Config.in index 415cd015c..44e9d67aa 100644 --- a/buildroot/package/libgpg-error/Config.in +++ b/buildroot/package/libgpg-error/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_m68k || BR2_nios2 || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_RISCV_32 || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_sparc || \ - BR2_sparc64 || BR2_x86_64 + BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \ + BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ + BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -44,6 +44,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_RISCV_32 default "riscv64-unknown-linux-gnu" \ if BR2_RISCV_64 + default "s390x-unknown-linux-gnu" \ + if BR2_s390x default "sh4-unknown-linux-gnu" \ if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb default "sparc-unknown-linux-gnu" \ diff --git a/buildroot/package/libgpg-error/libgpg-error.hash b/buildroot/package/libgpg-error/libgpg-error.hash index 05c46d6d4..315c0965c 100644 --- a/buildroot/package/libgpg-error/libgpg-error.hash +++ b/buildroot/package/libgpg-error/libgpg-error.hash @@ -1,7 +1,10 @@ +# From https://www.gnupg.org/download/integrity_check.html +sha1 66d6270511a48bac0bf347330e7a12c62f3a1ab4 libgpg-error-1.41.tar.bz2 + # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.37.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.41.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763 libgpg-error-1.37.tar.bz2 +sha256 64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742 libgpg-error-1.41.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/buildroot/package/libgpg-error/libgpg-error.mk b/buildroot/package/libgpg-error/libgpg-error.mk index 6281faa66..1b35e5c8f 100644 --- a/buildroot/package/libgpg-error/libgpg-error.mk +++ b/buildroot/package/libgpg-error/libgpg-error.mk @@ -4,15 +4,24 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.37 +LIBGPG_ERROR_VERSION = 1.41 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB +LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = --disable-tests \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +# We're patching configure.ac +LIBGPG_ERROR_AUTORECONF= YES + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBGPG_ERROR_CONF_OPTS += --enable-threads +else +LIBGPG_ERROR_CONF_OPTS += --disable-threads +endif $(eval $(autotools-package)) diff --git a/buildroot/package/libgpgme/libgpgme.hash b/buildroot/package/libgpgme/libgpgme.hash index 6ed6a3625..35767a27f 100644 --- a/buildroot/package/libgpgme/libgpgme.hash +++ b/buildroot/package/libgpgme/libgpgme.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.15.1.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 gpgme-1.13.1.tar.bz2 +sha256 eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad gpgme-1.15.1.tar.bz2 # Locally calculated -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER +sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/buildroot/package/libgpgme/libgpgme.mk b/buildroot/package/libgpgme/libgpgme.mk index 1951cc667..95a419258 100644 --- a/buildroot/package/libgpgme/libgpgme.mk +++ b/buildroot/package/libgpgme/libgpgme.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIBGPGME_VERSION = 1.13.1 +LIBGPGME_VERSION = 1.15.1 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER +LIBGPGME_CPE_ID_VENDOR = gnupg +LIBGPGME_CPE_ID_PRODUCT = gpgpme LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error LIBGPGME_CONFIG_SCRIPTS = gpgme-config diff --git a/buildroot/package/libgphoto2/Config.in b/buildroot/package/libgphoto2/Config.in index fc60dd68a..184ca206f 100644 --- a/buildroot/package/libgphoto2/Config.in +++ b/buildroot/package/libgphoto2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBGPHOTO2 bool "libgphoto2" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBXML2 @@ -10,5 +11,6 @@ config BR2_PACKAGE_LIBGPHOTO2 http://gphoto.org/proj/libgphoto2/ -comment "libgphoto needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libgphoto needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libgphoto2/libgphoto2.hash b/buildroot/package/libgphoto2/libgphoto2.hash index 0d965da0f..e405735c8 100644 --- a/buildroot/package/libgphoto2/libgphoto2.hash +++ b/buildroot/package/libgphoto2/libgphoto2.hash @@ -1,7 +1,6 @@ -# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.23/ -md5 bf052ce815e607dc781c5b0f3c5ca5c0 libgphoto2-2.5.23.tar.bz2 -sha1 01f91d2b5d2aef7e80ab846fea4d5eb5cc67ed79 libgphoto2-2.5.23.tar.bz2 +# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.26/ +sha1 38373ef7f76e90492ffca309094487fb1474f3fe libgphoto2-2.5.26.tar.bz2 # Locally calculated hash -sha256 d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d libgphoto2-2.5.23.tar.bz2 -sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING +sha256 7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4 libgphoto2-2.5.26.tar.bz2 +sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING diff --git a/buildroot/package/libgphoto2/libgphoto2.mk b/buildroot/package/libgphoto2/libgphoto2.mk index 63e6a8775..1d42ba862 100644 --- a/buildroot/package/libgphoto2/libgphoto2.mk +++ b/buildroot/package/libgphoto2/libgphoto2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPHOTO2_VERSION = 2.5.23 +LIBGPHOTO2_VERSION = 2.5.26 LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.bz2 # Project is maintained on github but github tarball doesn't have # configure, so use tarballs from SourceForge @@ -27,6 +27,13 @@ ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) LIBGPHOTO2_DEPENDENCIES += libusb-compat endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBGPHOTO2_DEPENDENCIES += libcurl +LIBGPHOTO2_CONF_OPTS += --with-libcurl=auto +else +LIBGPHOTO2_CONF_OPTS += --with-libcurl=no +endif + ifeq ($(BR2_PACKAGE_LIBEXIF),y) LIBGPHOTO2_DEPENDENCIES += libexif LIBGPHOTO2_CONF_OPTS += --with-libexif=auto diff --git a/buildroot/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch b/buildroot/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch new file mode 100644 index 000000000..a21c76700 --- /dev/null +++ b/buildroot/package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch @@ -0,0 +1,91 @@ +From 5e9e7223a3633ee82b557d21b1f18aa15becd450 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski +Date: Mon, 7 Dec 2020 20:38:30 +0100 +Subject: build: add a configure switch for building examples + +Example code for bindings is currently always built if bindings are +enabled. Make it conditional with a new configure switch. + +Signed-off-by: Bartosz Golaszewski +Reviewed-by: Andy Shevchenko +[Retrieved from: +https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/commit/?id=5e9e7223a3633ee82b557d21b1f18aa15becd450] +Signed-off-by: Fabrice Fontaine +--- + bindings/cxx/Makefile.am | 8 +++++++- + bindings/python/Makefile.am | 10 ++++++++-- + configure.ac | 6 ++++++ + 3 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am +index 5c40ceb..87463b0 100644 +--- a/bindings/cxx/Makefile.am ++++ b/bindings/cxx/Makefile.am +@@ -18,10 +18,16 @@ include_HEADERS = gpiod.hpp + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libgpiodcxx.pc + +-SUBDIRS = . examples ++SUBDIRS = . + + if WITH_TESTS + + SUBDIRS += tests + + endif ++ ++if WITH_EXAMPLES ++ ++SUBDIRS += examples ++ ++endif +diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am +index 124f152..5403bcb 100644 +--- a/bindings/python/Makefile.am ++++ b/bindings/python/Makefile.am +@@ -6,8 +6,6 @@ + # Copyright (C) 2017-2018 Bartosz Golaszewski + # + +-SUBDIRS = . examples +- + pyexec_LTLIBRARIES = gpiod.la + + gpiod_la_SOURCES = gpiodmodule.c +@@ -17,8 +15,16 @@ gpiod_la_CFLAGS += -Wall -Wextra -g -std=gnu89 $(PYTHON_CPPFLAGS) + gpiod_la_LDFLAGS = -module -avoid-version + gpiod_la_LIBADD = $(top_builddir)/lib/libgpiod.la $(PYTHON_LIBS) + ++SUBDIRS = . ++ + if WITH_TESTS + + SUBDIRS += tests + + endif ++ ++if WITH_EXAMPLES ++ ++SUBDIRS += examples ++ ++endif +diff --git a/configure.ac b/configure.ac +index 57c99a8..90a6324 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -155,6 +155,12 @@ then + fi + fi + ++AC_ARG_ENABLE([examples], ++ [AS_HELP_STRING([--enable-examples], [enable building code examples[default=no]])], ++ [if test "x$enableval" = xyes; then with_examples=true; fi], ++ [with_examples=false]) ++AM_CONDITIONAL([WITH_EXAMPLES], [test "x$with_examples" = xtrue]) ++ + AC_ARG_ENABLE([bindings-cxx], + [AS_HELP_STRING([--enable-bindings-cxx],[enable C++ bindings [default=no]])], + [if test "x$enableval" = xyes; then with_bindings_cxx=true; fi], +-- +cgit 1.2.3-1.el7 + diff --git a/buildroot/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash index 0ea15869b..7b691aaf5 100644 --- a/buildroot/package/libgpiod/libgpiod.hash +++ b/buildroot/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 a041b06907c956dd1c77836cccf4d392af29b9fe09c8ad18449a6da707b5ba2d libgpiod-1.4.5.tar.xz +sha256 c601e71846f5ab140c83bc757fdd62a4fda24a9cee39cc5e99c96ec2bf1b06a9 libgpiod-1.6.2.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/buildroot/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk index 83d5abb00..201b697c7 100644 --- a/buildroot/package/libgpiod/libgpiod.mk +++ b/buildroot/package/libgpiod/libgpiod.mk @@ -4,15 +4,19 @@ # ################################################################################ -# be careful when bumping versions, newer branches (e.g. >= 1.6) -# depend on pretty recent kernel headers -LIBGPIOD_VERSION = 1.4.5 +# Be careful when bumping versions. +# Dependency on kernel header versions may change. +LIBGPIOD_VERSION = 1.6.2 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ LIBGPIOD_LICENSE_FILES = COPYING LIBGPIOD_INSTALL_STAGING = YES -LIBGPIOD_DEPENDENCIES = host-pkgconf +LIBGPIOD_DEPENDENCIES = host-pkgconf host-autoconf-archive +# We're patching configure.ac +LIBGPIOD_AUTORECONF = YES +LIBGPIOD_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +LIBGPIOD_CONF_OPTS = --disable-tests --disable-examples ifeq ($(BR2_PACKAGE_LIBGPIOD_TOOLS),y) LIBGPIOD_CONF_OPTS += --enable-tools diff --git a/buildroot/package/libgsasl/libgsasl.hash b/buildroot/package/libgsasl/libgsasl.hash index 57fd98fc9..75e5a317f 100644 --- a/buildroot/package/libgsasl/libgsasl.hash +++ b/buildroot/package/libgsasl/libgsasl.hash @@ -1,7 +1,11 @@ +# From https://lists.gnu.org/archive/html/help-gsasl/2021-01/msg00007.html +sha1 a16ff428bbf28fcfa681c7edd2cd2bb087bcc4e7 libgsasl-1.10.0.tar.gz +sha224 20b37757fccb6a0f8b4c6fcb28f51a3b4b8a4b1fdb4736da07707a0b libgsasl-1.10.0.tar.gz + # Locally calculated after checking pgp signature -sha256 19e2f90525c531010918c50bb1febef0d7115d620150cc66153b9ce73ff814e6 libgsasl-1.8.1.tar.gz +sha256 f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f libgsasl-1.10.0.tar.gz # Hash for license files: -sha256 185b5b29a3febbfe1ab0b1ec6b1a26df630be97a17a99b5d305fdfff3344c117 README +sha256 26e99818ca6ce79d8b2c461fabc72dc6e03483e6b0fd9692dcb07ab1b09bbac7 README sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libgsasl/libgsasl.mk b/buildroot/package/libgsasl/libgsasl.mk index 40e7c4c91..e813a354a 100644 --- a/buildroot/package/libgsasl/libgsasl.mk +++ b/buildroot/package/libgsasl/libgsasl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGSASL_VERSION = 1.8.1 +LIBGSASL_VERSION = 1.10.0 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs) LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING diff --git a/buildroot/package/libgsm/libgsm.hash b/buildroot/package/libgsm/libgsm.hash index 32e20c8f4..88d2573f5 100644 --- a/buildroot/package/libgsm/libgsm.hash +++ b/buildroot/package/libgsm/libgsm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 gsm-1.0.18.tar.gz +sha256 4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6 gsm-1.0.19.tar.gz sha256 81c68a3374937ed9b5e4929c709e81a2c4b35b5d1f450ecf8c473e2daea46ff6 COPYRIGHT diff --git a/buildroot/package/libgsm/libgsm.mk b/buildroot/package/libgsm/libgsm.mk index b9ae7d3ee..e3ebee4b1 100644 --- a/buildroot/package/libgsm/libgsm.mk +++ b/buildroot/package/libgsm/libgsm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGSM_VERSION = 1.0.18 +LIBGSM_VERSION = 1.0.19 LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz LIBGSM_SITE = http://www.quut.com/gsm LIBGSM_LICENSE = gsm diff --git a/buildroot/package/libgtk2/libgtk2.hash b/buildroot/package/libgtk2/libgtk2.hash index 49bec78da..9b10a1f0c 100644 --- a/buildroot/package/libgtk2/libgtk2.hash +++ b/buildroot/package/libgtk2/libgtk2.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.32.sha256sum -sha256 b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e gtk+-2.24.32.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.sha256sum +sha256 ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da gtk+-2.24.33.tar.xz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/libgtk2/libgtk2.mk b/buildroot/package/libgtk2/libgtk2.mk index 9b7d39a53..bcdf3e5d8 100644 --- a/buildroot/package/libgtk2/libgtk2.mk +++ b/buildroot/package/libgtk2/libgtk2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).32 +LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES diff --git a/buildroot/package/libgtk3/0001-no-gtk-doc.patch b/buildroot/package/libgtk3/0001-no-gtk-doc.patch index 6dede7348..db15c6cba 100644 --- a/buildroot/package/libgtk3/0001-no-gtk-doc.patch +++ b/buildroot/package/libgtk3/0001-no-gtk-doc.patch @@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville --- a/gtk-doc.make +++ b/gtk-doc.make -@@ -267,7 +267,7 @@ +@@ -299,7 +299,7 @@ # # Require gtk-doc when making dist # diff --git a/buildroot/package/libgtk3/0002-fix-introspection-check.patch b/buildroot/package/libgtk3/0002-fix-introspection-check.patch index 4c2806d81..90f5facbb 100644 --- a/buildroot/package/libgtk3/0002-fix-introspection-check.patch +++ b/buildroot/package/libgtk3/0002-fix-introspection-check.patch @@ -14,7 +14,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1621,7 +1621,10 @@ +@@ -1685,7 +1685,10 @@ # GObject introspection ################################################## diff --git a/buildroot/package/libgtk3/0003-disable-atk-bridge.patch b/buildroot/package/libgtk3/0003-disable-atk-bridge.patch index c92174f40..42de83b5b 100644 --- a/buildroot/package/libgtk3/0003-disable-atk-bridge.patch +++ b/buildroot/package/libgtk3/0003-disable-atk-bridge.patch @@ -7,7 +7,7 @@ Signed-off-by: Hadrien Boutteville --- a/configure.ac +++ b/configure.ac -@@ -1349,11 +1349,7 @@ +@@ -1364,11 +1364,7 @@ # Check for Accessibility Toolkit flags ######################################## @@ -23,7 +23,7 @@ Signed-off-by: Hadrien Boutteville --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -37,10 +37,6 @@ - #include + #include #include -#ifdef GDK_WINDOWING_X11 @@ -33,7 +33,7 @@ Signed-off-by: Hadrien Boutteville static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, -@@ -987,9 +983,5 @@ +@@ -988,9 +984,5 @@ _gtk_accessibility_override_atk_util (); do_window_event_initialization (); diff --git a/buildroot/package/libgtk3/Config.in b/buildroot/package/libgtk3/Config.in index 8a59fc31e..093aacac5 100644 --- a/buildroot/package/libgtk3/Config.in +++ b/buildroot/package/libgtk3/Config.in @@ -38,7 +38,7 @@ config BR2_PACKAGE_LIBGTK3 help The GTK+ version 3 graphical user interface library - http://www.gtk.org/ + https://www.gtk.org/ if BR2_PACKAGE_LIBGTK3 diff --git a/buildroot/package/libgtk3/libgtk3.hash b/buildroot/package/libgtk3/libgtk3.hash index dd902624c..22cf16dad 100644 --- a/buildroot/package/libgtk3/libgtk3.hash +++ b/buildroot/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-3.24.12.sha256sum -sha256 1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83 gtk+-3.24.12.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.24.sha256sum +sha256 cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a gtk+-3.24.24.tar.xz # Hash for license file: -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk index dbb975dbf..f7345cf2e 100644 --- a/buildroot/package/libgtk3/libgtk3.mk +++ b/buildroot/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).24 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/libhdhomerun/libhdhomerun.hash b/buildroot/package/libhdhomerun/libhdhomerun.hash index adbe04137..d5ff494ad 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.hash +++ b/buildroot/package/libhdhomerun/libhdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a61038f0a78c5dcab3508927ba47ac6ec47840f3d42a2df2b02034cfd7400668 libhdhomerun_20200521.tgz +sha256 cbaeb779c5a4e07db45310ef4271872bcb7c472402ebc3c58e224653c09400ed libhdhomerun_20200907.tgz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/buildroot/package/libhdhomerun/libhdhomerun.mk b/buildroot/package/libhdhomerun/libhdhomerun.mk index 7b3a232d1..42d4de261 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.mk +++ b/buildroot/package/libhdhomerun/libhdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHDHOMERUN_VERSION = 20200521 +LIBHDHOMERUN_VERSION = 20200907 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun LIBHDHOMERUN_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libhid/Config.in b/buildroot/package/libhid/Config.in index ec6630806..abf338fdc 100644 --- a/buildroot/package/libhid/Config.in +++ b/buildroot/package/libhid/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBHID bool "libhid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -8,5 +9,6 @@ config BR2_PACKAGE_LIBHID https://directory.fsf.org/wiki/Libhid -comment "libhid needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libhid needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch b/buildroot/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch new file mode 100644 index 000000000..a04473d21 --- /dev/null +++ b/buildroot/package/libiec61850/0001-use-poll.h-instead-of-sys-poll.h.patch @@ -0,0 +1,33 @@ +From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 7 Apr 2020 20:58:37 +0200 +Subject: [PATCH] use instead of + +The manpage of poll(2) states that the prototype of poll is defined +in . Use that header file instead of to allow +compilation against musl-libc. + +Upstream status: Pending +https://github.com/mz-automation/libiec61850/pull/228 + +Signed-off-by: Romain Naour +--- + hal/ethernet/linux/ethernet_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c +index c3ab2e2..9aa5c28 100644 +--- a/hal/ethernet/linux/ethernet_linux.c ++++ b/hal/ethernet/linux/ethernet_linux.c +@@ -23,7 +23,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +-- +2.21.1 + diff --git a/buildroot/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch b/buildroot/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch new file mode 100644 index 000000000..e1b8ca15b --- /dev/null +++ b/buildroot/package/libiec61850/0002-serial_port_linux-Add-missing-include-sys-time.h.patch @@ -0,0 +1,32 @@ +From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 7 Apr 2020 21:02:54 +0200 +Subject: [PATCH] serial_port_linux: Add missing include sys/time.h + +POSIX says `struct timeval` is defined if is included. + +Adding this header allow to build against musl-libc. + +Upstream status: Pending +https://github.com/mz-automation/libiec61850/pull/228 + +Signed-off-by: Romain Naour +--- + hal/serial/linux/serial_port_linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c +index e6308c0..15e5794 100644 +--- a/hal/serial/linux/serial_port_linux.c ++++ b/hal/serial/linux/serial_port_linux.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "hal_serial.h" + #include "hal_time.h" +-- +2.21.1 + diff --git a/buildroot/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch b/buildroot/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch new file mode 100644 index 000000000..88048555b --- /dev/null +++ b/buildroot/package/libiec61850/0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch @@ -0,0 +1,27 @@ +From 033ab5b6488250c8c3b838f25a7cbc3e099230bb Mon Sep 17 00:00:00 2001 +From: Michael Zillgith +Date: Wed, 12 Aug 2020 07:25:37 +0200 +Subject: [PATCH] - COTP: fixed possible heap buffer overflow when handling + message with invalid (zero) value in length field (#250) + +[Retrieved from: +https://github.com/mz-automation/libiec61850/commit/033ab5b6488250c8c3b838f25a7cbc3e099230bb] +Signed-off-by: Fabrice Fontaine +--- + src/mms/iso_cotp/cotp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/mms/iso_cotp/cotp.c b/src/mms/iso_cotp/cotp.c +index cbb34b36..8c37d262 100644 +--- a/src/mms/iso_cotp/cotp.c ++++ b/src/mms/iso_cotp/cotp.c +@@ -720,6 +720,9 @@ CotpConnection_readToTpktBuffer(CotpConnection* self) + goto exit_waiting; + } + ++ if (self->packetSize <= bufPos) ++ goto exit_error; ++ + readBytes = readFromSocket(self, buffer + bufPos, self->packetSize - bufPos); + + if (readBytes < 0) diff --git a/buildroot/package/libiec61850/Config.in b/buildroot/package/libiec61850/Config.in new file mode 100644 index 000000000..0badc9ba6 --- /dev/null +++ b/buildroot/package/libiec61850/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_LIBIEC61850 + bool "libiec61850" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + IEC 61850 is an international standard for + communication systems in Substation Automation Systems + (SAS) and management of Decentralized Energy Resources + (DER). It is seen as one of the communication standards + of the emerging Smart Grid. + + The project libIEC61850 provides a server and client + library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC + 61850-9-2/Sampled Values communication protocols + written in C. It is available under the GPLv3 license. + + http://libiec61850.com + +comment "libiec61850 needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/libiec61850/libiec61850.hash b/buildroot/package/libiec61850/libiec61850.hash new file mode 100644 index 000000000..5739a5d8c --- /dev/null +++ b/buildroot/package/libiec61850/libiec61850.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d0630cd5b7ac67a2d286b0ad574ff1c9074c96be33b9d5a300cd69e89429abbe libiec61850-1.4.2.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libiec61850/libiec61850.mk b/buildroot/package/libiec61850/libiec61850.mk new file mode 100644 index 000000000..4f82451eb --- /dev/null +++ b/buildroot/package/libiec61850/libiec61850.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libiec61850 +# +################################################################################ + +LIBIEC61850_VERSION = 1.4.2.1 +LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_INSTALL_STAGING = YES +LIBIEC61850_LICENSE = GPL-3.0+ +LIBIEC61850_LICENSE_FILES = COPYING +LIBIEC61850_CPE_ID_VENDOR = mz-automation +LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF + +# 0003-COTP-fixed-possible-heap-buffer-overflow-when-handling-message.patch +LIBIEC61850_IGNORE_CVES += CVE-2020-15158 + +$(eval $(cmake-package)) diff --git a/buildroot/package/libiio/Config.in b/buildroot/package/libiio/Config.in index dcc7c79d1..0d89331c8 100644 --- a/buildroot/package/libiio/Config.in +++ b/buildroot/package/libiio/Config.in @@ -33,13 +33,15 @@ config BR2_PACKAGE_LIBIIO_USB_BACKEND bool "USB backend" default y depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBIIO_XML_BACKEND select BR2_PACKAGE_LIBUSB help Enable the USB backend of the library. -comment "The USB backend needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "The USB backend needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND bool "Serial backend" diff --git a/buildroot/package/libilbc/libilbc.hash b/buildroot/package/libilbc/libilbc.hash index 81a0c4e03..5f41a99ce 100644 --- a/buildroot/package/libilbc/libilbc.hash +++ b/buildroot/package/libilbc/libilbc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 70cd6a4f6bbe6dcebfc4293eea7b6200f883d1bf0affa1efba819d44d274e35f libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07.tar.gz -sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf +sha256 f97d8284776c95b31ed5d5441f13b519b8c7966b77a26aa06c29bb77e02cfe16 libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07-br1.tar.gz +sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf diff --git a/buildroot/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash index 79bfc5d98..f2cea28ee 100644 --- a/buildroot/package/libinput/libinput.hash +++ b/buildroot/package/libinput/libinput.hash @@ -1,8 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-November/041644.html -md5 562614e91c10c75ab1c2b71e5d27f076 libinput-1.16.3.tar.xz -sha1 ee1e93ee647bdd4598a5910eb654592563657d66 libinput-1.16.3.tar.xz -sha256 dc5e1ae51ec1cc635ca96f61118b0f07dfea783cab0747a60f3555068bb077e4 libinput-1.16.3.tar.xz -sha512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39 libinput-1.16.3.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-November/041664.html +sha256 65923a06d5a8970e4a999c4668797b9b689614b62b1d44432ab1c87b65e39e29 libinput-1.16.4.tar.xz +sha512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee libinput-1.16.4.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/buildroot/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk index e5578a392..3b459d6fb 100644 --- a/buildroot/package/libinput/libinput.mk +++ b/buildroot/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.16.3 +LIBINPUT_VERSION = 1.16.4 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/buildroot/package/libiqrf/Config.in b/buildroot/package/libiqrf/Config.in index 03555e063..d86a7fd0e 100644 --- a/buildroot/package/libiqrf/Config.in +++ b/buildroot/package/libiqrf/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBIQRF bool "libiqrf" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help This library implement specific protocol @@ -10,5 +11,6 @@ config BR2_PACKAGE_LIBIQRF https://github.com/nandra/libiqrf -comment "libiqrf needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libiqrf needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libjpeg/libjpeg.mk b/buildroot/package/libjpeg/libjpeg.mk index b855344f3..389ecb629 100644 --- a/buildroot/package/libjpeg/libjpeg.mk +++ b/buildroot/package/libjpeg/libjpeg.mk @@ -10,6 +10,7 @@ LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README LIBJPEG_INSTALL_STAGING = YES +LIBJPEG_CPE_ID_VENDOR = ijg LIBJPEG_PROVIDES = jpeg define LIBJPEG_REMOVE_USELESS_TOOLS diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk index b46e7c6c5..e4f3fa418 100644 --- a/buildroot/package/libkrb5/libkrb5.mk +++ b/buildroot/package/libkrb5/libkrb5.mk @@ -11,6 +11,8 @@ LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT LIBKRB5_LICENSE_FILES = NOTICE +LIBKRB5_CPE_ID_VENDOR = mit +LIBKRB5_CPE_ID_PRODUCT = kerberos_5 LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES) LIBKRB5_INSTALL_STAGING = YES diff --git a/buildroot/package/libksba/libksba.hash b/buildroot/package/libksba/libksba.hash index 8ab7e6efe..c8c9d6bdd 100644 --- a/buildroot/package/libksba/libksba.hash +++ b/buildroot/package/libksba/libksba.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -sha256 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 libksba-1.3.5.tar.bz2 +sha256 ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba libksba-1.5.0.tar.bz2 # Hash for license files: -sha256 240908e1356ffeb5d0730227b6198dcc8e878375d28632fd813e0ed75b35ccc2 AUTHORS -sha256 6197b98c6bf69838c624809c509d84333de1bc847155168c0e84527446a27076 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING.GPLv3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LGPLv3 +sha256 4d7ff8486176da695f3c81da2ac7ce1b9e5331e0a1667d9ebfe44057088a4220 AUTHORS +sha256 6197b98c6bf69838c624809c509d84333de1bc847155168c0e84527446a27076 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING.GPLv3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LGPLv3 diff --git a/buildroot/package/libksba/libksba.mk b/buildroot/package/libksba/libksba.mk index 25b17a47d..2ad9bee06 100644 --- a/buildroot/package/libksba/libksba.mk +++ b/buildroot/package/libksba/libksba.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBKSBA_VERSION = 1.3.5 +LIBKSBA_VERSION = 1.5.0 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 +LIBKSBA_CPE_ID_VALID = YES LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/buildroot/package/liblogging/liblogging.mk b/buildroot/package/liblogging/liblogging.mk index c756891a8..24375b56b 100644 --- a/buildroot/package/liblogging/liblogging.mk +++ b/buildroot/package/liblogging/liblogging.mk @@ -8,6 +8,7 @@ LIBLOGGING_VERSION = 1.0.6 LIBLOGGING_SITE = http://download.rsyslog.com/liblogging LIBLOGGING_LICENSE = BSD-2-Clause LIBLOGGING_LICENSE_FILES = COPYING +LIBLOGGING_CPE_ID_VENDOR = adiscon LIBLOGGING_INSTALL_STAGING = YES LIBLOGGING_CONF_OPTS = --enable-cached-man-pages diff --git a/buildroot/package/libmatroska/libmatroska.mk b/buildroot/package/libmatroska/libmatroska.mk index 61222c2bf..91727ae97 100644 --- a/buildroot/package/libmatroska/libmatroska.mk +++ b/buildroot/package/libmatroska/libmatroska.mk @@ -10,6 +10,7 @@ LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska LIBMATROSKA_INSTALL_STAGING = YES LIBMATROSKA_LICENSE = LGPL-2.1+ LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL +LIBMATROSKA_CPE_ID_VENDOR = matroska LIBMATROSKA_DEPENDENCIES = libebml host-pkgconf $(eval $(cmake-package)) diff --git a/buildroot/package/libmaxminddb/libmaxminddb.mk b/buildroot/package/libmaxminddb/libmaxminddb.mk index eb28c99a4..81593505e 100644 --- a/buildroot/package/libmaxminddb/libmaxminddb.mk +++ b/buildroot/package/libmaxminddb/libmaxminddb.mk @@ -10,6 +10,7 @@ LIBMAXMINDDB_SITE = \ LIBMAXMINDDB_INSTALL_STAGING = YES LIBMAXMINDDB_LICENSE = Apache-2.0 LIBMAXMINDDB_LICENSE_FILES = LICENSE +LIBMAXMINDDB_CPE_ID_VENDOR = maxmind LIBMAXMINDDB_CONF_OPTS = --disable-tests # mmdblookup binary depends on pthreads diff --git a/buildroot/package/libmbim/libmbim.mk b/buildroot/package/libmbim/libmbim.mk index 05345623b..4ce3ca892 100644 --- a/buildroot/package/libmbim/libmbim.mk +++ b/buildroot/package/libmbim/libmbim.mk @@ -9,6 +9,7 @@ LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB +LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 diff --git a/buildroot/package/libmdbx/Config.in b/buildroot/package/libmdbx/Config.in new file mode 100644 index 000000000..d13f73938 --- /dev/null +++ b/buildroot/package/libmdbx/Config.in @@ -0,0 +1,45 @@ +config BR2_PACKAGE_LIBMDBX + bool "libmdbx" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + help + One of the fastest compact key-value ACID database + without WAL. libmdbx has a specific set of properties + and capabilities, focused on creating unique lightweight + solutions. + + libmdbx surpasses the legendary LMDB in terms of + reliability, features and performance. + + https://github.com/erthink/libmdbx + +if BR2_PACKAGE_LIBMDBX + +config BR2_PACKAGE_LIBMDBX_TOOLS + bool "install tools" + help + Install libmdbx tools for checking, dump, restore + and show statistics of databases. + +config BR2_PACKAGE_LIBMDBX_CXX + bool "C++ API" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + help + Enable modern C++11/14/17/20 API for libmdbx. + +comment "libmdbx C++ support needs a toolchain w/ C++11, gcc >= 4.8 w/o bug#64735" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +endif + +comment "libmdbx needs MMU, a toolchain w/ threads, gcc >= 4.4 w/ 4-byte atomics" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_SYNC_4 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 diff --git a/buildroot/package/libmdbx/libmdbx.hash b/buildroot/package/libmdbx/libmdbx.hash new file mode 100644 index 000000000..fcfb4a673 --- /dev/null +++ b/buildroot/package/libmdbx/libmdbx.hash @@ -0,0 +1,5 @@ +# Hashes from: https://github.com/erthink/libmdbx/releases/ +sha256 d12bc7189b746beaa85514fcd1fcf26b957bb8feadb11662a0e20c4e79410d3f libmdbx-amalgamated-0.9.3.tar.gz + +# Locally calculated +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/libmdbx/libmdbx.mk b/buildroot/package/libmdbx/libmdbx.mk new file mode 100644 index 000000000..baf5193eb --- /dev/null +++ b/buildroot/package/libmdbx/libmdbx.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# libmdbx +# +################################################################################ + +LIBMDBX_VERSION = 0.9.3 +LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz +LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) +LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO +LIBMDBX_LICENSE = OLDAP-2.8 +LIBMDBX_LICENSE_FILES = LICENSE +LIBMDBX_REDISTRIBUTE = YES +LIBMDBX_STRIP_COMPONENTS = 0 +LIBMDBX_INSTALL_STAGING = YES + +# Set CMAKE_BUILD_TYPE to Release to remove -Werror and avoid a build failure +# with glibc < 2.12 +LIBMDBX_CONF_OPTS = \ + -DCMAKE_BUILD_TYPE=Release \ + -DMDBX_INSTALL_MANPAGES=OFF \ + -DBUILD_FOR_NATIVE_CPU=OFF \ + -DMDBX_BUILD_CXX=$(if $(BR2_PACKAGE_LIBMDBX_CXX),ON,OFF) \ + -DMDBX_BUILD_TOOLS=$(if $(BR2_PACKAGE_LIBMDBX_TOOLS),ON,OFF) + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBMDBX_CONF_OPTS += -DMDBX_INSTALL_STATIC=ON +else +LIBMDBX_CONF_OPTS += -DMDBX_INSTALL_STATIC=OFF +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBMDBX_CONF_OPTS += \ + -DMDBX_BUILD_SHARED_LIBRARY=ON \ + -DMDBX_LINK_TOOLS_NONSTATIC=ON +else +LIBMDBX_CONF_OPTS += \ + -DMDBX_BUILD_SHARED_LIBRARY=OFF \ + -DMDBX_LINK_TOOLS_NONSTATIC=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.hash b/buildroot/package/libmicrohttpd/libmicrohttpd.hash index d853f67a7..e92032a21 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.hash +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182 libmicrohttpd-0.9.71.tar.gz +sha256 0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8 libmicrohttpd-0.9.72.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index 4cb9dbcbf..e3469df42 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.71 +LIBMICROHTTPD_VERSION = 0.9.72 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES diff --git a/buildroot/package/libmnl/libmnl.mk b/buildroot/package/libmnl/libmnl.mk index 7fcce4c21..d3b33db2e 100644 --- a/buildroot/package/libmnl/libmnl.mk +++ b/buildroot/package/libmnl/libmnl.mk @@ -10,5 +10,6 @@ LIBMNL_SITE = http://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES LIBMNL_LICENSE = LGPL-2.1+ LIBMNL_LICENSE_FILES = COPYING +LIBMNL_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libndp/libndp.mk b/buildroot/package/libndp/libndp.mk index 3783eb135..eb1f7f0c8 100644 --- a/buildroot/package/libndp/libndp.mk +++ b/buildroot/package/libndp/libndp.mk @@ -8,6 +8,7 @@ LIBNDP_VERSION = 1.7 LIBNDP_SITE = $(call github,jpirko,libndp,v$(LIBNDP_VERSION)) LIBNDP_LICENSE = LGPL-2.1+ LIBNDP_LICENSE_FILES = COPYING +LIBNDP_CPE_ID_VENDOR = libndp LIBNDP_AUTORECONF = YES LIBNDP_INSTALL_STAGING = YES diff --git a/buildroot/package/libnetconf2/libnetconf2.hash b/buildroot/package/libnetconf2/libnetconf2.hash index 489188daf..a20e31e8d 100644 --- a/buildroot/package/libnetconf2/libnetconf2.hash +++ b/buildroot/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ce2b819f3544fd46a3a4c8ba6dd0a3798cab2a63aa347bc1eb5275a2c89b7bd libnetconf2-1.1.26.tar.gz +sha256 17aa551380ffcccc3bfd928edbcc170cbe85b0f336b361d5f03ede8f3e5f6348 libnetconf2-1.1.36.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/buildroot/package/libnetconf2/libnetconf2.mk b/buildroot/package/libnetconf2/libnetconf2.mk index 1b692550d..770188df9 100644 --- a/buildroot/package/libnetconf2/libnetconf2.mk +++ b/buildroot/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 1.1.26 +LIBNETCONF2_VERSION = 1.1.36 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 8beefefb5..0a5a94be8 100644 --- a/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -11,5 +11,6 @@ LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl LIBNETFILTER_CONNTRACK_LICENSE = GPL-2.0+ LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING +LIBNETFILTER_CONNTRACK_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk index 61d6acd07..d74ea4d0f 100644 --- a/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk +++ b/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk @@ -12,5 +12,6 @@ LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_CTHELPER_AUTORECONF = YES LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+ LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING +LIBNETFILTER_CTHELPER_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk index 9c4c95168..f5c5067b6 100644 --- a/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk +++ b/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk @@ -12,5 +12,6 @@ LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+ LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING +LIBNETFILTER_CTTIMEOUT_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk b/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk index 2bb4dd376..6cd35baea 100644 --- a/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk +++ b/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk @@ -12,5 +12,6 @@ LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl LIBNETFILTER_QUEUE_AUTORECONF = YES LIBNETFILTER_QUEUE_LICENSE = GPL-2.0+ LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING +LIBNETFILTER_QUEUE_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libnfc/Config.in b/buildroot/package/libnfc/Config.in index 14084dc88..ead61e452 100644 --- a/buildroot/package/libnfc/Config.in +++ b/buildroot/package/libnfc/Config.in @@ -24,13 +24,15 @@ comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library" config BR2_PACKAGE_LIBNFC_ACR122_USB bool "acr122_usb driver" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help support for acr122_usb driver -comment "acr122_usb driver needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "acr122_usb driver needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_ACR122S bool "acr122s driver" @@ -62,13 +64,15 @@ config BR2_PACKAGE_LIBNFC_PN53X_USB bool "pn53x_usb driver" default y depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help support for pn53x_usb driver -comment "pn53x_usb driver needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "pn53x_usb driver needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_EXAMPLES bool "build libnfc examples" diff --git a/buildroot/package/libnfnetlink/libnfnetlink.mk b/buildroot/package/libnfnetlink/libnfnetlink.mk index 13f5d72c8..a5ad47b85 100644 --- a/buildroot/package/libnfnetlink/libnfnetlink.mk +++ b/buildroot/package/libnfnetlink/libnfnetlink.mk @@ -11,5 +11,6 @@ LIBNFNETLINK_AUTORECONF = YES LIBNFNETLINK_INSTALL_STAGING = YES LIBNFNETLINK_LICENSE = GPL-2.0 LIBNFNETLINK_LICENSE_FILES = COPYING +LIBNFNETLINK_CPE_ID_VENDOR = netfilter $(eval $(autotools-package)) diff --git a/buildroot/package/libnpupnp/libnpupnp.hash b/buildroot/package/libnpupnp/libnpupnp.hash index 53a0c16fd..ce39db4d8 100644 --- a/buildroot/package/libnpupnp/libnpupnp.hash +++ b/buildroot/package/libnpupnp/libnpupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.11.tar.gz.sha256 -sha256 15b73a5197e649afe44dd15002be131b4b0e20a2b2e9b7ea4a2000b9644fefae libnpupnp-4.0.11.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.14.tar.gz.sha256 +sha256 ea5f5bf388bf8c028a25630c58e9a42762fddd357e7e2581b192856e01aad044 libnpupnp-4.0.14.tar.gz # Hash for license file: sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libnpupnp/libnpupnp.mk b/buildroot/package/libnpupnp/libnpupnp.mk index 23cc52c16..efffd7f8a 100644 --- a/buildroot/package/libnpupnp/libnpupnp.mk +++ b/buildroot/package/libnpupnp/libnpupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPUPNP_VERSION = 4.0.11 +LIBNPUPNP_VERSION = 4.0.14 LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBNPUPNP_LICENSE = BSD-3-Clause LIBNPUPNP_LICENSE_FILES = COPYING diff --git a/buildroot/package/libnss/0001-fix-old-abi-ppc.patch b/buildroot/package/libnss/0001-fix-old-abi-ppc.patch deleted file mode 100644 index 202b4ad27..000000000 --- a/buildroot/package/libnss/0001-fix-old-abi-ppc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001 -From: Lauri Kasanen -Date: Mon, 1 Jun 2020 12:11:45 +0300 -Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o: - ABI version 2 is not compatible with ABI version 1 output - -Don't try to build the SHA-2 accelerated asm on old-ABI ppc. - -Currently make only, I don't have enough gyp-fu to do that side. -However, the reporters of 1642174 and 1635625 both used make, not gyp. - -Signed-off-by: Lauri Kasanen -[Fetch-from: https://bugzilla.mozilla.org/show_bug.cgi?id=1642174 - Manually modified paths to apply to nss subdirectory in release tarball.] -Signed-off-by: Joseph Kogut ---- - lib/freebl/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 5f7384429..e0461c7d3 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm) - endif - ifeq ($(CPU_ARCH),ppc) - EXTRA_SRCS += gcm-ppc.c -- ASFILES += sha512-p8.s - ifdef USE_64 - DEFINES += -DNSS_NO_INIT_SUPPORT -+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}') -+ ifeq ($(PPC_ABI),2) -+ ASFILES += sha512-p8.s -+ endif - endif # USE_64 - endif # ppc - endif # Linux --- -2.19.1 - diff --git a/buildroot/package/libnss/libnss.hash b/buildroot/package/libnss/libnss.hash index 02593c7dd..ad632f724 100644 --- a/buildroot/package/libnss/libnss.hash +++ b/buildroot/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_58_RTM/src/SHA256SUMS -sha256 9f73cf789b5f109b978e5239551b609b0cafa88d18f0bc8ce3f976cb629353c0 nss-3.58.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_61_RTM/src/SHA256SUMS +sha256 312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370 nss-3.61.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/buildroot/package/libnss/libnss.mk b/buildroot/package/libnss/libnss.mk index 8e6a77d2c..3bc3197e3 100644 --- a/buildroot/package/libnss/libnss.mk +++ b/buildroot/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.58 +LIBNSS_VERSION = 3.61 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/buildroot/package/libolm/libolm.hash b/buildroot/package/libolm/libolm.hash index f521d30c0..c080c7eaf 100644 --- a/buildroot/package/libolm/libolm.hash +++ b/buildroot/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 92ac1eccacbff620a1bc1a168ba204893d83bcb72646e456990ebe2480638696 olm-3.1.5.tar.gz +sha256 d947d9570345e68696668cb855f1a6a7141b7b89cbcc15a08b1fae18535c4c45 olm-3.2.1.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/libolm/libolm.mk b/buildroot/package/libolm/libolm.mk index 48cb31fb2..034b3449d 100644 --- a/buildroot/package/libolm/libolm.mk +++ b/buildroot/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.1.5 +LIBOLM_VERSION = 3.2.1 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index 5e24ca17a..854f8a03f 100644 --- a/buildroot/package/libopenssl/libopenssl.hash +++ b/buildroot/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1i.tar.gz.sha256 -sha256 e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 openssl-1.1.1i.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1j.tar.gz.sha256 +sha256 aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf openssl-1.1.1j.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index ac12d1701..19f1c89f0 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1i +LIBOPENSSL_VERSION = 1.1.1j LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay @@ -15,6 +15,8 @@ HOST_LIBOPENSSL_DEPENDENCIES = host-zlib LIBOPENSSL_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH)) LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS) LIBOPENSSL_PROVIDES = openssl +LIBOPENSSL_CPE_ID_VENDOR = $(LIBOPENSSL_PROVIDES) +LIBOPENSSL_CPE_ID_PRODUCT = $(LIBOPENSSL_PROVIDES) ifeq ($(BR2_m68k_cf),y) # relocation truncated to fit: R_68K_GOT16O @@ -65,7 +67,7 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS shared \ zlib-dynamic \ ) - $(SED) "s#-O[0-9s]#$(HOST_CFLAGS)#" $(@D)/Makefile + $(SED) "s#-O[0-9sg]#$(HOST_CFLAGS)#" $(@D)/Makefile endef define LIBOPENSSL_CONFIGURE_CMDS @@ -89,7 +91,7 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ ) $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile - $(SED) "s#-O[0-9s]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile + $(SED) "s#-O[0-9sg]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile $(SED) "s# build_tests##" $(@D)/Makefile endef diff --git a/buildroot/package/libosip2/libosip2.hash b/buildroot/package/libosip2/libosip2.hash index 76bc29d5f..400158cd7 100644 --- a/buildroot/package/libosip2/libosip2.hash +++ b/buildroot/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d libosip2-5.1.1.tar.gz +sha256 4fb48b2ea568bb41c6244b0df2bb7175849ca93e84be53ceb268fdf9351bb375 libosip2-5.2.0.tar.gz # Hash for license file: -sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING +sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/buildroot/package/libosip2/libosip2.mk b/buildroot/package/libosip2/libosip2.mk index e608f671c..d28027c13 100644 --- a/buildroot/package/libosip2/libosip2.mk +++ b/buildroot/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.1.1 +LIBOSIP2_VERSION = 5.2.0 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libostree/Config.in b/buildroot/package/libostree/Config.in index 4a6ab5464..14ae4da4c 100644 --- a/buildroot/package/libostree/Config.in +++ b/buildroot/package/libostree/Config.in @@ -1,14 +1,12 @@ config BR2_PACKAGE_LIBOSTREE bool "libostree" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error - depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 - depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme + depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_E2FSPROGS - select BR2_PACKAGE_LIBFUSE select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGPGME diff --git a/buildroot/package/libostree/libostree.hash b/buildroot/package/libostree/libostree.hash index e5483a539..751feb6b2 100644 --- a/buildroot/package/libostree/libostree.hash +++ b/buildroot/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 865d4818820d128a2e505380358275bb964984348b3d0685b6455099e4736972 libostree-2020.6.tar.xz +sha256 fdaa5992d0a6f62157152355449ac8476c50df6602be398e9ad10438cc1e679b libostree-2020.8.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/libostree/libostree.mk b/buildroot/package/libostree/libostree.mk index e387f9985..7c887ebee 100644 --- a/buildroot/package/libostree/libostree.mk +++ b/buildroot/package/libostree/libostree.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBOSTREE_VERSION = 2020.6 +LIBOSTREE_VERSION = 2020.8 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING -LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz +LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libglib2 libgpg-error libgpgme xz LIBOSTREE_INSTALL_STAGING = YES LIBOSTREE_CONF_ENV = \ @@ -69,6 +69,13 @@ else LIBOSTREE_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBFUSE),y) +LIBOSTREE_CONF_OPTS += --enable-rofiles-fuse +LIBOSTREE_DEPENDENCIES += libfuse +else +LIBOSTREE_CONF_OPTS += --disable-rofiles-fuse +endif + ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LIBOSTREE_CONF_OPTS += --with-selinux LIBOSTREE_DEPENDENCIES += libselinux diff --git a/buildroot/package/libpcap/libpcap.hash b/buildroot/package/libpcap/libpcap.hash index a24fba24d..e70d07129 100644 --- a/buildroot/package/libpcap/libpcap.hash +++ b/buildroot/package/libpcap/libpcap.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 libpcap-1.9.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz.sig +sha256 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e libpcap-1.10.0.tar.gz # Hash for license file: -sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/buildroot/package/libpcap/libpcap.mk b/buildroot/package/libpcap/libpcap.mk index 881a109a0..24215ebed 100644 --- a/buildroot/package/libpcap/libpcap.mk +++ b/buildroot/package/libpcap/libpcap.mk @@ -4,18 +4,23 @@ # ################################################################################ -LIBPCAP_VERSION = 1.9.1 -LIBPCAP_SITE = http://www.tcpdump.org/release +LIBPCAP_VERSION = 1.10.0 +LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE +LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = host-flex host-bison +LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. LIBPCAP_CONF_ENV = \ ac_cv_header_linux_wireless_h=yes \ + ac_cv_prog_cc_c99=-std=gnu99 \ CFLAGS="$(LIBPCAP_CFLAGS)" LIBPCAP_CFLAGS = $(TARGET_CFLAGS) -LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag +LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ + --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus LIBPCAP_CONFIG_SCRIPTS = pcap-config @@ -34,8 +39,7 @@ endif ifeq ($(BR2_PACKAGE_LIBNL),y) LIBPCAP_DEPENDENCIES += libnl -LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" -LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr +LIBPCAP_CONF_OPTS += --with-libnl else LIBPCAP_CONF_OPTS += --without-libnl endif diff --git a/buildroot/package/libphidget/Config.in b/buildroot/package/libphidget/Config.in index 61e915481..ab1e3e31b 100644 --- a/buildroot/package/libphidget/Config.in +++ b/buildroot/package/libphidget/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBPHIDGET bool "libphidget" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBUSB help @@ -23,6 +24,6 @@ config BR2_PACKAGE_LIBPHIDGET http://phidgets.com/ -comment "libphidget needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS +comment "libphidget needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libplist/libplist.mk b/buildroot/package/libplist/libplist.mk index d07fb5dd2..42da4fac0 100644 --- a/buildroot/package/libplist/libplist.mk +++ b/buildroot/package/libplist/libplist.mk @@ -9,6 +9,7 @@ LIBPLIST_SITE = $(call github,libimobiledevice,libplist,$(LIBPLIST_VERSION)) LIBPLIST_INSTALL_STAGING = YES LIBPLIST_LICENSE = LGPL-2.1+ LIBPLIST_LICENSE_FILES = COPYING +LIBPLIST_CPE_ID_VENDOR = libimobiledevice # github tarball does not include configure LIBPLIST_AUTORECONF = YES diff --git a/buildroot/package/libpwquality/libpwquality.hash b/buildroot/package/libpwquality/libpwquality.hash index 07c50ed24..1469bc0b7 100644 --- a/buildroot/package/libpwquality/libpwquality.hash +++ b/buildroot/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e libpwquality-1.4.2.tar.bz2 +sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/buildroot/package/libpwquality/libpwquality.mk b/buildroot/package/libpwquality/libpwquality.mk index a2fb00415..7c0c5df38 100644 --- a/buildroot/package/libpwquality/libpwquality.mk +++ b/buildroot/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.2 +LIBPWQUALITY_VERSION = 1.4.4 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ diff --git a/buildroot/package/libraw/libraw.mk b/buildroot/package/libraw/libraw.mk index 7f79000fd..fc02c7915 100644 --- a/buildroot/package/libraw/libraw.mk +++ b/buildroot/package/libraw/libraw.mk @@ -13,6 +13,7 @@ LIBRAW_CONF_OPTS += \ --disable-openmp LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md +LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf # https://github.com/LibRaw/LibRaw/issues/353 LIBRAW_AUTORECONF = YES diff --git a/buildroot/package/librelp/librelp.hash b/buildroot/package/librelp/librelp.hash index bd66ad7db..88665bcf2 100644 --- a/buildroot/package/librelp/librelp.hash +++ b/buildroot/package/librelp/librelp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cdbf49115fa530247358489864c5971c9f5a6442d19490e38f4c4ef844f1c264 librelp-1.8.0.tar.gz +sha256 24ee9e843960d1400a44ffaedb0b1ec91463df8f8acca869cc027ed25ee6bf33 librelp-1.9.0.tar.gz sha256 1ed76f935566e93e3c3c0d9f8fad22eb6d8bbe406e2eb8470a4a2764d9fd9685 COPYING diff --git a/buildroot/package/librelp/librelp.mk b/buildroot/package/librelp/librelp.mk index e9e879d1f..2b8a53e83 100644 --- a/buildroot/package/librelp/librelp.mk +++ b/buildroot/package/librelp/librelp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRELP_VERSION = 1.8.0 +LIBRELP_VERSION = 1.9.0 LIBRELP_SITE = http://download.rsyslog.com/librelp LIBRELP_LICENSE = GPL-3.0+ LIBRELP_LICENSE_FILES = COPYING diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk index 2f7644a8e..654b8bda2 100644 --- a/buildroot/package/libressl/libressl.mk +++ b/buildroot/package/libressl/libressl.mk @@ -8,6 +8,7 @@ LIBRESSL_VERSION = 3.2.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING +LIBRESSL_CPE_ID_VENDOR = openbsd LIBRESSL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),) diff --git a/buildroot/package/librsvg/librsvg.hash b/buildroot/package/librsvg/librsvg.hash index da9f758f4..1b3c26687 100644 --- a/buildroot/package/librsvg/librsvg.hash +++ b/buildroot/package/librsvg/librsvg.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.0.sha256sum -sha256 b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4 librsvg-2.50.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.2.sha256sum +sha256 6211f271ce4cd44a7318190d36712e9cea384a933d3e3570004edeb210a056d3 librsvg-2.50.2.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/librsvg/librsvg.mk b/buildroot/package/librsvg/librsvg.mk index 120f71c79..6a45fc97e 100644 --- a/buildroot/package/librsvg/librsvg.mk +++ b/buildroot/package/librsvg/librsvg.mk @@ -5,7 +5,7 @@ ################################################################################ LIBRSVG_VERSION_MAJOR = 2.50 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).0 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).2 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES diff --git a/buildroot/package/librtlsdr/Config.in b/buildroot/package/librtlsdr/Config.in index 238659a78..2f22c5b1c 100644 --- a/buildroot/package/librtlsdr/Config.in +++ b/buildroot/package/librtlsdr/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBRTLSDR bool "librtlsdr" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Library and command line programs for accessing @@ -28,5 +29,6 @@ config BR2_PACKAGE_LIBRTLSDR_ZEROCOPY endif -comment "librtlsdr needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "librtlsdr needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/librtlsdr/librtlsdr.mk b/buildroot/package/librtlsdr/librtlsdr.mk index 47586bdfb..7796d1096 100644 --- a/buildroot/package/librtlsdr/librtlsdr.mk +++ b/buildroot/package/librtlsdr/librtlsdr.mk @@ -34,15 +34,4 @@ else LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF endif -# In case of static-lib-only builds, CMake's FindThreads.cmake code tries to -# get the right flags, checking first for -lpthreads, then -lpthread, and lastly -# for -pthread. -# The 2 first link checks fail because of undefined symbols: __libc_setup_tls. -# In the later check, CMake successfully compiles and links the test program, -# but it also tries to run it, which is wrong when cross-compiling. -# -# The following CMake variable only disables the TRY_RUN call in the -pthread -# test. -LIBRTLSDR_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - $(eval $(cmake-package)) diff --git a/buildroot/package/libsecret/libsecret.hash b/buildroot/package/libsecret/libsecret.hash index a53cddefa..792ec838e 100644 --- a/buildroot/package/libsecret/libsecret.hash +++ b/buildroot/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.3.sha256sum -sha256 4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4 libsecret-0.20.3.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum +sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/buildroot/package/libsecret/libsecret.mk b/buildroot/package/libsecret/libsecret.mk index 7526c49c3..4d14c231d 100644 --- a/buildroot/package/libsecret/libsecret.mk +++ b/buildroot/package/libsecret/libsecret.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).3 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES diff --git a/buildroot/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch b/buildroot/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch new file mode 100644 index 000000000..2a23e98f9 --- /dev/null +++ b/buildroot/package/libselinux/0003-libselinux-rename-gettid-to-something-which-never-conflicts.patch @@ -0,0 +1,71 @@ +From 398d2ceef92cb1baac18e6b34a1a8e1bf41296cd Mon Sep 17 00:00:00 2001 +From: Nicolas Iooss +Date: Tue, 16 Feb 2021 22:13:28 +0100 +Subject: [PATCH] libselinux: rename gettid() to something which never + conflicts with the libc + +Musl recently added a wrapper for gettid() syscall. There is no way to +detect this new version in a reliable way, so rename our gettid() +wrapper to a non-conflicting name. + +Introduce a new function which, when using a libc known to provide a +wrapper for gettid(), calls it, and which, otherwise, performs the +syscall directly. + +Anyway this function is only used on systems where /proc/thread-self +does not exist, which are therefore running Linux<3.17. + +Fixes: https://github.com/SELinuxProject/selinux/issues/282 +Signed-off-by: Nicolas Iooss +Acked-by: Petr Lautrbach +[Retrieved from: +https://github.com/SELinuxProject/selinux/commit/398d2ceef92cb1baac18e6b34a1a8e1bf41296cd] +Signed-off-by: Fabrice Fontaine +--- + src/procattr.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/procattr.c b/src/procattr.c +index 1aa67ac53..840570525 100644 +--- a/src/procattr.c ++++ b/src/procattr.c +@@ -25,21 +25,23 @@ static __thread char destructor_initialized; + /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and + * has a definition for it */ + #ifdef __BIONIC__ +- #define OVERRIDE_GETTID 0 ++ #define HAVE_GETTID 1 + #elif !defined(__GLIBC_PREREQ) +- #define OVERRIDE_GETTID 1 ++ #define HAVE_GETTID 0 + #elif !__GLIBC_PREREQ(2,30) +- #define OVERRIDE_GETTID 1 ++ #define HAVE_GETTID 0 + #else +- #define OVERRIDE_GETTID 0 ++ #define HAVE_GETTID 1 + #endif + +-#if OVERRIDE_GETTID +-static pid_t gettid(void) ++static pid_t selinux_gettid(void) + { ++#if HAVE_GETTID ++ return gettid(); ++#else + return syscall(__NR_gettid); +-} + #endif ++} + + static void procattr_thread_destructor(void __attribute__((unused)) *unused) + { +@@ -94,7 +96,7 @@ static int openattr(pid_t pid, const char *attr, int flags) + if (fd >= 0 || errno != ENOENT) + goto out; + free(path); +- tid = gettid(); ++ tid = selinux_gettid(); + rc = asprintf(&path, "/proc/self/task/%d/attr/%s", tid, attr); + } else { + errno = EINVAL; diff --git a/buildroot/package/libselinux/libselinux.mk b/buildroot/package/libselinux/libselinux.mk index 8087af539..fdd13aa94 100644 --- a/buildroot/package/libselinux/libselinux.mk +++ b/buildroot/package/libselinux/libselinux.mk @@ -8,6 +8,7 @@ LIBSELINUX_VERSION = 3.1 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE +LIBSELINUX_CPE_ID_VENDOR = selinuxproject LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre diff --git a/buildroot/package/libsemanage/libsemanage.mk b/buildroot/package/libsemanage/libsemanage.mk index 3ea0603f5..48e2bbbc8 100644 --- a/buildroot/package/libsemanage/libsemanage.mk +++ b/buildroot/package/libsemanage/libsemanage.mk @@ -9,6 +9,7 @@ LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/2 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 +LIBSEMANAGE_CPE_ID_VENDOR = selinuxproject LIBSEMANAGE_INSTALL_STAGING = YES LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/buildroot/package/libsepol/libsepol.mk b/buildroot/package/libsepol/libsepol.mk index 7d8b7b206..a4398bdc4 100644 --- a/buildroot/package/libsepol/libsepol.mk +++ b/buildroot/package/libsepol/libsepol.mk @@ -8,6 +8,7 @@ LIBSEPOL_VERSION = 3.1 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING +LIBSEPOL_CPE_ID_VENDOR = selinuxproject LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex diff --git a/buildroot/package/libshout/libshout.hash b/buildroot/package/libshout/libshout.hash index 06702891c..ae43e0a9c 100644 --- a/buildroot/package/libshout/libshout.hash +++ b/buildroot/package/libshout/libshout.hash @@ -1,5 +1,8 @@ -# From https://downloads.xiph.org/releases/libshout/SHA256SUMS -sha256 0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe libshout-2.4.3.tar.gz +# From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA512SUMS +sha512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341 libshout-2.4.5.tar.gz + +# From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA256SUMS +sha256 d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890 libshout-2.4.5.tar.gz # Hash for license file -sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING +sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING diff --git a/buildroot/package/libshout/libshout.mk b/buildroot/package/libshout/libshout.mk index 6537a1fea..01ccf22e2 100644 --- a/buildroot/package/libshout/libshout.mk +++ b/buildroot/package/libshout/libshout.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSHOUT_VERSION = 2.4.3 +LIBSHOUT_VERSION = 2.4.5 LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout LIBSHOUT_LICENSE = LGPL-2.0+ LIBSHOUT_LICENSE_FILES = COPYING diff --git a/buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch b/buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch deleted file mode 100644 index 8426ad9af..000000000 --- a/buildroot/package/libsigsegv/0001-Improve-support-for-Linux-RISC-V.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4e6e6b52fe2f88584645a761bb342ac89d6c2860 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Thu, 15 Mar 2018 19:01:27 +0100 -Subject: [PATCH] Improve support for Linux/RISC-V. - -[Thomas: backported from upstream commit -671b2528b55c57eda1a8fe5872ff1ef61014235f, drop ChangeLog changes.] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 3 +++ - src/Makefile.am | 1 + - src/fault-linux-riscv64.h | 29 +++++++++++++++++++++++++++++ - 3 files changed, 33 insertions(+) - create mode 100644 src/fault-linux-riscv64.h - -diff --git a/configure.ac b/configure.ac -index 74ce6b4..9775cfb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -428,6 +428,9 @@ if test -z "$CFG_FAULT" && test "$sv_cv_fault_posix" = yes; then - powerpc* | rs6000) - CFG_FAULT=fault-linux-powerpc.h - ;; -+ riscv64) -+ CFG_FAULT=fault-linux-riscv64.h -+ ;; - s390*) - CFG_FAULT=fault-linux-s390.h - ;; -diff --git a/src/Makefile.am b/src/Makefile.am -index 3afa398..9a9982f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -42,6 +42,7 @@ noinst_HEADERS = \ - fault-linux-m68k.h fault-linux-m68k-old.h fault-linux-m68k-old.c \ - fault-linux-mips.h fault-linux-mips-old.h \ - fault-linux-powerpc.h fault-linux-powerpc-old.h \ -+ fault-linux-riscv64.h \ - fault-linux-s390.h fault-linux-s390-old.h \ - fault-linux-sh.h fault-linux-sh-old.h \ - fault-linux-sparc.h fault-linux-sparc-old.h \ -diff --git a/src/fault-linux-riscv64.h b/src/fault-linux-riscv64.h -new file mode 100644 -index 0000000..14831bf ---- /dev/null -+++ b/src/fault-linux-riscv64.h -@@ -0,0 +1,29 @@ -+/* Fault handler information. Linux/RISC-V 64-bit version. -+ Copyright (C) 2018 Bruno Haible -+ -+ This program 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 2, or (at your option) -+ any later version. -+ -+ This program 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 this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include "fault-posix-ucontext.h" -+ -+/* See glibc/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -+ and the definition of GET_STACK in -+ glibc/sysdeps/unix/sysv/linux/riscv/sigcontextinfo.h. -+ Note that the 'mcontext_t' defined in -+ glibc/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -+ and the 'struct sigcontext' defined in -+ glibc/sysdeps/unix/sysv/linux/riscv/bits/sigcontext.h -+ start with the same block of 32 general-purpose registers. */ -+ -+#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.__gregs[REG_SP] --- -2.19.1 - diff --git a/buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch b/buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch deleted file mode 100644 index 336181edf..000000000 --- a/buildroot/package/libsigsegv/0002-m4-stack-direction-RISC-V-stack-grows-downward.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9dd1989f5ae6cd3f2051732318e26bf742a4c89b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 13 Nov 2018 22:24:03 +0100 -Subject: [PATCH] m4/stack-direction: RISC-V stack grows downward - -While commit 671b2528b55c57eda1a8fe5872ff1ef61014235f ("Improve -support for Linux/RISC-V") adds some support for the RISC-V -architecture, it doesn't update m4/stack-direction.m4 to properly -support cross-compiling libsigsegv for a RISC-V architecture. - -According to -https://riscv.org/wp-content/uploads/2015/01/riscv-calling.pdf: "In -the standard RISC-V calling convention, the stack grows downward", so -let's update m4/stack-direction.m4 accordingly. - -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index c373f1c..9504f88 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -43,6 +43,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - pdp11 | \ - pj* | \ - powerpc* | rs6000 | \ -+ riscv* | \ - romp | \ - s390* | \ - sh* | \ --- -2.19.1 - diff --git a/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch b/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch deleted file mode 100644 index 90dcfacc1..000000000 --- a/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch +++ /dev/null @@ -1,76 +0,0 @@ -From ef0890d6bd6a3252fd99392705bbda39956b6b8f Mon Sep 17 00:00:00 2001 -From: Nylon Chen -Date: Fri, 26 Apr 2019 15:55:22 +0800 -Subject: [PATCH] Improve support for Linux/nds32. - -Signed-off-by:Nylon Chen ---- - configure.ac | 3 +++ - src/Makefile.am | 1 + - src/fault-linux-nds32.h | 28 ++++++++++++++++++++++++++++ - 3 files changed, 32 insertions(+) - create mode 100644 src/fault-linux-nds32.h - -diff --git a/configure.ac b/configure.ac -index 22b8eff..e44d573 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -425,6 +425,9 @@ if test -z "$CFG_FAULT" && test "$sv_cv_fault_posix" = yes; then - mips*) - CFG_FAULT=fault-linux-mips.h - ;; -+ nds32*) -+ CFG_FAULT=fault-linux-nds32.h -+ ;; - powerpc* | rs6000) - CFG_FAULT=fault-linux-powerpc.h - ;; -diff --git a/src/Makefile.am b/src/Makefile.am -index 9a9982f..8910be8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -41,6 +41,7 @@ noinst_HEADERS = \ - fault-linux-ia64.h fault-linux-ia64-old.h \ - fault-linux-m68k.h fault-linux-m68k-old.h fault-linux-m68k-old.c \ - fault-linux-mips.h fault-linux-mips-old.h \ -+ fault-linux-nds32.h \ - fault-linux-powerpc.h fault-linux-powerpc-old.h \ - fault-linux-riscv64.h \ - fault-linux-s390.h fault-linux-s390-old.h \ -diff --git a/src/fault-linux-nds32.h b/src/fault-linux-nds32.h -new file mode 100644 -index 0000000..3a5a47f ---- /dev/null -+++ b/src/fault-linux-nds32.h -@@ -0,0 +1,28 @@ -+/* Fault handler information. Andse NDS32 32-bit version. -+ Copyright (C) 2018 Nylon Chen -+ -+ This program 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 2, or (at your option) -+ any later version. -+ -+ This program 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 this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include "fault-posix-ucontext.h" -+ -+/* See glibc/sysdeps/unix/sysv/linux/nds32/sys/ucontext.h -+ and the definition of GET_STACK in -+ glibc/sysdeps/unix/sysv/linux/nds32/sigcontextinfo.h. -+ Note that the 'mcontext_t' defined in -+ glibc/sysdeps/unix/sysv/linux/arm/nds32/ucontext.h -+ and the 'struct sigcontext' defined in -+*/ -+ -+#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.nds32_sp --- -2.18.0 - diff --git a/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch b/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch deleted file mode 100644 index 36a23aa67..000000000 --- a/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 55600de29790051671a411d8f2d99ecc3c65ae13 Mon Sep 17 00:00:00 2001 -From: Nylon Chen -Date: Fri, 26 Apr 2019 15:56:39 +0800 -Subject: [PATCH] m4/stack-direction: NDS32 stack grows downward - -Signed-off-by: Nylon Chen ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index ffd4bce..a7df7ea 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -39,6 +39,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - mn10200 | \ - mn10300 | \ - nios2 | \ -+ nds32* | \ - ns32k | \ - pdp11 | \ - pj* | \ --- -2.18.0 - diff --git a/buildroot/package/libsigsegv/libsigsegv.hash b/buildroot/package/libsigsegv/libsigsegv.hash index 47ba35682..c827e6b86 100644 --- a/buildroot/package/libsigsegv/libsigsegv.hash +++ b/buildroot/package/libsigsegv/libsigsegv.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.12.tar.gz.sig -sha256 3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6 libsigsegv-2.12.tar.gz +# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.13.tar.gz.sig +sha256 be78ee4176b05f7c75ff03298d84874db90f4b6c9d5503f0da1226b3a3c48119 libsigsegv-2.13.tar.gz # Locally calculated -sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING +sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING diff --git a/buildroot/package/libsigsegv/libsigsegv.mk b/buildroot/package/libsigsegv/libsigsegv.mk index 28c061dd7..87a5d7a12 100644 --- a/buildroot/package/libsigsegv/libsigsegv.mk +++ b/buildroot/package/libsigsegv/libsigsegv.mk @@ -4,16 +4,11 @@ # ################################################################################ -LIBSIGSEGV_VERSION = 2.12 +LIBSIGSEGV_VERSION = 2.13 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPL-2.0+ LIBSIGSEGV_LICENSE_FILES = COPYING -# 0001-Improve-support-for-Linux-RISC-V.patch -# 0002-m4-stack-direction-RISC-V-stack-grows-downward.patch -# 0003-Improve-support-for-Linux-nds32.patch -# 0004-m4-stack-direction-NDS32-stack-grows-downward.patch -LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libsilk/libsilk.hash b/buildroot/package/libsilk/libsilk.hash index 6042096d8..14f667626 100644 --- a/buildroot/package/libsilk/libsilk.hash +++ b/buildroot/package/libsilk/libsilk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 01de52aa123f7bd20e500a076046f6b30d55f8e98c4029ab424bc51c46d7083d libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45.tar.gz -sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING +sha256 ac79eb4c154af25c0ab25e12d60d3b4165c399903fe88d82e066cf6d9827503e libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45-br1.tar.gz +sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING diff --git a/buildroot/package/libsocketcan/libsocketcan.hash b/buildroot/package/libsocketcan/libsocketcan.hash index 7e40493fb..c2ad23554 100644 --- a/buildroot/package/libsocketcan/libsocketcan.hash +++ b/buildroot/package/libsocketcan/libsocketcan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28923f47b3f3191ff966866aa45823325b6e3b4fce72f056e5d87d64e4d6699d libsocketcan-0.0.11.tar.bz2 -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE +sha256 be8280124707701935e6294d366e2474158b758fa4b2e3cae571d5b256d2fe34 libsocketcan-0.0.12.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/buildroot/package/libsocketcan/libsocketcan.mk b/buildroot/package/libsocketcan/libsocketcan.mk index dca8ede6e..0261b33c1 100644 --- a/buildroot/package/libsocketcan/libsocketcan.mk +++ b/buildroot/package/libsocketcan/libsocketcan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOCKETCAN_VERSION = 0.0.11 +LIBSOCKETCAN_VERSION = 0.0.12 LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2 LIBSOCKETCAN_INSTALL_STAGING = YES diff --git a/buildroot/package/libsoundtouch/libsoundtouch.hash b/buildroot/package/libsoundtouch/libsoundtouch.hash index aa33bb8a7..fe6a108e3 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.hash +++ b/buildroot/package/libsoundtouch/libsoundtouch.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a431facf019f37cc2da112156226d686e941b15d6327f3a41d7ca21dfaf8e94 libsoundtouch-2.1.2.tar.gz +sha256 f1ce96bac35779d3b752f4cc8696975b3d58f3deb9db47ffc45862767c2a2bdd libsoundtouch-2.2.tar.gz sha256 6b73f6327136a924821ec044bbd9f17cf8677faf2f2a2b1366a9fff6188c9688 COPYING.TXT diff --git a/buildroot/package/libsoundtouch/libsoundtouch.mk b/buildroot/package/libsoundtouch/libsoundtouch.mk index 9b040e391..98b5cc75b 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.mk +++ b/buildroot/package/libsoundtouch/libsoundtouch.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOUNDTOUCH_VERSION = 2.1.2 +LIBSOUNDTOUCH_VERSION = 2.2 LIBSOUNDTOUCH_SITE = https://gitlab.com/soundtouch/soundtouch/-/archive/$(LIBSOUNDTOUCH_VERSION) LIBSOUNDTOUCH_LICENSE = LGPL-2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT diff --git a/buildroot/package/libssh/libssh.mk b/buildroot/package/libssh/libssh.mk index 67e3ad9f9..eeb5d8489 100644 --- a/buildroot/package/libssh/libssh.mk +++ b/buildroot/package/libssh/libssh.mk @@ -10,15 +10,13 @@ LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 LIBSSH_LICENSE_FILES = COPYING +LIBSSH_CPE_ID_VENDOR = libssh LIBSSH_INSTALL_STAGING = YES LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF -# cmake older than 3.10 require this to avoid try_run() in FindThreads -LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else diff --git a/buildroot/package/libssh2/libssh2.mk b/buildroot/package/libssh2/libssh2.mk index c03fe0db5..6147583a9 100644 --- a/buildroot/package/libssh2/libssh2.mk +++ b/buildroot/package/libssh2/libssh2.mk @@ -8,6 +8,7 @@ LIBSSH2_VERSION = 1.9.0 LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING +LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build diff --git a/buildroot/package/libsvgtiny/libsvgtiny.hash b/buildroot/package/libsvgtiny/libsvgtiny.hash index 86096cef3..ba4b4cae9 100644 --- a/buildroot/package/libsvgtiny/libsvgtiny.hash +++ b/buildroot/package/libsvgtiny/libsvgtiny.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 082a2e8849f05e2364a942eec51a798d637c6eca44db8c73350a038ebd1fd268 libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06.tar.gz -sha256 92b965c77be71661cae51425a6b40a5ca274f44cc13c723c90fb471a9a26a828 README +sha256 917850350d014c953f2af0fb92f0eeb25652619710922d467c98f8109fb92baf libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06-br1.tar.gz +sha256 92b965c77be71661cae51425a6b40a5ca274f44cc13c723c90fb471a9a26a828 README diff --git a/buildroot/package/libsysfs/libsysfs.mk b/buildroot/package/libsysfs/libsysfs.mk index 13edc9a4e..6cff8bf5f 100644 --- a/buildroot/package/libsysfs/libsysfs.mk +++ b/buildroot/package/libsysfs/libsysfs.mk @@ -10,5 +10,7 @@ LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz LIBSYSFS_INSTALL_STAGING = YES LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library) LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL +LIBSYSFS_CPE_ID_VENDOR = sysfsutils_project +LIBSYSFS_CPE_ID_PRODUCT = sysfsutils $(eval $(autotools-package)) diff --git a/buildroot/package/libtasn1/libtasn1.mk b/buildroot/package/libtasn1/libtasn1.mk index d5a6c6996..a35471682 100644 --- a/buildroot/package/libtasn1/libtasn1.mk +++ b/buildroot/package/libtasn1/libtasn1.mk @@ -9,6 +9,7 @@ LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 LIBTASN1_DEPENDENCIES = host-bison host-pkgconf LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) LIBTASN1_LICENSE_FILES = LICENSE doc/COPYING doc/COPYING.LESSER +LIBTASN1_CPE_ID_VENDOR = gnu LIBTASN1_INSTALL_STAGING = YES # We're patching fuzz/Makefile.am diff --git a/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch deleted file mode 100644 index 101a779ad..000000000 --- a/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cb30579c9195ae29c82545c934e0bd9677262bce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 20 Dec 2019 17:58:17 +0100 -Subject: [PATCH] Disable parts of TIRPC requiring NIS support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" -[joerg.krause@embedded.rocks: update for 0.3.2] -Signed-off-by: Jörg Krause -[peda@axentia.se: update for 1.0.1] -Signed-off-by: Peter Rosin -[bernd.kuhls@t-online.de: update for 1.0.2] -Signed-off-by: Bernd Kuhls -[pvorel: update for 1.2.5] -Signed-off-by: Petr Vorel ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index b2d5436..864f984 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ - svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c debug.c -+ debug.c - - if AUTHDES - libtirpc_la_SOURCES += auth_des.c authdes_prot.c des_crypt.c des_impl.c des_soft.c svc_auth_des.c -@@ -45,8 +45,8 @@ if GSS - libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) - endif - --libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c -+#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -+#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in --- -2.24.0 - diff --git a/buildroot/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash index e43755428..337593bbe 100644 --- a/buildroot/package/libtirpc/libtirpc.hash +++ b/buildroot/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 f182235e32942fc0ac6b9b5b6fe7e32f69362659 libtirpc-1.2.6.tar.bz2 +sha1 882eaf4c13f0cafb83afd96cd2855638f978d755 libtirpc-1.3.1.tar.bz2 # Locally computed -sha256 4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc libtirpc-1.2.6.tar.bz2 -sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING +sha256 245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17 libtirpc-1.3.1.tar.bz2 +sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk index f1bdc32eb..e0c3d0e3f 100644 --- a/buildroot/package/libtirpc/libtirpc.mk +++ b/buildroot/package/libtirpc/libtirpc.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.2.6 +LIBTIRPC_VERSION = 1.3.1 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING +LIBTIRPC_CPE_ID_VALID = YES LIBTIRPC_DEPENDENCIES = host-nfs-utils LIBTIRPC_INSTALL_STAGING = YES diff --git a/buildroot/package/libtomcrypt/libtomcrypt.mk b/buildroot/package/libtomcrypt/libtomcrypt.mk index c2f1babb4..fccd4b051 100644 --- a/buildroot/package/libtomcrypt/libtomcrypt.mk +++ b/buildroot/package/libtomcrypt/libtomcrypt.mk @@ -9,6 +9,7 @@ LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/v$(LI LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.xz LIBTOMCRYPT_LICENSE = WTFPL LIBTOMCRYPT_LICENSE_FILES = LICENSE +LIBTOMCRYPT_CPE_ID_VENDOR = libtom LIBTOMCRYPT_INSTALL_STAGING = YES LIBTOMCRYPT_INSTALL_TARGET = NO # only static library LIBTOMCRYPT_DEPENDENCIES = libtommath diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 2246d8994..8198a1ff9 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc00069e65c0825cbe1eee5cdd26f94fcd9a621c4e7f791810b12fab64192f00 libtorrent-rasterbar-1.2.7.tar.gz +sha256 c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8 libtorrent-rasterbar-1.2.12.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 1d23f00b3..7f60252e9 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,10 +4,13 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.7 -LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent_$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) +LIBTORRENT_RASTERBAR_VERSION = 1.2.12 +LIBTORRENT_RASTERBAR_SITE = \ + https://github.com/arvidn/libtorrent/releases/download/v$(LIBTORRENT_RASTERBAR_VERSION) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING +LIBTORRENT_RASTERBAR_CPE_ID_VENDOR = libtorrent +LIBTORRENT_RASTERBAR_CPE_ID_PRODUCT = libtorrent LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ diff --git a/buildroot/package/libuci/libuci.hash b/buildroot/package/libuci/libuci.hash index d4c839eb8..b808810cc 100644 --- a/buildroot/package/libuci/libuci.hash +++ b/buildroot/package/libuci/libuci.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 bb9827863c6b7b6cf986a3de42b5716edb8a280e44b3ce39541de18062c3c00e libuci-49ec6efbdac4819033d34f08927d795f83a3932d.tar.gz +sha256 1ee875910bdf751807f10d44f6b6b7f9ec71c12d4c407a80bae5cb654d2ba4cc libuci-49ec6efbdac4819033d34f08927d795f83a3932d-br1.tar.gz diff --git a/buildroot/package/libudfread/libudfread.hash b/buildroot/package/libudfread/libudfread.hash index 71ee60b39..14d24b5db 100644 --- a/buildroot/package/libudfread/libudfread.hash +++ b/buildroot/package/libudfread/libudfread.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 93231b5b2158548481e6a129d27d3fb75518cc44a49ad27a2a229340a49e8c08 libudfread-1.1.0.tar.bz2 +sha256 529ffa189a6b9fbe08c77430bd18201007b9b20b3153ad92ebd5e1cc515e7151 libudfread-1.1.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libudfread/libudfread.mk b/buildroot/package/libudfread/libudfread.mk index 1861a1556..6803a918d 100644 --- a/buildroot/package/libudfread/libudfread.mk +++ b/buildroot/package/libudfread/libudfread.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUDFREAD_VERSION = 1.1.0 +LIBUDFREAD_VERSION = 1.1.1 LIBUDFREAD_SOURCE = libudfread-$(LIBUDFREAD_VERSION).tar.bz2 LIBUDFREAD_SITE = https://code.videolan.org/videolan/libudfread/-/archive/$(LIBUDFREAD_VERSION) LIBUDFREAD_AUTORECONF = YES diff --git a/buildroot/package/libuhttpd/0001-src-CMakeLists.txt-fix-static-build-with-a-zlib-and-.patch b/buildroot/package/libuhttpd/0001-src-CMakeLists.txt-fix-static-build-with-a-zlib-and-.patch deleted file mode 100644 index 289ed1aae..000000000 --- a/buildroot/package/libuhttpd/0001-src-CMakeLists.txt-fix-static-build-with-a-zlib-and-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0c2d85450e3eb77dfbe11e8612a5131c5f3f3938 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 1 Dec 2020 20:39:54 +0100 -Subject: [PATCH] src/CMakeLists.txt: fix static build with a zlib and mbedtls - -Static build with a zlib-enabled mbedtls fails on: - -[100%] Linking C executable example -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libmbedtls.a(ssl_tls.c.o): in function `mbedtls_ssl_transform_free.part.24': -ssl_tls.c:(.text+0xbc6): undefined reference to `deflateEnd' - -As mbedtls does not provide a pkg-config file, search for zlib and link -with it if necessary - -Fixes: - - http://autobuild.buildroot.org/results/5891d12e90182460cde1ddfa0ca75e9fd55e3dff - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/libuhttpd/pull/13] ---- - src/CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 132f243..f00fc8f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -57,6 +57,7 @@ else() - endif() - find_package(WolfSSL) - find_package(MbedTLS) -+ find_package(ZLIB) - - if(UHTTPD_USE_OPENSSL) - if (NOT OPENSSL_FOUND) -@@ -97,7 +98,11 @@ else() - elseif(UHTTPD_USE_MBEDTLS) - set(SSL_NAME "MbedTLS(PolarSSL)") - set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) -- set(SSL_LIB ${MBEDTLS_LIBRARIES}) -+ if(ZLIB_FOUND) -+ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) -+ else() -+ set(SSL_LIB ${MBEDTLS_LIBRARIES}) -+ endif() - set(UHTTPD_HAVE_MBEDTLS_CONFIG 1) - endif() - --- -2.29.2 - diff --git a/buildroot/package/libuhttpd/libuhttpd.hash b/buildroot/package/libuhttpd/libuhttpd.hash index 0e2d125fe..68f1f2173 100644 --- a/buildroot/package/libuhttpd/libuhttpd.hash +++ b/buildroot/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a7650915f4444c84ad7ea813fcff44ae03eaf0c4cddfd2de4dcbf5ce9083874f libuhttpd-3.4.2.tar.gz +sha256 9939cd5f9aaad2c118bc04417fb2d21994fb1cdca7fff475a0930a1374635af0 libuhttpd-3.9.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/buildroot/package/libuhttpd/libuhttpd.mk b/buildroot/package/libuhttpd/libuhttpd.mk index fe8621c80..a90fe666a 100644 --- a/buildroot/package/libuhttpd/libuhttpd.mk +++ b/buildroot/package/libuhttpd/libuhttpd.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.4.2 +LIBUHTTPD_VERSION = 3.9.0 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE LIBUHTTPD_INSTALL_STAGING = YES LIBUHTTPD_DEPENDENCIES = libev -LIBUHTTPD_CONF_OPTS = -DBUILD_TEST_PLUGIN=OFF ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUHTTPD_DEPENDENCIES += openssl diff --git a/buildroot/package/libunistring/libunistring.mk b/buildroot/package/libunistring/libunistring.mk index fa5144717..1ed7ecf90 100644 --- a/buildroot/package/libunistring/libunistring.mk +++ b/buildroot/package/libunistring/libunistring.mk @@ -10,6 +10,7 @@ LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0 LIBUNISTRING_LICENSE_FILES = COPYING COPYING.LIB +LIBUNISTRING_CPE_ID_VENDOR = gnu $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch b/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch deleted file mode 100644 index 035bdae80..000000000 --- a/buildroot/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b9627ed74ab1f58be0de075be68d5cd2e96b8750 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 3 May 2020 23:08:54 +0200 -Subject: [PATCH] Use sigset_t instead of __sigset_t on AArch64 - -This fixes the build with the musl C library. sigset_t is the -documented type exposed by . - -This fix comes from Alpine Linux: - - https://git.alpinelinux.org/aports/plain/main/libunwind/fix-aarch64-sigset_t.patch - -It was authored by Leo . - -The issue has been reported upstream at -https://github.com/libunwind/libunwind/issues/176. - -Signed-off-by: Thomas Petazzoni ---- - include/libunwind-aarch64.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h -index 778b4362..926fbbc0 100644 ---- a/include/libunwind-aarch64.h -+++ b/include/libunwind-aarch64.h -@@ -34,6 +34,7 @@ extern "C" { - #include - #include - #include -+#include - - #define UNW_TARGET aarch64 - #define UNW_TARGET_AARCH64 1 -@@ -192,7 +193,7 @@ typedef struct - unsigned long uc_flags; - struct ucontext *uc_link; - stack_t uc_stack; -- __sigset_t uc_sigmask; -+ sigset_t uc_sigmask; - struct unw_sigcontext uc_mcontext; - } unw_tdep_context_t; - --- -2.26.2 - diff --git a/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch b/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch deleted file mode 100644 index 5ef2aeb32..000000000 --- a/buildroot/package/libunwind/0003-Fix-compilation-with-fno-common.patch +++ /dev/null @@ -1,445 +0,0 @@ -From 29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e Mon Sep 17 00:00:00 2001 -From: Yichao Yu -Date: Tue, 31 Mar 2020 00:43:32 -0400 -Subject: [PATCH] Fix compilation with -fno-common. - -Making all other archs consistent with IA64 which should not have this problem. -Also move the FIXME to the correct place. - -Also add some minimum comments about this... -[Retrieved from: -https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e] -Signed-off-by: Fabrice Fontaine ---- - src/aarch64/Ginit.c | 15 +++++++-------- - src/arm/Ginit.c | 15 +++++++-------- - src/coredump/_UPT_get_dyn_info_list_addr.c | 5 +++++ - src/hppa/Ginit.c | 15 +++++++-------- - src/ia64/Ginit.c | 1 + - src/mi/Gfind_dynamic_proc_info.c | 1 + - src/mips/Ginit.c | 15 +++++++-------- - src/ppc32/Ginit.c | 11 +++++++---- - src/ppc64/Ginit.c | 11 +++++++---- - src/ptrace/_UPT_get_dyn_info_list_addr.c | 5 +++++ - src/s390x/Ginit.c | 15 +++++++-------- - src/sh/Ginit.c | 15 +++++++-------- - src/tilegx/Ginit.c | 15 +++++++-------- - src/x86/Ginit.c | 15 +++++++-------- - src/x86_64/Ginit.c | 15 +++++++-------- - 15 files changed, 89 insertions(+), 80 deletions(-) - -diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c -index dec235c82..35389762f 100644 ---- a/src/aarch64/Ginit.c -+++ b/src/aarch64/Ginit.c -@@ -61,13 +61,6 @@ tdep_uc_addr (unw_tdep_context_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -78,7 +71,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/arm/Ginit.c b/src/arm/Ginit.c -index 2720d063a..0bac0d72d 100644 ---- a/src/arm/Ginit.c -+++ b/src/arm/Ginit.c -@@ -57,18 +57,17 @@ tdep_uc_addr (unw_tdep_context_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/coredump/_UPT_get_dyn_info_list_addr.c b/src/coredump/_UPT_get_dyn_info_list_addr.c -index 0d1190556..739ed0569 100644 ---- a/src/coredump/_UPT_get_dyn_info_list_addr.c -+++ b/src/coredump/_UPT_get_dyn_info_list_addr.c -@@ -74,6 +74,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, - - #else - -+/* XXX fix me: there is currently no way to locate the dyn-info list -+ by a remote unwinder. On ia64, this is done via a special -+ unwind-table entry. Perhaps something similar can be done with -+ DWARF2 unwind info. */ -+ - static inline int - get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, - int *countp) -diff --git a/src/hppa/Ginit.c b/src/hppa/Ginit.c -index 461e4b93d..265455a68 100644 ---- a/src/hppa/Ginit.c -+++ b/src/hppa/Ginit.c -@@ -64,13 +64,6 @@ _Uhppa_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -81,7 +74,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/ia64/Ginit.c b/src/ia64/Ginit.c -index b09a2ad57..8601bb3ca 100644 ---- a/src/ia64/Ginit.c -+++ b/src/ia64/Ginit.c -@@ -68,6 +68,7 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - if (!_U_dyn_info_list_addr) - return -UNW_ENOINFO; - #endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. - *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } -diff --git a/src/mi/Gfind_dynamic_proc_info.c b/src/mi/Gfind_dynamic_proc_info.c -index 98d350128..2e7c62e5e 100644 ---- a/src/mi/Gfind_dynamic_proc_info.c -+++ b/src/mi/Gfind_dynamic_proc_info.c -@@ -49,6 +49,7 @@ local_find_proc_info (unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, - return -UNW_ENOINFO; - #endif - -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. - list = (unw_dyn_info_list_t *) (uintptr_t) _U_dyn_info_list_addr (); - for (di = list->first; di; di = di->next) - if (ip >= di->start_ip && ip < di->end_ip) -diff --git a/src/mips/Ginit.c b/src/mips/Ginit.c -index 3df170c75..bf7a8f5a8 100644 ---- a/src/mips/Ginit.c -+++ b/src/mips/Ginit.c -@@ -69,13 +69,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -86,7 +79,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c -index ba302448a..7b4545580 100644 ---- a/src/ppc32/Ginit.c -+++ b/src/ppc32/Ginit.c -@@ -91,9 +91,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -104,7 +101,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/ppc64/Ginit.c b/src/ppc64/Ginit.c -index 4c88cd6e7..7bfb395a7 100644 ---- a/src/ppc64/Ginit.c -+++ b/src/ppc64/Ginit.c -@@ -95,9 +95,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -108,7 +105,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/ptrace/_UPT_get_dyn_info_list_addr.c b/src/ptrace/_UPT_get_dyn_info_list_addr.c -index cc5ed0441..16671d453 100644 ---- a/src/ptrace/_UPT_get_dyn_info_list_addr.c -+++ b/src/ptrace/_UPT_get_dyn_info_list_addr.c -@@ -71,6 +71,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, - - #else - -+/* XXX fix me: there is currently no way to locate the dyn-info list -+ by a remote unwinder. On ia64, this is done via a special -+ unwind-table entry. Perhaps something similar can be done with -+ DWARF2 unwind info. */ -+ - static inline int - get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, - int *countp) -diff --git a/src/s390x/Ginit.c b/src/s390x/Ginit.c -index f0886ac93..db01743c0 100644 ---- a/src/s390x/Ginit.c -+++ b/src/s390x/Ginit.c -@@ -50,8 +50,6 @@ static struct unw_addr_space local_addr_space; - - unw_addr_space_t unw_local_addr_space = &local_addr_space; - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- - static inline void * - uc_addr (ucontext_t *uc, int reg) - { -@@ -75,11 +73,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -90,7 +83,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/sh/Ginit.c b/src/sh/Ginit.c -index 52988a721..9fe96d2bd 100644 ---- a/src/sh/Ginit.c -+++ b/src/sh/Ginit.c -@@ -58,13 +58,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -75,7 +68,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/tilegx/Ginit.c b/src/tilegx/Ginit.c -index 7564a558b..925e64132 100644 ---- a/src/tilegx/Ginit.c -+++ b/src/tilegx/Ginit.c -@@ -64,13 +64,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -81,7 +74,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c -index f6b8dc27d..3cec74a21 100644 ---- a/src/x86/Ginit.c -+++ b/src/x86/Ginit.c -@@ -54,13 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -71,7 +64,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - -diff --git a/src/x86_64/Ginit.c b/src/x86_64/Ginit.c -index a865d3385..fd8d418b1 100644 ---- a/src/x86_64/Ginit.c -+++ b/src/x86_64/Ginit.c -@@ -49,13 +49,6 @@ static struct unw_addr_space local_addr_space; - - unw_addr_space_t unw_local_addr_space = &local_addr_space; - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -66,7 +59,13 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - diff --git a/buildroot/package/libunwind/libunwind.hash b/buildroot/package/libunwind/libunwind.hash index e3709b1b1..de00c5998 100644 --- a/buildroot/package/libunwind/libunwind.hash +++ b/buildroot/package/libunwind/libunwind.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435 libunwind-1.4.0.tar.gz +sha256 90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 libunwind-1.5.0.tar.gz # Hash for license file sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/buildroot/package/libunwind/libunwind.mk b/buildroot/package/libunwind/libunwind.mk index a5bcec6be..abdec8676 100644 --- a/buildroot/package/libunwind/libunwind.mk +++ b/buildroot/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNWIND_VERSION = 1.4.0 +LIBUNWIND_VERSION = 1.5.0 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING diff --git a/buildroot/package/libupnp/libupnp.mk b/buildroot/package/libupnp/libupnp.mk index d44abe279..ebc5e8376 100644 --- a/buildroot/package/libupnp/libupnp.mk +++ b/buildroot/package/libupnp/libupnp.mk @@ -12,6 +12,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause LIBUPNP_LICENSE_FILES = COPYING +LIBUPNP_CPE_ID_VALID = YES LIBUPNP_DEPENDENCIES = host-pkgconf # Bind the internal miniserver socket with reuseaddr to allow clean restarts. diff --git a/buildroot/package/libupnpp/libupnpp.hash b/buildroot/package/libupnpp/libupnpp.hash index 029e33151..ae79cfe8a 100644 --- a/buildroot/package/libupnpp/libupnpp.hash +++ b/buildroot/package/libupnpp/libupnpp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.19.4.tar.gz.sha256 -sha256 29d1d07d44c8f79573e64e093ad8f0f883b11ef9eb3642a67aa703c1dde60576 libupnpp-0.19.4.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.20.2.tar.gz.sha256 +sha256 48c2cc7b5a3eef55f4dddda88d8676ed11f7e88f1d6680c8458512067a0e0a11 libupnpp-0.20.2.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/buildroot/package/libupnpp/libupnpp.mk b/buildroot/package/libupnpp/libupnpp.mk index fc4599ebc..4ee98b01c 100644 --- a/buildroot/package/libupnpp/libupnpp.mk +++ b/buildroot/package/libupnpp/libupnpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.19.4 +LIBUPNPP_VERSION = 0.20.2 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING diff --git a/buildroot/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/buildroot/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch new file mode 100644 index 000000000..601b322e5 --- /dev/null +++ b/buildroot/package/libusb/0001-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch @@ -0,0 +1,62 @@ +From 623e2a995d156e115c91f56a3ec691bdc333df8b Mon Sep 17 00:00:00 2001 +From: Chris Dickens +Date: Sun, 13 Dec 2020 15:49:19 -0800 +Subject: [PATCH 1/1] linux_usbfs: Fix parsing of descriptors for + multi-configuration devices + +Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device +initialization") introduced a regression for devices with multiple +configurations. The logic that verifies the reported length of the +configuration descriptors failed to count the length of the +configuration descriptor itself and would truncate the actual length by +9 bytes, leading to a parsing error for subsequent descriptors. + +Closes #825 + +Signed-off-by: Chris Dickens +(cherry picked from commit f6d2cb561402c3b6d3627c0eb89e009b503d9067) +Signed-off-by: John Keeping +--- + libusb/os/linux_usbfs.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index fb2ed53..4d2dc8d 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, + uint8_t *buffer, size_t len) + { + struct usbi_descriptor_header *header; +- int offset = 0; ++ int offset; ++ ++ /* Start seeking past the config descriptor */ ++ offset = LIBUSB_DT_CONFIG_SIZE; ++ buffer += LIBUSB_DT_CONFIG_SIZE; ++ len -= LIBUSB_DT_CONFIG_SIZE; + + while (len > 0) { + if (len < 2) { +@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) + } + + if (priv->sysfs_dir) { +- /* ++ /* + * In sysfs wTotalLength is ignored, instead the kernel returns a + * config descriptor with verified bLength fields, with descriptors + * with an invalid bLength removed. +@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) + int offset; + + if (num_configs > 1 && idx < num_configs - 1) { +- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, +- remaining - LIBUSB_DT_CONFIG_SIZE); ++ offset = seek_to_next_config(ctx, buffer, remaining); + if (offset < 0) + return offset; + sysfs_config_len = (uint16_t)offset; +-- +2.30.1 + diff --git a/buildroot/package/libusb/Config.in b/buildroot/package/libusb/Config.in index d31a717fd..5a04ac128 100644 --- a/buildroot/package/libusb/Config.in +++ b/buildroot/package/libusb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUSB bool "libusb" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Thread_local help Userspace library for accessing USB devices @@ -13,5 +14,6 @@ config BR2_PACKAGE_LIBUSB_EXAMPLES endif -comment "libusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libusb needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libusb/libusb.hash b/buildroot/package/libusb/libusb.hash index 272dfb087..6169a186a 100644 --- a/buildroot/package/libusb/libusb.hash +++ b/buildroot/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d libusb-1.0.23.tar.bz2 -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a libusb-1.0.24.tar.bz2 +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libusb/libusb.mk b/buildroot/package/libusb/libusb.mk index ddc6b27b6..26e91e3da 100644 --- a/buildroot/package/libusb/libusb.mk +++ b/buildroot/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).23 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).24 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/buildroot/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch new file mode 100644 index 000000000..197dd1de0 --- /dev/null +++ b/buildroot/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -0,0 +1,34 @@ +From bb71b21eb9407479ad729b3c858b0fc350fae335 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Feb 2021 19:39:59 +0100 +Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE + +Allow the user to disable example + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 110d933..c52ab79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8) + + project(libuwsc C) + ++option(BUILD_EXAMPLE "Build example" ON) ++ + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/") + + add_subdirectory(src) +-add_subdirectory(example) ++if(BUILD_EXAMPLE) ++ add_subdirectory(example) ++endif() +-- +2.25.1 + diff --git a/buildroot/package/libva-utils/libva-utils.hash b/buildroot/package/libva-utils/libva-utils.hash index a83e28389..349fcc42a 100644 --- a/buildroot/package/libva-utils/libva-utils.hash +++ b/buildroot/package/libva-utils/libva-utils.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva-utils/releases/download/2.8.0/libva-utils-2.8.0.tar.bz2.sha1sum -sha1 10351adf67aa03f5eeb54cb0aab3e2631ba4d102 libva-utils-2.8.0.tar.bz2 +# From https://github.com/intel/libva-utils/releases/download/2.10.0/libva-utils-2.10.0.tar.bz2.sha1sum +sha1 083a31354d2d49a4b9b8d4bccd6e7b77fc447154 libva-utils-2.10.0.tar.bz2 # Locally computed -sha256 8acad2c16bfef408643cf4de56c324345449f202e4a3a5b012a62a1d3af400ef libva-utils-2.8.0.tar.bz2 +sha256 33f06929faa395f55ec816432679219c56d70850bf465c848f0418e8a4f0352b libva-utils-2.10.0.tar.bz2 sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/buildroot/package/libva-utils/libva-utils.mk b/buildroot/package/libva-utils/libva-utils.mk index 5d3fb95c4..4634ba4eb 100644 --- a/buildroot/package/libva-utils/libva-utils.mk +++ b/buildroot/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.8.0 +LIBVA_UTILS_VERSION = 2.10.0 LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) LIBVA_UTILS_LICENSE = MIT diff --git a/buildroot/package/libva/libva.hash b/buildroot/package/libva/libva.hash index f40599c71..80f7d3c06 100644 --- a/buildroot/package/libva/libva.hash +++ b/buildroot/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.9.0/libva-2.9.0.tar.bz2.sha1sum -sha1 3e20605243096b4e935e1ef6ac7797efbacc44f6 libva-2.9.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.10.0/libva-2.10.0.tar.bz2.sha1sum +sha1 c33459efcab503eea89379bb627ef8a8f497b5b4 libva-2.10.0.tar.bz2 # Locally computed -sha256 e344c1392dde92696c9ffd9cb3c7277d0a3b912236eb4e0fdedf7f375434584b libva-2.9.0.tar.bz2 +sha256 fa81e35b50d9818fce5ec9eeeeff08a24a8864ceeb9a5c8e7ae4446eacfc0236 libva-2.10.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/buildroot/package/libva/libva.mk b/buildroot/package/libva/libva.mk index 75d26fa7f..0ec6b1286 100644 --- a/buildroot/package/libva/libva.mk +++ b/buildroot/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.9.0 +LIBVA_VERSION = 2.10.0 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT diff --git a/buildroot/package/libvncserver/libvncserver.mk b/buildroot/package/libvncserver/libvncserver.mk index 23ab40b7e..db38e7d3c 100644 --- a/buildroot/package/libvncserver/libvncserver.mk +++ b/buildroot/package/libvncserver/libvncserver.mk @@ -9,6 +9,7 @@ LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING +LIBVNCSERVER_CPE_ID_VALID = YES LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON diff --git a/buildroot/package/libwebsockets/Config.in b/buildroot/package/libwebsockets/Config.in index 1d927bb4e..dff6688e8 100644 --- a/buildroot/package/libwebsockets/Config.in +++ b/buildroot/package/libwebsockets/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBWEBSOCKETS minimal CPU and memory resources, and provide fast throughput in both directions. - http://libwebsockets.org/ + https://libwebsockets.org/ diff --git a/buildroot/package/libwebsockets/libwebsockets.hash b/buildroot/package/libwebsockets/libwebsockets.hash index 396337071..1761a7658 100644 --- a/buildroot/package/libwebsockets/libwebsockets.hash +++ b/buildroot/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a26d243f2642a9b810e7d91f1e66b149d1da978decdca58ce1c9218c454f397e libwebsockets-4.0.20.tar.gz +sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE diff --git a/buildroot/package/libwebsockets/libwebsockets.mk b/buildroot/package/libwebsockets/libwebsockets.mk index 8e6d02205..6f752f998 100644 --- a/buildroot/package/libwebsockets/libwebsockets.mk +++ b/buildroot/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.0.20 +LIBWEBSOCKETS_VERSION = 4.0.21 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk index e9379b05a..e472970fd 100644 --- a/buildroot/package/libxml2/libxml2.mk +++ b/buildroot/package/libxml2/libxml2.mk @@ -15,6 +15,7 @@ LIBXML2_IGNORE_CVES += CVE-2020-7595 LIBXML2_IGNORE_CVES += CVE-2019-20388 # 0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch LIBXML2_IGNORE_CVES += CVE-2020-24977 +LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config # relocation truncated to fit: R_68K_GOT16O diff --git a/buildroot/package/libxslt/libxslt.mk b/buildroot/package/libxslt/libxslt.mk index 2f37f303a..3c603ad9f 100644 --- a/buildroot/package/libxslt/libxslt.mk +++ b/buildroot/package/libxslt/libxslt.mk @@ -9,6 +9,7 @@ LIBXSLT_SITE = http://xmlsoft.org/sources LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING +LIBXSLT_CPE_ID_VENDOR = xmlsoft LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ diff --git a/buildroot/package/libyang/libyang.hash b/buildroot/package/libyang/libyang.hash index d318ecb9d..bc9e948c0 100644 --- a/buildroot/package/libyang/libyang.hash +++ b/buildroot/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1a5637451b73c4c5683837eb4c51371bb084795f653bc1a5fc20fed5541b58bc libyang-1.0.184.tar.gz +sha256 c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9 libyang-1.0.215.tar.gz sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/buildroot/package/libyang/libyang.mk b/buildroot/package/libyang/libyang.mk index 779c440e2..ee24256be 100644 --- a/buildroot/package/libyang/libyang.mk +++ b/buildroot/package/libyang/libyang.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.184 +LIBYANG_VERSION = 1.0.215 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE LIBYANG_INSTALL_STAGING = YES +LIBYANG_CPE_ID_VENDOR = cesnet LIBYANG_SUPPORTS_IN_SOURCE_BUILD = NO LIBYANG_DEPENDENCIES = pcre HOST_LIBYANG_DEPENDENCIES = host-pcre diff --git a/buildroot/package/libyuv/libyuv.hash b/buildroot/package/libyuv/libyuv.hash index e0d4e57e1..4b70e63ad 100644 --- a/buildroot/package/libyuv/libyuv.hash +++ b/buildroot/package/libyuv/libyuv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 395075bed7e048f5f7d4fe9cb9255ce0afcee3f8f093741a7af1a2b1c579d089 libyuv-413a8d8041f1cc5a350a47c0d81cc721e64f9fd0.tar.gz -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f LICENSE +sha256 7bb4118ef050ca3e9a27f49b7d21e068922bf57cf973f2c7b1476cadf73ac66a libyuv-413a8d8041f1cc5a350a47c0d81cc721e64f9fd0-br1.tar.gz +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f LICENSE diff --git a/buildroot/package/libzip/libzip.mk b/buildroot/package/libzip/libzip.mk index 9d64db32f..4a028f970 100644 --- a/buildroot/package/libzip/libzip.mk +++ b/buildroot/package/libzip/libzip.mk @@ -9,6 +9,7 @@ LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause LIBZIP_LICENSE_FILES = LICENSE +LIBZIP_CPE_ID_VENDOR = libzip LIBZIP_INSTALL_STAGING = YES LIBZIP_DEPENDENCIES = zlib HOST_LIBZIP_DEPENDENCIES = host-zlib diff --git a/buildroot/package/libzlib/libzlib.mk b/buildroot/package/libzlib/libzlib.mk index eea0c12f2..a10fc748d 100644 --- a/buildroot/package/libzlib/libzlib.mk +++ b/buildroot/package/libzlib/libzlib.mk @@ -11,6 +11,8 @@ LIBZLIB_LICENSE = Zlib LIBZLIB_LICENSE_FILES = README LIBZLIB_INSTALL_STAGING = YES LIBZLIB_PROVIDES = zlib +LIBZLIB_CPE_ID_VENDOR = gnu +LIBZLIB_CPE_ID_PRODUCT = zlib # It is not possible to build only a shared version of zlib, so we build both # shared and static, unless we only want the static libs, and we eventually diff --git a/buildroot/package/lighttpd/0001-Fix-default-config-file.patch b/buildroot/package/lighttpd/0001-Fix-default-config-file.patch index ada158976..47a859770 100644 --- a/buildroot/package/lighttpd/0001-Fix-default-config-file.patch +++ b/buildroot/package/lighttpd/0001-Fix-default-config-file.patch @@ -3,8 +3,6 @@ Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames * Disable IPv6 * Do not setuid to a user that doesn't exist on the system - * Disable pdf ranges fix for Adobe Reader since it uses regex and we - don't always have pcre support * Change the network backend to writev since linux-sendfile fails on buildroot Signed-off-by: Maxime Ripard @@ -35,7 +33,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con -var.server_root = "/srv/www" +var.log_root = "/var/log" +var.server_root = "/var/www" - var.state_dir = "/var/run" + var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" @@ -90,7 +90,7 @@ @@ -56,9 +54,9 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con +server.username = "www-data" +server.groupname = "www-data" - ## - ## enable core files. -@@ -112,7 +112,7 @@ + ## + ## Enable lighttpd to serve requests on sockets received from systemd +@@ -118,7 +118,7 @@ ## ## Document root ## @@ -67,7 +65,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## The value for the "Server:" response field. -@@ -138,7 +138,7 @@ +@@ -144,7 +144,7 @@ ## ## Path to the error log file ## @@ -76,7 +74,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## If you want to log to syslog you have to unset the -@@ -188,7 +188,7 @@ +@@ -195,7 +195,7 @@ ## sendfile - is recommended for small files. ## writev - is recommended for sending many large files ## @@ -85,16 +83,3 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con ## ## As lighttpd is a single-threaded server, its main resource limit is -@@ -311,9 +311,9 @@ - ## disable range requests for pdf files - ## workaround for a bug in the Acrobat Reader plugin. - ## --$HTTP["url"] =~ "\.pdf$" { -- server.range-requests = "disable" --} -+# $HTTP["url"] =~ "\.pdf$" { -+# server.range-requests = "disable" -+# } - - ## - ## url handling modules (rewrite, redirect) diff --git a/buildroot/package/lighttpd/Config.in b/buildroot/package/lighttpd/Config.in index 7d7566362..e9a5aa34f 100644 --- a/buildroot/package/lighttpd/Config.in +++ b/buildroot/package/lighttpd/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_LIGHTTPD webserver-software for every server that is suffering load problems. - http://www.lighttpd.net/ + https://www.lighttpd.net/ if BR2_PACKAGE_LIGHTTPD diff --git a/buildroot/package/lighttpd/lighttpd.hash b/buildroot/package/lighttpd/lighttpd.hash index 7f20bf9dc..0a7cdfe3b 100644 --- a/buildroot/package/lighttpd/lighttpd.hash +++ b/buildroot/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.sha256sum -sha256 6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927 lighttpd-1.4.55.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.sha256sum +sha256 267feffda13a190ebdce7b15172d8be16da98008457f30fddecd72832d126d0e lighttpd-1.4.58.tar.xz # Locally calculated -sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING +sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/buildroot/package/lighttpd/lighttpd.mk b/buildroot/package/lighttpd/lighttpd.mk index 7181465c6..028ff17aa 100644 --- a/buildroot/package/lighttpd/lighttpd.mk +++ b/buildroot/package/lighttpd/lighttpd.mk @@ -5,11 +5,12 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).55 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).58 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause LIGHTTPD_LICENSE_FILES = COPYING +LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf LIGHTTPD_CONF_OPTS = \ --without-wolfssl \ diff --git a/buildroot/package/links/links.mk b/buildroot/package/links/links.mk index 815b4dd73..5213e02bd 100644 --- a/buildroot/package/links/links.mk +++ b/buildroot/package/links/links.mk @@ -10,6 +10,7 @@ LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf LINKS_LICENSE = GPL-2.0+ LINKS_LICENSE_FILES = COPYING +LINKS_CPE_ID_VENDOR = twibright ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics diff --git a/buildroot/package/linphone/Config.in b/buildroot/package/linphone/Config.in index c7683b829..3fe25c165 100644 --- a/buildroot/package/linphone/Config.in +++ b/buildroot/package/linphone/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LINPHONE # belr, belle-sip, mediastreamer depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on BR2_USE_WCHAR # belle-sip + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # mediastreamer select BR2_PACKAGE_BELLE_SIP select BR2_PACKAGE_BELR select BR2_PACKAGE_LIBXML2 @@ -30,10 +31,11 @@ config BR2_PACKAGE_LINPHONE http://www.linphone.org/ -comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar" +comment "linphone needs a toolchain w/ threads, C++, dynamic library, wchar, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "linphone needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/linphone/linphone.hash b/buildroot/package/linphone/linphone.hash index 9aa03078d..6d456ac9c 100644 --- a/buildroot/package/linphone/linphone.hash +++ b/buildroot/package/linphone/linphone.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 bfb195845ae23311667d5631c470310a63818fe46029cea2f1b77a5ed84e6e21 linphone-4.3.1.tar.gz +sha256 9956f6785a787041328da000cee5fcc1e41d6f17956ffe5e0402fac0f9a9676b linphone-4.4.8.tar.gz # Locally computed sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/linphone/linphone.mk b/buildroot/package/linphone/linphone.mk index 9fd69670e..bb79e2f78 100644 --- a/buildroot/package/linphone/linphone.mk +++ b/buildroot/package/linphone/linphone.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINPHONE_VERSION = 4.3.1 +LINPHONE_VERSION = 4.4.8 LINPHONE_SITE = \ https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$(LINPHONE_VERSION) LINPHONE_CONF_OPTS = \ @@ -18,7 +18,8 @@ LINPHONE_CONF_OPTS = \ -DENABLE_TUTORIALS=OFF \ -DENABLE_UNIT_TESTS=OFF \ -DENABLE_VCARD=OFF \ - -DENABLE_VIDEO=OFF + -DENABLE_VIDEO=OFF \ + -DGIT_EXECUTABLE=OFF LINPHONE_INSTALL_STAGING = YES LINPHONE_DEPENDENCIES = \ belle-sip \ diff --git a/buildroot/package/linux-backports/Config.in b/buildroot/package/linux-backports/Config.in index 362e6e4bc..251d202fd 100644 --- a/buildroot/package/linux-backports/Config.in +++ b/buildroot/package/linux-backports/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LINUX_BACKPORTS recent kernels, backported to older ones. This version of linux-backports supports kernels starting - from 3.0. + from 3.10. https://backports.wiki.kernel.org diff --git a/buildroot/package/linux-backports/linux-backports.hash b/buildroot/package/linux-backports/linux-backports.hash index f39bc2ed2..3e103424f 100644 --- a/buildroot/package/linux-backports/linux-backports.hash +++ b/buildroot/package/linux-backports/linux-backports.hash @@ -1,4 +1,6 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc -sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc +sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz # Locally computed -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING +sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING +sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 diff --git a/buildroot/package/linux-backports/linux-backports.mk b/buildroot/package/linux-backports/linux-backports.mk index 1827ee18b..068dcffcc 100644 --- a/buildroot/package/linux-backports/linux-backports.mk +++ b/buildroot/package/linux-backports/linux-backports.mk @@ -4,12 +4,15 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 +LINUX_BACKPORTS_VERSION_MAJOR = 5.8 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) LINUX_BACKPORTS_LICENSE = GPL-2.0 -LINUX_BACKPORTS_LICENSE_FILES = COPYING +LINUX_BACKPORTS_LICENSE_FILES = \ + COPYING \ + LICENSES/exceptions/Linux-syscall-note \ + LICENSES/preferred/GPL-2.0 # flex and bison are needed to generate kconfig parser. We use the # same logic as the linux kernel (we add host dependencies only if @@ -91,7 +94,7 @@ $(eval $(kconfig-package)) # instead. # # Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.0. To avoid overriding linux-backports' +# only supports kernels >= 3.10. To avoid overriding linux-backports' # KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we # use an intermediate stamp-file. # @@ -103,10 +106,12 @@ $(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKP .SECONDEXPANSION: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) - $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ - if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ - "$${LINUX_VERSION_PROBED}"; \ + $(Q)KVER=$(LINUX_VERSION_PROBED); \ + KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ + KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ + if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ + "$${KVER}"; \ exit 1; \ fi $(Q)touch $(@) diff --git a/buildroot/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in index 40df95351..a41310ff2 100644 --- a/buildroot/package/linux-firmware/Config.in +++ b/buildroot/package/linux-firmware/Config.in @@ -44,11 +44,10 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO help Firmware files for Qualcomm Adreno GPU firmware - config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8 - bool "Samsung MFC video encoder/decoder driver v8" + bool "Samsung MFC video encoder/decoder v8 firmware" help - Firmware files for samsung MFC video encoder/decoder driver v8 + Firmware files for Samsung MFC video encoder/decoder driver v8 endmenu # Video @@ -381,6 +380,12 @@ endmenu menu "Ethernet firmware" +config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 + bool "Broadcom NetXtreme/Tigon3" + help + Firmware files for Broadcom Tigon3 ethernet cards + (tigon) + config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X bool "Broadcom NetXtremeII" help @@ -454,15 +459,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XCx000 endmenu -menu "SoC Firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA - bool "Freescale i.MX SDMA" - help - Firmware files for i.MX SDMA. - -endmenu - menu "Fibre Channel Adapter Firmware" config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX diff --git a/buildroot/package/linux-firmware/linux-firmware.hash b/buildroot/package/linux-firmware/linux-firmware.hash index 2ebd11365..12af68f2d 100644 --- a/buildroot/package/linux-firmware/linux-firmware.hash +++ b/buildroot/package/linux-firmware/linux-firmware.hash @@ -1,35 +1,35 @@ # Locally calculated -sha256 83646c58fc4e3ee9a73f4fa74213c849109f48c719322346393f3e5b0fa55044 linux-firmware-20200122.tar.gz -sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu -sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell -sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware -sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt -sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt -sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx -sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware -sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 -sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware -sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x -sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware -sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip -sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware -sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx -sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt -sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware -sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt -sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE.ti-connectivity -sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 -sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 -sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c -sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k -sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k -sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 -sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 -sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom -sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon -sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 74d203d2fd433b73b63e8e31d8928e3817f6eaf3407c9e607802c20a5c02e6c4 WHENCE -sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt -sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 +sha256 f97d6d884026c5e3641909946713dcfea580c307d47830d37d42bfcc9a93870a linux-firmware-20201022-br1.tar.gz +sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis +sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell +sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware +sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt +sha256 631065703055d11b099477c508508f20a80b202aad548a7726564bfa59a96c91 ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt +sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware +sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 +sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware +sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x +sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware +sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip +sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware +sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx +sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt +sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware +sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt +sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE.ti-connectivity +sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 +sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 +sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c +sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k +sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k +sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 +sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 +sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom +sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon +sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware +sha256 18313654864adbb76514e21566528ce57eff42a2a7a66d5823f1f91e895816ea WHENCE +sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt +sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/buildroot/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk index f00fb2e6a..f23da171c 100644 --- a/buildroot/package/linux-firmware/linux-firmware.mk +++ b/buildroot/package/linux-firmware/linux-firmware.mk @@ -4,10 +4,12 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20200122 +LINUX_FIRMWARE_VERSION = 20201022 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git +LINUX_FIRMWARE_CPE_ID_VENDOR = kernel + # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master @@ -40,7 +42,12 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y) -LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw +LINUX_FIRMWARE_FILES += \ + s5p-mfc.fw \ + s5p-mfc-v6.fw \ + s5p-mfc-v6-v2.fw \ + s5p-mfc-v7.fw \ + s5p-mfc-v8.fw # No license file; the license is in the file WHENCE # which is installed unconditionally endif @@ -57,12 +64,6 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom endif -# Freescale i.MX SDMA -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA),y) -LINUX_FIRMWARE_FILES += imx/sdma/sdma-imx6q.bin imx/sdma/sdma-imx7d.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.sdma_firmware -endif - # rt2501/rt61 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin @@ -199,7 +200,8 @@ ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377),y) LINUX_FIRMWARE_FILES += ath10k/QCA9377/hw1.0/board-2.bin \ ath10k/QCA9377/hw1.0/board.bin \ ath10k/QCA9377/hw1.0/firmware-5.bin \ - ath10k/QCA9377/hw1.0/firmware-6.bin + ath10k/QCA9377/hw1.0/firmware-6.bin \ + ath10k/QCA9377/hw1.0/firmware-sdio-5.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif @@ -455,6 +457,12 @@ LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) +LINUX_FIRMWARE_FILES += tigon/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE @@ -621,9 +629,13 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y) -LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw -# No license file; the license is in the file WHENCE +LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw \ + mts_cdma.fw mts_gsm.fw mts_edge.fw mts_mt9234mu.fw mts_mt9234zba.fw \ + moxa/moxa-1110.fw moxa/moxa-1130.fw moxa/moxa-1131.fw \ + moxa/moxa-1150.fw moxa/moxa-1151.fw +# Some firmware's license is in the file WHENCE # which is installed unconditionally +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.moxa endif ifneq ($(LINUX_FIRMWARE_FILES),) diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 935b22226..8da119cfa 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_9 + default BR2_KERNEL_HEADERS_5_10 help Select the kernel version to get headers from. @@ -54,13 +54,9 @@ config BR2_KERNEL_HEADERS_5_4 bool "Linux 5.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -config BR2_KERNEL_HEADERS_5_8 - bool "Linux 5.8.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 - -config BR2_KERNEL_HEADERS_5_9 - bool "Linux 5.9.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 +config BR2_KERNEL_HEADERS_5_10 + bool "Linux 5.10.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -135,8 +131,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10 + bool "5.10.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 - bool "5.9.x or later" + bool "5.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8 @@ -346,13 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.253" if BR2_KERNEL_HEADERS_4_4 - default "4.9.253" if BR2_KERNEL_HEADERS_4_9 - default "4.14.217" if BR2_KERNEL_HEADERS_4_14 - default "4.19.171" if BR2_KERNEL_HEADERS_4_19 - default "5.4.93" if BR2_KERNEL_HEADERS_5_4 - default "5.8.18" if BR2_KERNEL_HEADERS_5_8 - default "5.9.16" if BR2_KERNEL_HEADERS_5_9 + default "4.4.255" if BR2_KERNEL_HEADERS_4_4 + default "4.9.255" if BR2_KERNEL_HEADERS_4_9 + default "4.14.219" if BR2_KERNEL_HEADERS_4_14 + default "4.19.173" if BR2_KERNEL_HEADERS_4_19 + default "5.4.95" if BR2_KERNEL_HEADERS_5_4 + default "5.10.13" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/linux-headers/linux-headers.mk b/buildroot/package/linux-headers/linux-headers.mk index 4c3cb716b..a8d1c2cca 100644 --- a/buildroot/package/linux-headers/linux-headers.mk +++ b/buildroot/package/linux-headers/linux-headers.mk @@ -18,6 +18,10 @@ LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION) +ifneq ($(LINUX_HEADERS_OVERRIDE_SRCDIR),) +$(error LINUX_HEADERS_OVERRIDE_SRCDIR must not be set when BR2_KERNEL_HEADERS_AS_KERNEL=y) +endif +LINUX_HEADERS_OVERRIDE_SRCDIR = $(LINUX_OVERRIDE_SRCDIR) else # ! BR2_KERNEL_HEADERS_AS_KERNEL LINUX_HEADERS_CUSTOM_TARBALL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL)) LINUX_HEADERS_CUSTOM_GIT = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_GIT)) @@ -34,7 +38,7 @@ ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))) else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_git).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = git else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y) @@ -42,7 +46,7 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = hg else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_svn).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = svn else ifeq ($(LINUX_HEADERS_CIP),y) @@ -102,6 +106,8 @@ LINUX_HEADERS_LICENSE_FILES = \ LICENSES/preferred/GPL-2.0 \ LICENSES/exceptions/Linux-syscall-note endif +LINUX_HEADERS_CPE_ID_VENDOR = linux +LINUX_HEADERS_CPE_ID_PRODUCT = linux_kernel LINUX_HEADERS_INSTALL_STAGING = YES diff --git a/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch b/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch deleted file mode 100644 index ebcb81aa9..000000000 --- a/buildroot/package/linux-pam/0001-configure-ac-fix-build-failure-when-crypt-does-not-require-libcrypt.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aef363c7e8e942224e6cffc4398366c6e5d31749 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Jun 2020 00:04:32 +0200 -Subject: [PATCH] configure.ac: fix build failure when crypt() does not require - libcrypt - -Since commit 522246d20e4cd92fadc2d760228cb7e78cbeb4c5, the build fails -if "none required" is returned by AC_SEARCH_LIBS for libcrypt. - -Resolves: https://github.com/linux-pam/linux-pam/pull/235 -Fixes: http://autobuild.buildroot.org/results/92b3dd7c984d2b843ac9aacacd69eec99f28743e -Fixes: v1.4.0~228 ("Use cached 'crypt' library result correctly") - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/aef363c7e8e942224e6cffc4398366c6e5d31749] ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ea08a7a3..c1862ea7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -428,7 +428,11 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], - [crypt_libs="crypt"]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_cv_search_crypt}", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs]) -+case "$ac_cv_search_crypt" in -+ -l*) LIBCRYPT="$ac_cv_search_crypt" ;; -+ *) LIBCRYPT="" ;; -+esac - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) diff --git a/buildroot/package/linux-pam/0002-fix-build-on-musl.patch b/buildroot/package/linux-pam/0002-fix-build-on-musl.patch deleted file mode 100644 index 44fceccc8..000000000 --- a/buildroot/package/linux-pam/0002-fix-build-on-musl.patch +++ /dev/null @@ -1,320 +0,0 @@ -From 295bf7403364b23ab03287ecdd95ea266d6f4d89 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Jun 2020 17:39:03 +0200 -Subject: [PATCH] fix build on musl - -Rename check_user_in_passwd from pam_localuser.c to -pam_modutil_check_user_in_passwd and use it in pam_faillock.c instead of -fgetpwent_r which is not available on musl - -Fix #236 - -Fixes: - - http://autobuild.buildroot.org/results/0432736ffee376dd84757469434a4bbcfdcdaf4b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/linux-pam/linux-pam/pull/237] ---- - libpam/Makefile.am | 1 + - libpam/include/security/pam_modutil.h | 5 ++ - libpam/libpam.map | 5 ++ - libpam/pam_modutil_check_user_in_passwd.c | 89 +++++++++++++++++++++++ - modules/pam_faillock/pam_faillock.c | 37 +--------- - modules/pam_localuser/pam_localuser.c | 86 +--------------------- - 6 files changed, 103 insertions(+), 120 deletions(-) - create mode 100644 libpam/pam_modutil_check_user_in_passwd.c - -diff --git a/libpam/Makefile.am b/libpam/Makefile.am -index 9252a837..a8fc428d 100644 ---- a/libpam/Makefile.am -+++ b/libpam/Makefile.am -@@ -35,6 +35,7 @@ libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \ - pam_misc.c pam_password.c pam_prelude.c \ - pam_session.c pam_start.c pam_strerror.c \ - pam_vprompt.c pam_syslog.c pam_dynamic.c pam_audit.c \ -+ pam_modutil_check_user_in_passwd.c \ - pam_modutil_cleanup.c pam_modutil_getpwnam.c pam_modutil_ioloop.c \ - pam_modutil_getgrgid.c pam_modutil_getpwuid.c pam_modutil_getgrnam.c \ - pam_modutil_getspnam.c pam_modutil_getlogin.c pam_modutil_ingroup.c \ -diff --git a/libpam/include/security/pam_modutil.h b/libpam/include/security/pam_modutil.h -index 3a6aec6a..33f87b90 100644 ---- a/libpam/include/security/pam_modutil.h -+++ b/libpam/include/security/pam_modutil.h -@@ -58,6 +58,11 @@ extern "C" { - - #include - -+extern int PAM_NONNULL((1,2)) -+pam_modutil_check_user_in_passwd(pam_handle_t *pamh, -+ const char *user_name, -+ const char *file_name); -+ - extern struct passwd * PAM_NONNULL((1,2)) - pam_modutil_getpwnam(pam_handle_t *pamh, const char *user); - -diff --git a/libpam/libpam.map b/libpam/libpam.map -index c9690a91..3cc7ef35 100644 ---- a/libpam/libpam.map -+++ b/libpam/libpam.map -@@ -82,3 +82,8 @@ LIBPAM_1.4 { - global: - pam_start_confdir; - } LIBPAM_1.0; -+ -+LIBPAM_MODUTIL_1.4.1 { -+ global: -+ pam_modutil_check_user_in_passwd; -+} LIBPAM_MODUTIL_1.3.2; -diff --git a/libpam/pam_modutil_check_user_in_passwd.c b/libpam/pam_modutil_check_user_in_passwd.c -new file mode 100644 -index 00000000..b998aa25 ---- /dev/null -+++ b/libpam/pam_modutil_check_user_in_passwd.c -@@ -0,0 +1,89 @@ -+#include "pam_modutil_private.h" -+#include -+ -+#include -+#include -+ -+int -+pam_modutil_check_user_in_passwd(pam_handle_t *pamh, -+ const char *user_name, -+ const char *file_name) -+{ -+ int rc; -+ size_t user_len; -+ FILE *fp; -+ char line[BUFSIZ]; -+ -+ /* Validate the user name. */ -+ if ((user_len = strlen(user_name)) == 0) { -+ pam_syslog(pamh, LOG_NOTICE, "user name is not valid"); -+ return PAM_SERVICE_ERR; -+ } -+ -+ if (user_len > sizeof(line) - sizeof(":")) { -+ pam_syslog(pamh, LOG_NOTICE, "user name is too long"); -+ return PAM_SERVICE_ERR; -+ } -+ -+ if (strchr(user_name, ':') != NULL) { -+ /* -+ * "root:x" is not a local user name even if the passwd file -+ * contains a line starting with "root:x:". -+ */ -+ return PAM_PERM_DENIED; -+ } -+ -+ /* Open the passwd file. */ -+ if (file_name == NULL) { -+ file_name = "/etc/passwd"; -+ } -+ if ((fp = fopen(file_name, "r")) == NULL) { -+ pam_syslog(pamh, LOG_ERR, "error opening %s: %m", file_name); -+ return PAM_SERVICE_ERR; -+ } -+ -+ /* -+ * Scan the file using fgets() instead of fgetpwent_r() because -+ * the latter is not flexible enough in handling long lines -+ * in passwd files. -+ */ -+ rc = PAM_PERM_DENIED; -+ while (fgets(line, sizeof(line), fp) != NULL) { -+ size_t line_len; -+ const char *str; -+ -+ /* -+ * Does this line start with the user name -+ * followed by a colon? -+ */ -+ if (strncmp(user_name, line, user_len) == 0 && -+ line[user_len] == ':') { -+ rc = PAM_SUCCESS; -+ break; -+ } -+ /* Has a newline been read? */ -+ line_len = strlen(line); -+ if (line_len < sizeof(line) - 1 || -+ line[line_len - 1] == '\n') { -+ /* Yes, continue with the next line. */ -+ continue; -+ } -+ -+ /* No, read till the end of this line first. */ -+ while ((str = fgets(line, sizeof(line), fp)) != NULL) { -+ line_len = strlen(line); -+ if (line_len == 0 || -+ line[line_len - 1] == '\n') { -+ break; -+ } -+ } -+ if (str == NULL) { -+ /* fgets returned NULL, we are done. */ -+ break; -+ } -+ /* Continue with the next line. */ -+ } -+ -+ fclose(fp); -+ return rc; -+} -diff --git a/modules/pam_faillock/pam_faillock.c b/modules/pam_faillock/pam_faillock.c -index f592d0a2..8bca46ca 100644 ---- a/modules/pam_faillock/pam_faillock.c -+++ b/modules/pam_faillock/pam_faillock.c -@@ -348,42 +348,7 @@ set_conf_opt(pam_handle_t *pamh, struct options *opts, const char *name, const c - static int - check_local_user (pam_handle_t *pamh, const char *user) - { -- struct passwd pw, *pwp; -- char buf[16384]; -- int found = 0; -- FILE *fp; -- int errn; -- -- fp = fopen(PATH_PASSWD, "r"); -- if (fp == NULL) { -- pam_syslog(pamh, LOG_ERR, "unable to open %s: %m", -- PATH_PASSWD); -- return -1; -- } -- -- for (;;) { -- errn = fgetpwent_r(fp, &pw, buf, sizeof (buf), &pwp); -- if (errn == ERANGE) { -- pam_syslog(pamh, LOG_WARNING, "%s contains very long lines; corrupted?", -- PATH_PASSWD); -- break; -- } -- if (errn != 0) -- break; -- if (strcmp(pwp->pw_name, user) == 0) { -- found = 1; -- break; -- } -- } -- -- fclose (fp); -- -- if (errn != 0 && errn != ENOENT) { -- pam_syslog(pamh, LOG_ERR, "unable to enumerate local accounts: %m"); -- return -1; -- } else { -- return found; -- } -+ return pam_modutil_check_user_in_passwd(pamh, user, NULL); - } - - static int -diff --git a/modules/pam_localuser/pam_localuser.c b/modules/pam_localuser/pam_localuser.c -index cb507524..a9f2233c 100644 ---- a/modules/pam_localuser/pam_localuser.c -+++ b/modules/pam_localuser/pam_localuser.c -@@ -45,92 +45,10 @@ - #include - - #include -+#include - #include - #include "pam_inline.h" - --static int --check_user_in_passwd(pam_handle_t *pamh, const char *user_name, -- const char *file_name) --{ -- int rc; -- size_t user_len; -- FILE *fp; -- char line[BUFSIZ]; -- -- /* Validate the user name. */ -- if ((user_len = strlen(user_name)) == 0) { -- pam_syslog(pamh, LOG_NOTICE, "user name is not valid"); -- return PAM_SERVICE_ERR; -- } -- -- if (user_len > sizeof(line) - sizeof(":")) { -- pam_syslog(pamh, LOG_NOTICE, "user name is too long"); -- return PAM_SERVICE_ERR; -- } -- -- if (strchr(user_name, ':') != NULL) { -- /* -- * "root:x" is not a local user name even if the passwd file -- * contains a line starting with "root:x:". -- */ -- return PAM_PERM_DENIED; -- } -- -- /* Open the passwd file. */ -- if (file_name == NULL) { -- file_name = "/etc/passwd"; -- } -- if ((fp = fopen(file_name, "r")) == NULL) { -- pam_syslog(pamh, LOG_ERR, "error opening %s: %m", file_name); -- return PAM_SERVICE_ERR; -- } -- -- /* -- * Scan the file using fgets() instead of fgetpwent_r() because -- * the latter is not flexible enough in handling long lines -- * in passwd files. -- */ -- rc = PAM_PERM_DENIED; -- while (fgets(line, sizeof(line), fp) != NULL) { -- size_t line_len; -- const char *str; -- -- /* -- * Does this line start with the user name -- * followed by a colon? -- */ -- if (strncmp(user_name, line, user_len) == 0 && -- line[user_len] == ':') { -- rc = PAM_SUCCESS; -- break; -- } -- /* Has a newline been read? */ -- line_len = strlen(line); -- if (line_len < sizeof(line) - 1 || -- line[line_len - 1] == '\n') { -- /* Yes, continue with the next line. */ -- continue; -- } -- -- /* No, read till the end of this line first. */ -- while ((str = fgets(line, sizeof(line), fp)) != NULL) { -- line_len = strlen(line); -- if (line_len == 0 || -- line[line_len - 1] == '\n') { -- break; -- } -- } -- if (str == NULL) { -- /* fgets returned NULL, we are done. */ -- break; -- } -- /* Continue with the next line. */ -- } -- -- fclose(fp); -- return rc; --} -- - int - pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, - int argc, const char **argv) -@@ -173,7 +91,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, - return rc == PAM_CONV_AGAIN ? PAM_INCOMPLETE : rc; - } - -- return check_user_in_passwd(pamh, user_name, file_name); -+ return pam_modutil_check_user_in_passwd(pamh, user_name, file_name); - } - - int --- -2.26.2 - diff --git a/buildroot/package/linux-pam/linux-pam.hash b/buildroot/package/linux-pam/linux-pam.hash index 608908cb0..be7cabf6d 100644 --- a/buildroot/package/linux-pam/linux-pam.hash +++ b/buildroot/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.4.0/Linux-PAM-1.4.0.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.5.0/Linux-PAM-1.5.1.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 cd6d928c51e64139be3bdb38692c68183a509b83d4f2c221024ccd4bcddfd034 Linux-PAM-1.4.0.tar.xz +sha256 201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc Linux-PAM-1.5.1.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/buildroot/package/linux-pam/linux-pam.mk b/buildroot/package/linux-pam/linux-pam.mk index 57fb2c9cf..9c0815db2 100644 --- a/buildroot/package/linux-pam/linux-pam.mk +++ b/buildroot/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.4.0 +LINUX_PAM_VERSION = 1.5.1 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES @@ -20,9 +20,8 @@ LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright -# We're patching configure.ac -LINUX_PAM_AUTORECONF = YES LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) +LINUX_PAM_CPE_ID_VENDOR = linux-pam ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LINUX_PAM_CONF_OPTS += --enable-selinux @@ -42,13 +41,6 @@ else LINUX_PAM_CONF_OPTS += --disable-audit endif -ifeq ($(BR2_PACKAGE_CRACKLIB),y) -LINUX_PAM_CONF_OPTS += --enable-cracklib -LINUX_PAM_DEPENDENCIES += cracklib -else -LINUX_PAM_CONF_OPTS += --disable-cracklib -endif - # Install default pam config (deny everything except login) define LINUX_PAM_INSTALL_CONFIG $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ diff --git a/buildroot/package/linux-syscall-support/linux-syscall-support.hash b/buildroot/package/linux-syscall-support/linux-syscall-support.hash index 2371dffb1..3445bf139 100644 --- a/buildroot/package/linux-syscall-support/linux-syscall-support.hash +++ b/buildroot/package/linux-syscall-support/linux-syscall-support.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz +sha256 498efb6915ac6e65c82c712fadd3c30f9472764114c835849e02f2c092bacd2d linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb-br1.tar.gz sha256 4c1fc9acc9f3867e5c81b5d5f57c52fb9a932662bd4e2e5e43b3fe95390035f5 linux_syscall_support.h diff --git a/buildroot/package/linux-tools/linux-tool-perf.mk.in b/buildroot/package/linux-tools/linux-tool-perf.mk.in index 53b7c5b9c..efa747cf8 100644 --- a/buildroot/package/linux-tools/linux-tool-perf.mk.in +++ b/buildroot/package/linux-tools/linux-tool-perf.mk.in @@ -21,7 +21,6 @@ PERF_MAKE_FLAGS = \ DESTDIR=$(TARGET_DIR) \ prefix=/usr \ WERROR=0 \ - NO_LIBAUDIT=1 \ NO_GTK2=1 \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ @@ -64,6 +63,16 @@ else PERF_MAKE_FLAGS += NO_NEWT=1 NO_SLANG=1 endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +PERF_DEPENDENCIES += audit +else +PERF_MAKE_FLAGS += NO_LIBAUDIT=1 +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +PERF_DEPENDENCIES += zstd +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) PERF_DEPENDENCIES += libunwind else diff --git a/buildroot/package/lldpd/lldpd.hash b/buildroot/package/lldpd/lldpd.hash index 4283b4aec..ee6e72ba5 100644 --- a/buildroot/package/lldpd/lldpd.hash +++ b/buildroot/package/lldpd/lldpd.hash @@ -1,5 +1,5 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -sha256 2dd3b212f4dbabfcbb2794c0010b245f9f8e74b387984e757be6243a74c6cb99 lldpd-1.0.5.tar.gz +sha256 1df79179d489c841b49265f2ab5ff05f284a647e95862d2f3c02b3fb079a87e1 lldpd-1.0.7.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/buildroot/package/lldpd/lldpd.mk b/buildroot/package/lldpd/lldpd.mk index 585d1ed7b..7860b70c3 100644 --- a/buildroot/package/lldpd/lldpd.mk +++ b/buildroot/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.5 +LLDPD_VERSION = 1.0.7 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ diff --git a/buildroot/package/llvm/llvm.mk b/buildroot/package/llvm/llvm.mk index 24d033d12..7d60fe7f8 100644 --- a/buildroot/package/llvm/llvm.mk +++ b/buildroot/package/llvm/llvm.mk @@ -10,6 +10,7 @@ LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLV LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions LLVM_LICENSE_FILES = LICENSE.TXT +LLVM_CPE_ID_VENDOR = llvm LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES diff --git a/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch rename to buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch diff --git a/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash b/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash similarity index 70% rename from buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash rename to buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash index a1b2ae12f..45ecc2895 100644 --- a/buildroot/package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash +++ b/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176 glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz +sha256 04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk index 413e3acb6..d75702d84 100644 --- a/buildroot/package/localedef/localedef.mk +++ b/buildroot/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.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d +LOCALEDEF_VERSION = 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/buildroot/package/logrotate/logrotate.hash b/buildroot/package/logrotate/logrotate.hash index 704cbcabd..2af46d60b 100644 --- a/buildroot/package/logrotate/logrotate.hash +++ b/buildroot/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 c25ea219018b024988b791e91e9f6070c34d2056efa6ffed878067866c0ed765 logrotate-3.17.0.tar.gz +sha256 841f81bf09d0014e4a2e11af166bb33fcd8429cc0c2d4a7d3d9ceb3858cfccc5 logrotate-3.18.0.tar.xz diff --git a/buildroot/package/logrotate/logrotate.mk b/buildroot/package/logrotate/logrotate.mk index fe674ee6a..ee2ab7509 100644 --- a/buildroot/package/logrotate/logrotate.mk +++ b/buildroot/package/logrotate/logrotate.mk @@ -4,13 +4,13 @@ # ################################################################################ -LOGROTATE_VERSION = 3.17.0 -LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) +LOGROTATE_VERSION = 3.18.0 +LOGROTATE_SOURCE = logrotate-3.18.0.tar.xz +LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING +LOGROTATE_CPE_ID_VALID = YES LOGROTATE_DEPENDENCIES = popt host-pkgconf -# tarball does not have a generated configure script -LOGROTATE_AUTORECONF = YES LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) diff --git a/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch b/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch deleted file mode 100644 index f9815624b..000000000 --- a/buildroot/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch +++ /dev/null @@ -1,225 +0,0 @@ -From 48edd768850825a4d01e5e5e737122333fc55cdf Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Fri, 2 Oct 2020 21:29:58 +0200 -Subject: [PATCH] cacheflush01: Rewrite into new API - -This syscall is currently (v5.9) supported on these architectures: -arc, csky, mips, m68k, nds32, sh - -constants are missing for m68k, not sure if the testcase is valid for it. -Untested. - -Test for __LTP__NR_INVALID_SYSCALL saves adding autotools check for -. - -Signed-off-by: Petr Vorel ---- -[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201002202416.28972-1-petr.vorel@gmail.com/ ] - .../kernel/syscalls/cacheflush/cacheflush01.c | 173 ++++-------------- - 1 file changed, 40 insertions(+), 133 deletions(-) - -diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c -index 29cf2014a..6ad8b953a 100644 ---- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c -+++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c -@@ -1,157 +1,64 @@ --/******************************************************************************/ --/* Copyright (c) Maxin John , 2009 */ --/* LKML Reference: http://lkml.org/lkml/2009/4/9/203 */ --/* This program 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 2 of the License, or */ --/* (at your option) any later version. */ --/* */ --/* This program 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 this program; if not, write to the Free Software */ --/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ --/* */ --/******************************************************************************/ --/******************************************************************************/ --/* */ --/* File: cacheflush01.c */ --/* */ --/* Description: The cacheflush_check() syscall */ --/* Tests EINVAL error of cacheflush system call. */ --/* Its expected behaviour is cacheflush() should return -EINVAL */ --/* when cache parameter is not one of ICACHE, DCACHE, or BCACHE. */ --/* */ --/* Usage: */ --/* cacheflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ --/* where, -c n : Run n copies concurrently. */ --/* -e : Turn on errno logging. */ --/* -i n : Execute test n times. */ --/* -I x : Execute test for x seconds. */ --/* -P x : Pause for x seconds between iterations. */ --/* -t : Turn on syscall timing. */ --/* */ --/* Total Tests: 1 */ --/* */ --/* Test Name: cacheflush01 */ --/******************************************************************************/ -+// SPDX-License-Identifier: GPL-2.0-or-later - --#include --#include --#include --#include -- --#include "test.h" -+#include "tst_test.h" - #include "lapi/syscalls.h" - - #if __NR_cacheflush != __LTP__NR_INVALID_SYSCALL -+ - #include --#else -+ -+/* -+ * m68k does not have these constants -+ */ -+ - #ifndef ICACHE --#define ICACHE (1<<0) /* flush instruction cache */ -+# define ICACHE (1<<0) - #endif -+ - #ifndef DCACHE --#define DCACHE (1<<1) /* writeback and flush data cache */ -+# define DCACHE (1<<1) - #endif -+ - #ifndef BCACHE --#define BCACHE (ICACHE|DCACHE) /* flush both caches */ --#endif -+# define BCACHE (ICACHE|DCACHE) - #endif - --char *TCID = "cacheflush01"; --int TST_TOTAL = 1; -+#define CACHE_DESC(x) .cache = x, .desc = #x - --/* Extern Global Functions */ --/******************************************************************************/ --/* */ --/* Function: cleanup */ --/* */ --/* Description: Performs all one time clean up for this test on successful */ --/* completion, premature exit or failure. Closes all temporary */ --/* files, removes all temporary directories exits the test with */ --/* appropriate return code by calling tst_exit() function. */ --/* */ --/* Input: None. */ --/* */ --/* Output: None. */ --/* */ --/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ --/* On success - Exits calling tst_exit(). With '0' return code. */ --/* */ --/******************************************************************************/ --void cleanup(void) --{ -+static struct test_case_t { -+ int cache; -+ const char *desc; -+} test_cases[] = { -+ { CACHE_DESC(ICACHE) }, -+ { CACHE_DESC(DCACHE) }, -+ { CACHE_DESC(BCACHE) }, -+}; - -- tst_rmdir(); --} -+static char *addr; - --/* Local Functions */ --/******************************************************************************/ --/* */ --/* Function: setup */ --/* */ --/* Description: Performs all one time setup for this test. This function is */ --/* typically used to capture signals, create temporary dirs */ --/* and temporary files that may be used in the course of this */ --/* test. */ --/* */ --/* Input: None. */ --/* */ --/* Output: None. */ --/* */ --/* Return: On failure - Exits by calling cleanup(). */ --/* On success - returns 0. */ --/* */ --/******************************************************************************/ --void setup(void) -+static void setup(void) - { -- /* Capture signals if any */ -- /* Create temporary directories */ -- TEST_PAUSE; -- tst_tmpdir(); -+ addr = SAFE_MALLOC(getpagesize()); - } - --int main(int ac, char **av) -+static void test_cacheflush(unsigned int i) - { -+ struct test_case_t *tc = &test_cases[i]; - -- char *addr = NULL; -- -- tst_parse_opts(ac, av, NULL, NULL); -- -- setup(); -- -- tst_count = 0; -- /* Create some user address range */ -- addr = malloc(getpagesize()); -- if (addr == NULL) { -- tst_brkm(TFAIL | TTERRNO, cleanup, "malloc failed"); -- } -- -- /* Invokes cacheflush() with proper parameters */ -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), ICACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -- } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -- } -- -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), DCACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -+ TEST(tst_syscall(__NR_cacheflush, addr, getpagesize(), tc->cache)); -+ if (TST_RET == 0) { -+ tst_res(TPASS, "%s passed", tc->desc); - } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -+ tst_res(TFAIL | TTERRNO, "%s failed", tc->desc); - } -+} - -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), BCACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -- } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -- } -+static struct tst_test test = { -+ .setup = setup, -+ .test = test_cacheflush, -+ .tcnt = ARRAY_SIZE(test_cases), -+}; - -- cleanup(); -- tst_exit(); --} -+#else -+ TST_TEST_TCONF("system doesn't support cacheflush()"); -+#endif --- -2.28.0 - diff --git a/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index f1b6743f2..2893026c0 100644 --- a/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/buildroot/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -26,7 +26,16 @@ In file included from ../include/tst_safe_macros.h:15, x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here Signed-off-by: Petr Vorel -[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/ ] + +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/ + +But this patch is not going to get upstreamed because it got fixed in Linux kernel: +a85cbe6159ff "uapi: move constants from to " + +This patch was also backported to stable and LTS versions, +which we use since buildroot 54584d233b "{linux, linux-headers}: bump +5.{4, 10}.x 4.{4, 9, 14, 19} series". +We just wait for all musl based toolchains to be rebuilt. ] --- include/lapi/sysinfo.h | 22 +++++++++++++++++++ include/tst_safe_macros.h | 2 +- @@ -69,7 +78,7 @@ index 000000000..d0e0e93d7 + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index 053c3bcf9..61ea2076d 100644 +index ee3df4142..3cb1623f9 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -82,7 +91,7 @@ index 053c3bcf9..61ea2076d 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index 4f48d7529..d8ee03dae 100644 +index a5b6bc504..20d01d304 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -11,7 +11,6 @@ @@ -98,33 +107,33 @@ index 4f48d7529..d8ee03dae 100644 #include "test.h" #include "safe_macros.h" +#include "lapi/sysinfo.h" - + char *safe_basename(const char *file, const int lineno, void (*cleanup_fn) (void), char *path) diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index f134d90c9..647db951e 100644 +index dd09db490..085392365 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c @@ -5,11 +5,11 @@ - + #include #include -#include #include - + #define TST_NO_DEFAULT_MAIN #include "tst_test.h" +#include "lapi/sysinfo.h" - + #define BLOCKSIZE (16 * 1024 * 1024) - + diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index f08d3943f..9b4d856f8 100644 +index 9676ea4b5..33b2ac822 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ */ - + #include -#include #include @@ -132,26 +141,25 @@ index f08d3943f..9b4d856f8 100644 #include @@ -29,6 +28,7 @@ #include - + #include "lapi/abisize.h" +#include "lapi/sysinfo.h" #include "tst_test.h" - + #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index f76f3f6aa..b2613670b 100644 +index 962554163..aa4d3bc91 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c -@@ -24,8 +24,8 @@ +@@ -41,7 +41,7 @@ #include #include #include -#include - #include "tst_test.h" +#include "lapi/sysinfo.h" - + #include "tst_test.h" + #define CHUNK_SZ (400*1024*1024L) - #define CHUNK_PAGES (CHUNK_SZ / pg_sz) diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c index 2ea44a2be..a95066bf5 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -161,10 +169,10 @@ index 2ea44a2be..a95066bf5 100644 #include #include -#include - + #include "test.h" +#include "lapi/sysinfo.h" - + void setup(); void cleanup(); diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -177,27 +185,27 @@ index 678b8f1d3..5ce65d20e 100644 #include -#include #include - + #include "test.h" +#include "lapi/sysinfo.h" - + #define INVALID_ADDRESS ((uintptr_t)-1) - + diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c index af7cb6421..3b61a05b1 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,9 +13,9 @@ - + */ - + -#include #include "lapi/namespaces_constants.h" #include "lapi/posix_clocks.h" +#include "lapi/sysinfo.h" #include "tst_test.h" - + static int offsets[] = { --- -2.28.0 +-- +2.30.0 diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.hash b/buildroot/package/ltp-testsuite/ltp-testsuite.hash index 9dce0405d..f0b2c8970 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.hash +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200930/ltp-full-20200930.tar.xz.sha1 -sha1 f380c7afe71e03eabb1de668c0399267042cb0f7 ltp-full-20200930.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20210121/ltp-full-20210121.tar.xz.sha1 +sha1 ac9c1c711aed4319c5fbd0b665d36f75236a4ec2 ltp-full-20210121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.mk b/buildroot/package/ltp-testsuite/ltp-testsuite.mk index a9a3173c4..43ee134d1 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.mk +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.mk @@ -4,14 +4,16 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200930 +LTP_TESTSUITE_VERSION = 20210121 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) + LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ LTP_TESTSUITE_LICENSE_FILES = COPYING LTP_TESTSUITE_CONF_OPTS += \ - --with-realtime-testsuite --with-open-posix-testsuite + --with-realtime-testsuite --with-open-posix-testsuite \ + --disable-metadata ifeq ($(BR2_LINUX_KERNEL),y) LTP_TESTSUITE_DEPENDENCIES += linux @@ -63,38 +65,30 @@ LTP_TESTSUITE_CONF_ENV += \ SYSROOT="$(STAGING_DIR)" # uclibc: bessel support normally not enabled -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/bessel/ \ testcases/misc/math/float/float_bessel.c -else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ + +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ testcases/kernel/sched/process_stress/process.c \ testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ - testcases/kernel/syscalls/getdents/getdents01.c \ - testcases/kernel/syscalls/getdents/getdents02.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ testcases/kernel/syscalls/timer_create/timer_create03.c \ utils/benchmark/ebizzy-0.3 -endif + +# ldd command build system tries to build a shared library unconditionally. +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_STATIC_LIBS) += \ + testcases/commands/ldd define LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES - $(foreach f,$(LTP_TESTSUITE_UNSUPPORTED_TEST_CASES), + $(foreach f,$(LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_y), rm -rf $(@D)/$(f) ) endef LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES -# ldd command build system tries to build a shared library unconditionally. -ifeq ($(BR2_STATIC_LIBS),y) -define LTP_TESTSUITE_REMOVE_LDD - rm -rf $(@D)/testcases/commands/ldd -endef -LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_LDD -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/lua-bit32/lua-bit32.hash b/buildroot/package/lua-bit32/lua-bit32.hash index ea9aca19a..9a4f64b66 100644 --- a/buildroot/package/lua-bit32/lua-bit32.hash +++ b/buildroot/package/lua-bit32/lua-bit32.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 5d820979918637c2b86e1b0a55002bcfc2fa649469bc50e47aa954ea9fde499d bit32-5.3.5-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.9/LICENSE +sha256 0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c bit32-5.3.5.1-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.10/LICENSE diff --git a/buildroot/package/lua-bit32/lua-bit32.mk b/buildroot/package/lua-bit32/lua-bit32.mk index c254cffd8..0fa5048d7 100644 --- a/buildroot/package/lua-bit32/lua-bit32.mk +++ b/buildroot/package/lua-bit32/lua-bit32.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_BIT32_VERSION = 5.3.5-1 +LUA_BIT32_VERSION = 5.3.5.1-1 LUA_BIT32_NAME_UPSTREAM = bit32 -LUA_BIT32_SUBDIR = lua-compat-5.3-0.9 +LUA_BIT32_SUBDIR = lua-compat-5.3-0.10 LUA_BIT32_LICENSE = MIT LUA_BIT32_LICENSE_FILES = $(LUA_BIT32_SUBDIR)/LICENSE diff --git a/buildroot/package/lua-curl/lua-curl.hash b/buildroot/package/lua-curl/lua-curl.hash index 33cc68e32..5210ceb0f 100644 --- a/buildroot/package/lua-curl/lua-curl.hash +++ b/buildroot/package/lua-curl/lua-curl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 01578439ba90338abba86ec77641a4998450dbc42c06cff41eeefa119a6962bc lua-curl-0.3.11-1.src.rock -sha256 3049265c5c05a5e2a40eb28dbf3fe46a51cd03e5f62cc1a419e352130e278e02 Lua-cURLv3-0.3.11/LICENSE +sha256 b6b860cd416ad883f2c7c2e1696aceda60c96036f660fb8c0236a5cc3d961c04 lua-curl-0.3.12-1.src.rock +sha256 0f92f4c4665aadffb023de44b16022282040fe4409d5cd3148f1812dec30cdff Lua-cURLv3-0.3.12/LICENSE diff --git a/buildroot/package/lua-curl/lua-curl.mk b/buildroot/package/lua-curl/lua-curl.mk index 3a0f1c69b..37fbf30cc 100644 --- a/buildroot/package/lua-curl/lua-curl.mk +++ b/buildroot/package/lua-curl/lua-curl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CURL_VERSION_UPSTREAM = 0.3.11 +LUA_CURL_VERSION_UPSTREAM = 0.3.12 LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1 LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM) LUA_CURL_LICENSE = MIT diff --git a/buildroot/package/lua-http/Config.in b/buildroot/package/lua-http/Config.in index 8eefd481b..e4d359ad3 100644 --- a/buildroot/package/lua-http/Config.in +++ b/buildroot/package/lua-http/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_LUA_HTTP help HTTP library for Lua. - https://daurnimator.github.io/lua-http/ + https://github.com/daurnimator/lua-http comment "lua-http needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/lua-http/lua-http.hash b/buildroot/package/lua-http/lua-http.hash index d41b494e9..491167eed 100644 --- a/buildroot/package/lua-http/lua-http.hash +++ b/buildroot/package/lua-http/lua-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 98318213be7b5ca60780c39f4736d5a3328631bc2c5dbfb8949b0db80e32746f http-0.3-0.src.rock -sha256 817cdf831c9d7cd1a2706b4b99dcc6f61a7a2345b7c9d39ed99e87d36338f4c8 lua-http-0.3/LICENSE.md +sha256 dbe1b29ff89fb937059e4398c9a628361d97d856acc87fd8cd85cb9340cde328 http-0.4-0.src.rock +sha256 1b486781068bcfd373f8c54f8d78eeab76d900bdf32e589e8330a4c563c2874b lua-http-0.4/LICENSE.md diff --git a/buildroot/package/lua-http/lua-http.mk b/buildroot/package/lua-http/lua-http.mk index 00dcefa0d..7fbb09038 100644 --- a/buildroot/package/lua-http/lua-http.mk +++ b/buildroot/package/lua-http/lua-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_HTTP_VERSION_UPSTREAM = 0.3 +LUA_HTTP_VERSION_UPSTREAM = 0.4 LUA_HTTP_VERSION = $(LUA_HTTP_VERSION_UPSTREAM)-0 LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) diff --git a/buildroot/package/lua-lyaml/lua-lyaml.hash b/buildroot/package/lua-lyaml/lua-lyaml.hash index 07184e9e4..af3d0ae6d 100644 --- a/buildroot/package/lua-lyaml/lua-lyaml.hash +++ b/buildroot/package/lua-lyaml/lua-lyaml.hash @@ -1,3 +1,3 @@ # locally computed -sha256 2c52104e75331e4729e5895168fb8f24769db0b84c68696159e6b6a8908b62d2 lua-lyaml-6.2.6.tar.gz -sha256 81e4ea1d897e259b31111adc2d3c185fe23e435942ff3e9de8c8c9c5d01247d0 LICENSE +sha256 9bb489cefae48b150d66f6bab4141d8d5831fcb7465bfc52a9845fa01efc63b0 lua-lyaml-6.2.7.tar.gz +sha256 81e4ea1d897e259b31111adc2d3c185fe23e435942ff3e9de8c8c9c5d01247d0 LICENSE diff --git a/buildroot/package/lua-lyaml/lua-lyaml.mk b/buildroot/package/lua-lyaml/lua-lyaml.mk index a818ce716..77980f531 100644 --- a/buildroot/package/lua-lyaml/lua-lyaml.mk +++ b/buildroot/package/lua-lyaml/lua-lyaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LYAML_VERSION = 6.2.6 +LUA_LYAML_VERSION = 6.2.7 LUA_LYAML_NAME_UPSTREAM = lyaml LUA_LYAML_SITE = $(call github,gvvaughan,$(LUA_LYAML_NAME_UPSTREAM),v$(LUA_LYAML_VERSION)) LUA_LYAML_LICENSE = MIT diff --git a/buildroot/package/lua/lua.mk b/buildroot/package/lua/lua.mk index 387df6169..e3a415a06 100644 --- a/buildroot/package/lua/lua.mk +++ b/buildroot/package/lua/lua.mk @@ -19,6 +19,7 @@ LUA_LICENSE_FILES = doc/readme.html else LUA_LICENSE_FILES = COPYRIGHT endif +LUA_CPE_ID_VENDOR = lua LUA_PROVIDES = luainterpreter diff --git a/buildroot/package/luajit/luajit.mk b/buildroot/package/luajit/luajit.mk index 68e6af4f5..defa21dd3 100644 --- a/buildroot/package/luajit/luajit.mk +++ b/buildroot/package/luajit/luajit.mk @@ -17,12 +17,6 @@ ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y) LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT endif -ifeq ($(BR2_STATIC_LIBS),y) -LUAJIT_BUILDMODE = static -else -LUAJIT_BUILDMODE = dynamic -endif - # The luajit build procedure requires the host compiler to have the # same bitness as the target compiler. Therefore, on a x86 build # machine, we can't build luajit for x86_64, which is checked in @@ -50,7 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CC="$(LUAJIT_HOST_CC)" \ HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ - BUILDMODE=$(LUAJIT_BUILDMODE) \ + BUILDMODE=dynamic \ XCFLAGS=$(LUAJIT_XCFLAGS) \ -C $(@D) amalg endef diff --git a/buildroot/package/lualdap/Config.in b/buildroot/package/lualdap/Config.in new file mode 100644 index 000000000..ef3e93202 --- /dev/null +++ b/buildroot/package/lualdap/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LUALDAP + bool "lualdap" + depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_LUA_5_4 + depends on BR2_USE_WCHAR # openldap + depends on BR2_USE_MMU # openldap + select BR2_PACKAGE_OPENLDAP + help + LuaLDAP is a simple interface from Lua to an LDAP client, + in fact it is a bind to OpenLDAP client. + + https://github.com/lualdap/lualdap + +comment "lualdap needs a toolchain w/ wchar, dynamic library, Lua <= 5.3" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 diff --git a/buildroot/package/lualdap/lualdap.hash b/buildroot/package/lualdap/lualdap.hash new file mode 100644 index 000000000..77eced434 --- /dev/null +++ b/buildroot/package/lualdap/lualdap.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc lualdap-1.2.5.tar.gz +sha256 7afd8bed6c96a2ba1d1fa9f03ea04c140065462dbd37d7fb66cc7c3c6722aa89 LICENSE.md diff --git a/buildroot/package/lualdap/lualdap.mk b/buildroot/package/lualdap/lualdap.mk new file mode 100644 index 000000000..6ab330269 --- /dev/null +++ b/buildroot/package/lualdap/lualdap.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# lualdap +# +################################################################################ + +LUALDAP_VERSION = 1.2.5 +LUALDAP_SITE = $(call github,lualdap,lualdap,v$(LUALDAP_VERSION)) +LUALDAP_LICENSE = MIT +LUALDAP_LICENSE_FILES = LICENSE.md +LUALDAP_DEPENDENCIES = luainterpreter openldap + +define LUALDAP_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ + CC=$(TARGET_CC) \ + LUA_LIB=-llua \ + LUA_LIBDIR="$(STAGING_DIR)/usr/lib" \ + LUA_INCDIR="$(STAGING_DIR)/usr/include" \ + LDAP_LIBDIR="$(STAGING_DIR)/usr/lib" \ + LDAP_INCDIR="$(STAGING_DIR)/usr/include" \ + LBER_LIBDIR="$(STAGING_DIR)/usr/lib" \ + LBER_INCDIR="$(STAGING_DIR)/usr/include" \ + src/lualdap.so +endef + +define LUALDAP_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ + DESTDIR="$(TARGET_DIR)" \ + INST_LIBDIR="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/" \ + install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/luarocks/luarocks.hash b/buildroot/package/luarocks/luarocks.hash index 565b1cccf..4a3ec0cf7 100644 --- a/buildroot/package/luarocks/luarocks.hash +++ b/buildroot/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 62ce5826f0eeeb760d884ea8330cd1552b5d432138b8bade0fa72f35badd02d0 luarocks-3.4.0.tar.gz +sha256 701d0cc0c7e97cc2cf2c2f4068fce45e52a8854f5dc6c9e49e2014202eec9a4f luarocks-3.5.0.tar.gz sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/buildroot/package/luarocks/luarocks.mk b/buildroot/package/luarocks/luarocks.mk index 6ce8f2fa8..dd11b738a 100644 --- a/buildroot/package/luarocks/luarocks.mk +++ b/buildroot/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.4.0 +LUAROCKS_VERSION = 3.5.0 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING diff --git a/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch b/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch deleted file mode 100644 index 6c2c1e591..000000000 --- a/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b3347655bd31c4f1fd9e101787a84da0c98f2f8f Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Wed, 12 Jun 2019 20:47:18 +0200 -Subject: [PATCH] compat Lua 5.3 - -Signed-off-by: Francois Perrad ---- - lsyslog.c | 8 ++++++-- - syslog.lua | 4 ++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/luasyslog-1.0.0/lsyslog.c b/luasyslog-1.0.0/lsyslog.c -index cd512dc..57121da 100644 ---- a/luasyslog-1.0.0/lsyslog.c -+++ b/luasyslog-1.0.0/lsyslog.c -@@ -136,7 +136,7 @@ - lua_settable(L, -3); - } - --static const struct luaL_reg lsysloglib[] = -+static const struct luaL_Reg lsysloglib[] = - { - {"open", lsyslog_open}, - {"close", lsyslog_close}, -@@ -146,7 +146,11 @@ - - int luaopen_lsyslog(lua_State *L) - { -- luaL_openlib(L, "lsyslog", lsysloglib, 0); -+#if LUA_VERSION_NUM >= 502 -+ luaL_newlib(L, lsysloglib); -+#else -+ luaL_register(L, "lsyslog", lsysloglib); -+#endif - - set_info(L); - return 1; -diff --git a/luasyslog-1.0.0/syslog.lua b/luasyslog-1.0.0/syslog.lua -index febda00..f4d98ec 100644 ---- a/luasyslog-1.0.0/syslog.lua -+++ b/luasyslog-1.0.0/syslog.lua -@@ -1,5 +1,5 @@ --require"logging" --require"lsyslog" -+local logging = require"logging" -+local lsyslog = require"lsyslog" - - local convert = - { --- -2.20.1 - diff --git a/buildroot/package/luasyslog/0001-remove-AX_LUA_LIBS.patch b/buildroot/package/luasyslog/0001-remove-AX_LUA_LIBS.patch new file mode 100644 index 000000000..23569ff5b --- /dev/null +++ b/buildroot/package/luasyslog/0001-remove-AX_LUA_LIBS.patch @@ -0,0 +1,27 @@ +From 84296c5eae651b45ebfa233199b7ddc009a5dad3 Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Fri, 21 Jun 2019 14:58:54 +0200 +Subject: [PATCH] remove AX_LUA_LIBS + +AX_LUA_LIBS fails with LuaJIT + +Signed-off-by: Francois Perrad +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9ac6c95..d7fc518 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,6 @@ AC_PATH_PROG([LUAROCKS], [luarocks], [:]) + AX_PROG_LUA([5.1],[6.0]) + + dnl Check for libraries +-AX_LUA_LIBS + + dnl Check for functions + AC_HEADER_STDC +-- +2.20.1 + diff --git a/buildroot/package/luasyslog/Config.in b/buildroot/package/luasyslog/Config.in index 326fa6bf9..ca098cb4f 100644 --- a/buildroot/package/luasyslog/Config.in +++ b/buildroot/package/luasyslog/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_LUASYSLOG bool "luasyslog" select BR2_PACKAGE_LUALOGGING # runtime help - Syslog logging for Lua. + syslog appender for LuaLogging. - https://luarocks.org/modules/luarocks/luasyslog + https://github.com/ntd/luasyslog diff --git a/buildroot/package/luasyslog/luasyslog.hash b/buildroot/package/luasyslog/luasyslog.hash index 02a0d838a..bcb6a7e02 100644 --- a/buildroot/package/luasyslog/luasyslog.hash +++ b/buildroot/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ -# computed by luarocks/buildroot -sha256 e807a614b77108ca25aeed061faf73b7ef00708f5bfebb9e4f03d27f3d453e7b luasyslog-1.0.0-2.src.rock -sha256 c1ed5cbf3fc02836d3fc5d2354818a5c151c1cd75fcc0bf240dbf8d2b36a3c1d luasyslog-1.0.0/COPYING +# Locally computed +sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/buildroot/package/luasyslog/luasyslog.mk b/buildroot/package/luasyslog/luasyslog.mk index 1d88b6056..049e068a1 100644 --- a/buildroot/package/luasyslog/luasyslog.mk +++ b/buildroot/package/luasyslog/luasyslog.mk @@ -4,8 +4,13 @@ # ################################################################################ -LUASYSLOG_VERSION = 1.0.0-2 +LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) +LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter LUASYSLOG_LICENSE = MIT -LUASYSLOG_LICENSE_FILES = $(LUASYSLOG_SUBDIR)/COPYING +LUASYSLOG_LICENSE_FILES = COPYING +# fetching from github +# 0001-remove-AX_LUA_LIBS.patch touches configure.ac +LUASYSLOG_AUTORECONF = YES -$(eval $(luarocks-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index b067f145e..576036e24 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -8,6 +8,7 @@ LXC_VERSION = 4.0.5 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 +LXC_CPE_ID_VENDOR = linuxcontainers LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES diff --git a/buildroot/package/lz4/lz4.hash b/buildroot/package/lz4/lz4.hash index 01d0107b3..0b03089ec 100644 --- a/buildroot/package/lz4/lz4.hash +++ b/buildroot/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc lz4-1.9.2.tar.gz +sha256 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1 lz4-1.9.3.tar.gz sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING diff --git a/buildroot/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk index fa309e8db..e0236c05b 100644 --- a/buildroot/package/lz4/lz4.mk +++ b/buildroot/package/lz4/lz4.mk @@ -4,11 +4,12 @@ # ################################################################################ -LZ4_VERSION = 1.9.2 +LZ4_VERSION = 1.9.3 LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING +LZ4_CPE_ID_VENDOR = yann_collet # CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version # 1.9.2, while in fact this issue has been fixed since lz4-r130: diff --git a/buildroot/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch b/buildroot/package/makedumpfile/0001-PATCH-Define-PN_XNUM-if-missing.patch similarity index 100% rename from buildroot/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch rename to buildroot/package/makedumpfile/0001-PATCH-Define-PN_XNUM-if-missing.patch diff --git a/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch deleted file mode 100644 index aab4f70f0..000000000 --- a/buildroot/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 -From: Kairui Song -Date: Wed, 29 Jan 2020 13:37:13 +0800 -Subject: [PATCH] Remove duplicated variable definitions - -When building on Fedora 32 (with GCC 10), following error is observed: - -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of - `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of - `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of - `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of - `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here -... -collect2: error: ld returned 1 exit status -make: *** [Makefile:97: makedumpfile] Error 1 - -These variables are wrongly defined multiple times. So remove the -duplicated definitions. - -Signed-off-by: Kairui Song -Signed-off-by: Kazuhito Hagio -Signed-off-by: Alexander Egorenkov ---- - makedumpfile.c | 8 ++++---- - makedumpfile.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/makedumpfile.c b/makedumpfile.c -index e290fbd..ae7336a 100644 ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) - return FALSE; - - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - return FALSE; - } - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - - if (info->num_threads) { - if ((info->parallel_info = -- malloc(sizeof(parallel_info_t) * info->num_threads)) -+ malloc(sizeof(struct parallel_info) * info->num_threads)) - == NULL) { - MSG("Can't allocate memory for parallel_info.\n"); - return FALSE; - } - -- memset(info->parallel_info, 0, sizeof(parallel_info_t) -+ memset(info->parallel_info, 0, sizeof(struct parallel_info) - * info->num_threads); - } - -diff --git a/makedumpfile.h b/makedumpfile.h -index 68d9691..7217407 100644 ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -1262,7 +1262,7 @@ struct splitting_info { - mdf_pfn_t end_pfn; - off_t offset_eraseinfo; - unsigned long size_eraseinfo; --} splitting_info_t; -+}; - - struct parallel_info { - int fd_memory; -@@ -1275,7 +1275,7 @@ struct parallel_info { - #ifdef USELZO - lzo_bytep wrkmem; - #endif --} parallel_info_t; -+}; - - struct ppc64_vmemmap { - unsigned long phys; -@@ -2006,8 +2006,8 @@ struct memory_range { - }; - - #define CRASH_RESERVED_MEM_NR 8 --struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; --int crash_reserved_mem_nr; -+extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; -+extern int crash_reserved_mem_nr; - - unsigned long read_vmcoreinfo_symbol(char *str_symbol); - int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); --- -2.28.0 - diff --git a/buildroot/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch b/buildroot/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch new file mode 100644 index 000000000..defc10194 --- /dev/null +++ b/buildroot/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch @@ -0,0 +1,35 @@ +From 2c132ac5e6656723821acdb0ee57b34c42851fed Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 4 Feb 2021 20:15:56 +0100 +Subject: [PATCH] makedumpfile.h: fix build on sparc64 + +Fix the following build failure on sparc64: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/9.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: /tmp/ccylTux8.o: in function `find_kaslr_offsets': +/home/giuliobenetti/autobuild/run/instance-0/output-1/build/makedumpfile-1.6.8/makedumpfile.c:4017: undefined reference to `get_kaslr_offset' + +Fixes: + - http://autobuild.buildroot.org/results/1421f54f7599bba62c0a4bd5c65ce21c8cc7ee1a + +Signed-off-by: Fabrice Fontaine +[Upstream status: +http://lists.infradead.org/pipermail/kexec/2021-February/021996.html] +--- + makedumpfile.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/makedumpfile.h b/makedumpfile.h +index 97a5554..dfc1a77 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -1139,6 +1139,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr); + #define get_machdep_info() TRUE + #define get_phys_base() get_phys_base_sparc64() + #define get_versiondep_info() get_versiondep_info_sparc64() ++#define get_kaslr_offset(X) stub_false() + #define vaddr_to_paddr(X) vaddr_to_paddr_sparc64(X) + #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) + #define is_phys_addr(X) stub_true_ul(X) +-- +2.29.2 + diff --git a/buildroot/package/makedumpfile/makedumpfile.hash b/buildroot/package/makedumpfile/makedumpfile.hash index 2ecfc5b1c..1b2df008d 100644 --- a/buildroot/package/makedumpfile/makedumpfile.hash +++ b/buildroot/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cd3642dfe780d446f2dc328736bb2070007032718f5628262d5f59baf03619a4 makedumpfile-1.6.7.tar.gz +sha256 85d79b7090e9a8ce0d426795d3bc1de2858def7e12954d9bc6ae03de160b694c makedumpfile-1.6.8.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/makedumpfile/makedumpfile.mk b/buildroot/package/makedumpfile/makedumpfile.mk index ad63e280e..99fb3a71c 100644 --- a/buildroot/package/makedumpfile/makedumpfile.mk +++ b/buildroot/package/makedumpfile/makedumpfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.6.7 -MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,Released-$(subst .,-,$(MAKEDUMPFILE_VERSION))) +MAKEDUMPFILE_VERSION = 1.6.8 +MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 MAKEDUMPFILE_LICENSE_FILES = COPYING diff --git a/buildroot/package/mariadb/mariadb.mk b/buildroot/package/mariadb/mariadb.mk index 83965d043..252c3079e 100644 --- a/buildroot/package/mariadb/mariadb.mk +++ b/buildroot/package/mariadb/mariadb.mk @@ -10,6 +10,7 @@ MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client lib # Tarball no longer contains LGPL license text # https://jira.mariadb.org/browse/MDEV-12297 MARIADB_LICENSE_FILES = README.md COPYING +MARIADB_CPE_ID_VENDOR = mariadb MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql diff --git a/buildroot/package/matio/matio.mk b/buildroot/package/matio/matio.mk index 230dbf237..eb8363274 100644 --- a/buildroot/package/matio/matio.mk +++ b/buildroot/package/matio/matio.mk @@ -8,6 +8,7 @@ MATIO_VERSION = 1.5.18 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING +MATIO_CPE_ID_VALID = YES MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk index 77373d8b3..9e3e9f626 100644 --- a/buildroot/package/mbedtls/mbedtls.mk +++ b/buildroot/package/mbedtls/mbedtls.mk @@ -12,6 +12,8 @@ MBEDTLS_CONF_OPTS = \ MBEDTLS_INSTALL_STAGING = YES MBEDTLS_LICENSE = Apache-2.0 MBEDTLS_LICENSE_FILES = apache-2.0.txt +MBEDTLS_CPE_ID_VENDOR = arm +MBEDTLS_CPE_ID_PRODUCT = mbed_tls # This is mandatory for hiawatha ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/buildroot/package/mbuffer/mbuffer.hash b/buildroot/package/mbuffer/mbuffer.hash index 688ada690..73a8d3cf4 100644 --- a/buildroot/package/mbuffer/mbuffer.hash +++ b/buildroot/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 df39047654456f260665d66711cabcc5 mbuffer-20200505.tgz +md5 e2b4f3b0d0944c08d52c167841bde3c0 mbuffer-20200929.tgz # Locally computed after checking signature upstream -sha256 cc046183149e51814c23b9f83fd748cc1625a88ee128651ea500aa7bd5f01f0b mbuffer-20200505.tgz +sha256 53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8 mbuffer-20200929.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/mbuffer/mbuffer.mk b/buildroot/package/mbuffer/mbuffer.mk index 6aaf29c9c..90a72ce65 100644 --- a/buildroot/package/mbuffer/mbuffer.mk +++ b/buildroot/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20200505 +MBUFFER_VERSION = 20200929 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ diff --git a/buildroot/package/mdevd/mdevd.hash b/buildroot/package/mdevd/mdevd.hash index 6852e55f8..c3b8fcc92 100644 --- a/buildroot/package/mdevd/mdevd.hash +++ b/buildroot/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 c926b6f9f9f48a73733397f08b6c299a8a2f0eff3d729de7f9d0a763757dab2a mdevd-0.1.1.2.tar.gz -sha256 6e32cf6ae38bb82bb8462915ae72d55de59741c8227ae0a637b4012687d9a739 COPYING +sha256 be89ab072c4de822a06e26579dcca10e85ae5fd5be23ba903415b4de8fe0fb6a mdevd-0.1.3.0.tar.gz +sha256 31b60c66aba1fa0a7f8847339ac35c28638e25ff96da700d995533ad810e3995 COPYING diff --git a/buildroot/package/mdevd/mdevd.mk b/buildroot/package/mdevd/mdevd.mk index 728c76664..e2924009f 100644 --- a/buildroot/package/mdevd/mdevd.mk +++ b/buildroot/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.1.2 +MDEVD_VERSION = 0.1.3.0 MDEVD_SITE = http://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING diff --git a/buildroot/package/mediastreamer/Config.in b/buildroot/package/mediastreamer/Config.in index b12535e82..471d8ad91 100644 --- a/buildroot/package/mediastreamer/Config.in +++ b/buildroot/package/mediastreamer/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_MEDIASTREAMER depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # ortp depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_ORTP help @@ -16,9 +17,10 @@ config BR2_PACKAGE_MEDIASTREAMER http://www.linphone.org/technical-corner/mediastreamer2 -comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library" +comment "mediastreamer needs a toolchain w/ threads, C++, dynamic library, gcc >= 5" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 comment "mediastreamer needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/mediastreamer/mediastreamer.hash b/buildroot/package/mediastreamer/mediastreamer.hash index 5b7242678..dfa469d8d 100644 --- a/buildroot/package/mediastreamer/mediastreamer.hash +++ b/buildroot/package/mediastreamer/mediastreamer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b7251495c0bf2c71508b7cdf29999326af0bd215ec4c647b3ebb60796ee72503 mediastreamer-4.3.1.tar.gz +sha256 64bdfe9dd6bfa64b492b21a45ad4bb36d67626a7f3b3ab2084a708864f129e84 mediastreamer-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/mediastreamer/mediastreamer.mk b/buildroot/package/mediastreamer/mediastreamer.mk index 982eadf09..5d66a0988 100644 --- a/buildroot/package/mediastreamer/mediastreamer.mk +++ b/buildroot/package/mediastreamer/mediastreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDIASTREAMER_VERSION = 4.3.1 +MEDIASTREAMER_VERSION = 4.4.8 MEDIASTREAMER_SITE = \ https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/$(MEDIASTREAMER_VERSION) MEDIASTREAMER_LICENSE = GPL-3.0+ diff --git a/buildroot/package/memcached/memcached.hash b/buildroot/package/memcached/memcached.hash index 1330f6521..a86a6f9f7 100644 --- a/buildroot/package/memcached/memcached.hash +++ b/buildroot/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.8.tar.gz.sha1 -sha1 8f3efd851efc5b822bd991b93d06a271b2fac052 memcached-1.6.8.tar.gz +# From http://www.memcached.org/files/memcached-1.6.9.tar.gz.sha1 +sha1 42ae062094fdf083cfe7b21ff377c781011c2be1 memcached-1.6.9.tar.gz # Locally computed -sha256 e23b3a11f6ff52ac04ae5ea2e287052ce58fd1eadd394622eb65c3598fcd7939 memcached-1.6.8.tar.gz +sha256 d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1 memcached-1.6.9.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/buildroot/package/memcached/memcached.mk b/buildroot/package/memcached/memcached.mk index 378f57a27..1c695411c 100644 --- a/buildroot/package/memcached/memcached.mk +++ b/buildroot/package/memcached/memcached.mk @@ -4,13 +4,14 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.8 +MEMCACHED_VERSION = 1.6.9 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' MEMCACHED_CONF_OPTS = --disable-coverage MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING +MEMCACHED_CPE_ID_VENDOR = memcached ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big diff --git a/buildroot/package/memtester/memtester.mk b/buildroot/package/memtester/memtester.mk index 1a319462a..ec515f639 100644 --- a/buildroot/package/memtester/memtester.mk +++ b/buildroot/package/memtester/memtester.mk @@ -8,12 +8,14 @@ MEMTESTER_VERSION = 4.5.0 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions MEMTESTER_LICENSE = GPL-2.0 MEMTESTER_LICENSE_FILES = COPYING +MEMTESTER_CPE_ID_VENDOR = pryopus MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr define MEMTESTER_BUILD_CMDS - $(SED) "s,^cc,$(TARGET_CC)," $(@D)/conf-* - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(SED) "s%^cc%$(TARGET_CC) $(TARGET_CFLAGS)%" $(@D)/conf-cc + $(SED) "s%^cc%$(TARGET_CC) $(TARGET_LDFLAGS)%" $(@D)/conf-ld + $(MAKE) -C $(@D) endef define MEMTESTER_INSTALL_TARGET_CMDS diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 12020e655..6e2f0b5a7 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 20.2.2 +MESA3D_HEADERS_VERSION = 20.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch index b1bb2678b..e3c70c3f2 100644 --- a/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch +++ b/buildroot/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -18,7 +18,7 @@ Based on the patch for autotools provided by Valentin Korenblit. Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls -[rebased for 20.02.0] +[rebased for 20.2.0 & 20.3.0] --- src/gallium/frontends/clover/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -27,15 +27,15 @@ diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/cl index 62ac5f5278d..ecdeb39669c 100644 --- a/src/gallium/frontends/clover/meson.build +++ b/src/gallium/frontends/clover/meson.build -@@ -63,7 +63,7 @@ - clover_cpp_args, - clover_opencl_cpp_args, - clover_spirv_cpp_args, -- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), -+ '-DLIBCLC_INCLUDEDIR="/usr/share"', - '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), - '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( - dep_llvm.get_configtool_variable('libdir'), 'clang', +@@ -27,7 +27,7 @@ + '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS', + '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS', +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir')) + ] + clover_spirv_cpp_args = [] -- 2.20.1 diff --git a/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index 4b9878fb9..39e402361 100644 --- a/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/buildroot/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -10,7 +10,7 @@ to force disabling it at compile time. [Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114] Signed-off-by: Peter Seiderer Signed-off-by: Bernd Kuhls -[rebased for 20.2.0] +[rebased for 20.2.0 & 20.3.0] --- meson_options.txt | 7 +++++++ src/gallium/drivers/vc4/meson.build | 4 ++-- @@ -21,7 +21,7 @@ diff --git a/meson_options.txt b/meson_options.txt index a39596a6f19..0f6b6c62b55 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -124,6 +124,13 @@ option( +@@ -123,6 +123,13 @@ option( choices : ['auto', 'true', 'false', 'enabled', 'disabled'], description : 'enable gallium va frontend.', ) diff --git a/buildroot/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/buildroot/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch deleted file mode 100644 index 5746bc221..000000000 --- a/buildroot/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch +++ /dev/null @@ -1,35 +0,0 @@ -From da691ec75cc8a7b2d0ac0c5894521afda4bc601d Mon Sep 17 00:00:00 2001 -From: Duncan Hopkins -Date: Thu, 15 Oct 2020 12:14:57 +0100 -Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes - undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c - -loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3. -But the source meson file does not set this up dependent on with_dri3. -The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast. - -Reviewed-by: Eric Anholt -Part-of: -(cherry picked from commit cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c) -Signed-off-by: Romain Naour ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index fbd3c4b8e8d..670cb521a2b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1742,7 +1742,8 @@ if with_platform_x11 - dep_xxf86vm = dependency('xxf86vm') - endif - endif -- if (with_egl or ( -+ if (with_egl or -+ with_dri3 or ( - with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or - with_gallium_omx != 'disabled')) - dep_xcb_xfixes = dependency('xcb-xfixes') --- -2.25.4 - diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in index ebfc422bf..a96fd46bb 100644 --- a/buildroot/package/mesa3d/Config.in +++ b/buildroot/package/mesa3d/Config.in @@ -4,8 +4,8 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_ZLIB help diff --git a/buildroot/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash index 7d3a92882..e7b375440 100644 --- a/buildroot/package/mesa3d/mesa3d.hash +++ b/buildroot/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-November/000604.html -sha256 1f93eb1090cf71490cd0e204e04f8427a82b6ed534b7f49ca50cea7dcc89b861 mesa-20.2.2.tar.xz -sha512 36673a44fad8c6db3516b23b75825a52df520b9fe1387160301dd5051f420ebf0d1c7b4f8ff96a5547b79c2ba42fd782305ae23ac956f688b695c07b8fe73192 mesa-20.2.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-January/000618.html +sha256 dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084 mesa-20.3.4.tar.xz +sha512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477 mesa-20.3.4.tar.xz # License sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index a44d599b0..5105727e8 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 20.2.2 +MESA3D_VERSION = 20.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos @@ -71,7 +71,7 @@ endif else MESA3D_CONF_OPTS += \ -Dglx=disabled \ - -Dgallium-xa=false + -Dgallium-xa=disabled endif ifeq ($(BR2_ARM_CPU_HAS_NEON),y) diff --git a/buildroot/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in index 188005131..37b49eea3 100644 --- a/buildroot/package/meson/cross-compilation.conf.in +++ b/buildroot/package/meson/cross-compilation.conf.in @@ -12,12 +12,14 @@ pkgconfig = '@HOST_DIR@/bin/pkgconf' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' -[properties] -needs_exe_wrapper = true +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] + +[properties] +needs_exe_wrapper = true sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' pkg_config_static = '@STATIC@' diff --git a/buildroot/package/meson/meson.hash b/buildroot/package/meson/meson.hash index 9d278ef90..e07b914be 100644 --- a/buildroot/package/meson/meson.hash +++ b/buildroot/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.55.3/meson-0.55.3.tar.gz.asc -sha256 6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 meson-0.55.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.56.0/meson-0.56.2.tar.gz.asc +sha256 3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4 meson-0.56.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/meson/meson.mk b/buildroot/package/meson/meson.mk index d39e66cf0..7e39883db 100644 --- a/buildroot/package/meson/meson.mk +++ b/buildroot/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.55.3 +MESON_VERSION = 0.56.2 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/buildroot/package/mfgtools/Config.in.host b/buildroot/package/mfgtools/Config.in.host index 6f2f3a326..2b506c8f6 100644 --- a/buildroot/package/mfgtools/Config.in.host +++ b/buildroot/package/mfgtools/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS bool "host mfgtools" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains the Freescale manufacturing tool. It is designed to program firmware to i.MX boards during @@ -8,3 +9,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS Freescale UTP protocol. https://github.com/codeauroraforum/mfgtools + +comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/midori/midori.mk b/buildroot/package/midori/midori.mk index 1755f1241..eebec815c 100644 --- a/buildroot/package/midori/midori.mk +++ b/buildroot/package/midori/midori.mk @@ -9,6 +9,7 @@ MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2 MIDORI_SITE = http://midori-browser.org/downloads MIDORI_LICENSE = LGPL-2.1+ MIDORI_LICENSE_FILES = COPYING +MIDORI_CPE_ID_VENDOR = midori-browser MIDORI_DEPENDENCIES = \ host-intltool \ host-librsvg \ diff --git a/buildroot/package/mii-diag/mii-diag.mk b/buildroot/package/mii-diag/mii-diag.mk index 6efd5be80..a7c648322 100644 --- a/buildroot/package/mii-diag/mii-diag.mk +++ b/buildroot/package/mii-diag/mii-diag.mk @@ -10,6 +10,7 @@ MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz MII_DIAG_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag MII_DIAG_LICENSE = GPL # No version specified MII_DIAG_LICENSE_FILES = mii-diag.c +MII_DIAG_CPE_ID_VENDOR = debian MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/buildroot/package/minetest-game/minetest-game.hash b/buildroot/package/minetest-game/minetest-game.hash index 5bf65bc51..1d22b62fc 100644 --- a/buildroot/package/minetest-game/minetest-game.hash +++ b/buildroot/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94 minetest-game-5.2.0.tar.gz +sha256 06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d minetest-game-5.3.0.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt @@ -10,12 +10,12 @@ sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/b sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt -sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt +sha256 f78424e0872260d3f3af98e74faf1bbe6b9387cd5464b7ae931d1fc1cc93223c mods/default/license.txt sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt -sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 bdb104cdbe72a27407ade35144a8d1d52dd60c3ca626b5a87555b9d5d5c8af98 mods/farming/license.txt sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt diff --git a/buildroot/package/minetest-game/minetest-game.mk b/buildroot/package/minetest-game/minetest-game.mk index 38f46a398..7f1927b78 100644 --- a/buildroot/package/minetest-game/minetest-game.mk +++ b/buildroot/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.2.0 +MINETEST_GAME_VERSION = 5.3.0 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/buildroot/package/minetest/minetest.hash b/buildroot/package/minetest/minetest.hash index 626f56a31..3459c9d1a 100644 --- a/buildroot/package/minetest/minetest.hash +++ b/buildroot/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d minetest-5.2.0.tar.gz +sha256 65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6 minetest-5.3.0.tar.gz -sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt +sha256 d2a488e385226c5b865219c6acc2aa98ba2e01e74dd0ac9dd8c0663bbbe31eb1 LICENSE.txt diff --git a/buildroot/package/minetest/minetest.mk b/buildroot/package/minetest/minetest.mk index e8fe5b45c..d120353a5 100644 --- a/buildroot/package/minetest/minetest.mk +++ b/buildroot/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.2.0 +MINETEST_VERSION = 5.3.0 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) MINETEST_LICENSE_FILES = LICENSE.txt @@ -18,7 +18,8 @@ MINETEST_CONF_OPTS = \ -DENABLE_CURSES=OFF \ -DAPPLY_LOCALE_BLACKLIST=OFF \ -DENABLE_SYSTEM_GMP=ON \ - -DENABLE_SYSTEM_JSONCPP=ON + -DENABLE_SYSTEM_JSONCPP=ON \ + -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm diff --git a/buildroot/package/minicom/minicom.hash b/buildroot/package/minicom/minicom.hash index dafc9da4f..42a4499c8 100644 --- a/buildroot/package/minicom/minicom.hash +++ b/buildroot/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66af38ae98cdf965b9a591013df4256773f18338613ec22bbb83440968289a8a minicom-23292150e07ec264827fb6cf237ddb0ac9fc043b.tar.gz -sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING +sha256 38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba minicom-2.8.tar.bz2 +sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/buildroot/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk index bdbeb5377..1e1272598 100644 --- a/buildroot/package/minicom/minicom.mk +++ b/buildroot/package/minicom/minicom.mk @@ -4,9 +4,10 @@ # ################################################################################ -MINICOM_VERSION = 23292150e07ec264827fb6cf237ddb0ac9fc043b -MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git -MINICOM_SITE_METHOD = git +MINICOM_VERSION = 2.8 +MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.bz2 +MINICOM_SITE = \ + https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING MINICOM_AUTORECONF = YES diff --git a/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch b/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch deleted file mode 100644 index 586609963..000000000 --- a/buildroot/package/minizip/0001-Use-pkg-config-to-find-ZSTD.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 69afd09aee3727f2804e1b063ef50800b22c6bb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= -Date: Wed, 1 Jul 2020 11:18:08 +0200 -Subject: [PATCH] Use pkg-config to find ZSTD - -[Retrieved from: https://github.com/nmoinvaz/minizip/pull/509] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6deb4ce..987e7947 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,13 @@ endif() - # Check if zstd installation is present - if(MZ_ZSTD) - if(NOT ZSTD_FORCE_FETCH) -- find_package(ZSTD QUIET) -+ find_package(PkgConfig) -+ if(PKGCONFIG_FOUND) -+ pkg_check_modules(ZSTD libzstd) -+ endif() -+ if(NOT ZSTD_FOUND) -+ find_package(ZSTD QUIET) -+ endif() - endif() - if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH) - message(STATUS "Using ZSTD") diff --git a/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch b/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch deleted file mode 100644 index f9d28a3c7..000000000 --- a/buildroot/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d38254c2cfdfa2baceef9e4fa553b74ed2e0247e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 25 Jul 2020 14:36:11 +0200 -Subject: [PATCH] mz.h: fix build with gcc 4.8 - -gcc 4.8 does not support __has_include directive as a result the build -will fail on: - -/home/naourr/work/instance-1/output-1/build/minizip-2.10.0/mz.h:162:44: error: missing binary operator before token "(" - (defined(__has_include) && __has_include()) - ^ - -Fix it by appling: -https://gcc.gnu.org/onlinedocs/gcc-10.1.0/cpp/_005f_005fhas_005finclude.html - -Fix #510 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nmoinvaz/minizip/pull/515] ---- - mz.h | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/mz.h b/mz.h -index 4d3732b..83662e0 100644 ---- a/mz.h -+++ b/mz.h -@@ -158,9 +158,12 @@ - #include /* memset, strncpy, strlen */ - #include - --#if defined(HAVE_STDINT_H) || \ -- (defined(__has_include) && __has_include()) -+#if defined(HAVE_STDINT_H) - # include -+#elif defined(__has_include) -+# if __has_include() -+# include -+# endif - #endif - - #ifndef __INT8_TYPE__ -@@ -188,9 +191,12 @@ typedef unsigned int uint32_t; - typedef unsigned long long uint64_t; - #endif - --#if defined(HAVE_INTTYPES_H) || \ -- (defined(__has_include) && __has_include()) -+#if defined(HAVE_INTTYPES_H) - # include -+#elif defined(__has_include) -+# if __has_include() -+# include -+# endif - #endif - - #ifndef PRId8 --- -2.27.0 - diff --git a/buildroot/package/minizip/minizip.hash b/buildroot/package/minizip/minizip.hash index 74799b9d5..f150770ae 100644 --- a/buildroot/package/minizip/minizip.hash +++ b/buildroot/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c7f236268fef57ce5dcbd9645235a22890d62480a592e1b0515ecff93f9989b minizip-2.10.0.tar.gz +sha256 c2889690b1a1f55898d37d3fb51f05183a4861fb7d53ab702c6a5777bf232b75 minizip-2.10.6.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/buildroot/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk index 3fafab5f9..b2294fb53 100644 --- a/buildroot/package/minizip/minizip.mk +++ b/buildroot/package/minizip/minizip.mk @@ -4,15 +4,14 @@ # ################################################################################ -MINIZIP_VERSION = 2.10.0 +MINIZIP_VERSION = 2.10.6 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = \ - host-pkgconf \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) +MINIZIP_DEPENDENCIES = host-pkgconf MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ - -DMZ_COMPAT=OFF + -DMZ_COMPAT=OFF \ + -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE @@ -23,6 +22,13 @@ else MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIZIP_DEPENDENCIES += libiconv +MINIZIP_CONF_OPTS += -DMZ_ICONV=ON +else +MINIZIP_CONF_OPTS += -DMZ_ICONV=OFF +endif + ifeq ($(BR2_PACKAGE_LIBBSD),y) MINIZIP_DEPENDENCIES += libbsd MINIZIP_CONF_OPTS += -DMZ_LIBBSD=ON @@ -32,9 +38,22 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MINIZIP_DEPENDENCIES += openssl -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON +MINIZIP_CONF_OPTS += \ + -DMZ_OPENSSL=ON \ + -DMZ_PKCRYPT=ON \ + -DMZ_WZAES=ON else -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF +MINIZIP_CONF_OPTS += \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_WZAES=OFF +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +MINIZIP_DEPENDENCIES += xz +MINIZIP_CONF_OPTS += -DMZ_LZMA=ON +else +MINIZIP_CONF_OPTS += -DMZ_LZMA=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) diff --git a/buildroot/package/mksh/mksh.hash b/buildroot/package/mksh/mksh.hash index 7fc34fa3e..d81deccb3 100644 --- a/buildroot/package/mksh/mksh.hash +++ b/buildroot/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -sha256 907ed1a9586e7f18bdefdd4a763aaa8397b755e15034aa54f4d753bfb272e0e6 mksh-R59b.tgz +sha256 77ae1665a337f1c48c61d6b961db3e52119b38e58884d1c89684af31f87bc506 mksh-R59c.tgz # Locally computed -sha256 fb1e64c95ded58058c7f0cf5269236bc83c3cbda089cbb025b03e08f189bf47e mksh.1 +sha256 abf44a61ec777c98f8ae7e08e4fe25fe258e0c470215e2eeb22816f6bae72c80 mksh.1 diff --git a/buildroot/package/mksh/mksh.mk b/buildroot/package/mksh/mksh.mk index 05ddc3f4c..386b1bd01 100644 --- a/buildroot/package/mksh/mksh.mk +++ b/buildroot/package/mksh/mksh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MKSH_VERSION = 59b +MKSH_VERSION = 59c MKSH_SOURCE = mksh-R$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt diff --git a/buildroot/package/mmc-utils/mmc-utils.hash b/buildroot/package/mmc-utils/mmc-utils.hash index 86c644f77..e8b282661 100644 --- a/buildroot/package/mmc-utils/mmc-utils.hash +++ b/buildroot/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 df8876e0e671f502bb8872cecca3cc6d1055253fa314f3544d22829e129e024e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8.tar.gz -sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h +sha256 ffc8f77233d1bd39ce4ec68835ad94aa6762624e4e96fb60102e87ba82db083e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8-br1.tar.gz +sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h diff --git a/buildroot/package/moarvm/moarvm.hash b/buildroot/package/moarvm/moarvm.hash index 36f0a81f3..abe96c3d4 100644 --- a/buildroot/package/moarvm/moarvm.hash +++ b/buildroot/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 637883083f16c4398ffd3685ea6411daa605dd0862e1f59cce632bb2b994f2c4 MoarVM-2020.10.tar.gz +sha256 08914f1c464151ebc678cf0d360c9e479a036178fa7c9ddfd34aa4d556d03ea2 MoarVM-2020.12.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/buildroot/package/moarvm/moarvm.mk b/buildroot/package/moarvm/moarvm.mk index 9fe5f4c07..1f4140441 100644 --- a/buildroot/package/moarvm/moarvm.mk +++ b/buildroot/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2020.10 +MOARVM_VERSION = 2020.12 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk index e16bb2a16..377484a00 100644 --- a/buildroot/package/mongodb/mongodb.mk +++ b/buildroot/package/mongodb/mongodb.mk @@ -11,6 +11,8 @@ MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz MONGODB_LICENSE = Apache-2.0 (drivers), SSPL (database) MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt +MONGODB_CPE_ID_VENDOR = mongodb + MONGODB_DEPENDENCIES = \ boost \ host-python3-cheetah \ diff --git a/buildroot/package/mongoose/mongoose.hash b/buildroot/package/mongoose/mongoose.hash index b8be69be0..d9ed76c4a 100644 --- a/buildroot/package/mongoose/mongoose.hash +++ b/buildroot/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 mongoose-6.18.tar.gz -sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE +sha256 f099bf7223c527e1a0b7fc8888136a3992e8b5c7123839639213b9483bb4f95b mongoose-7.1.tar.gz +sha256 9553d057f2ba980642f2c18d87ed38896cff1c9612d77d684a73a11fe1443b05 LICENSE diff --git a/buildroot/package/mongoose/mongoose.mk b/buildroot/package/mongoose/mongoose.mk index 87f56d789..0974c7644 100644 --- a/buildroot/package/mongoose/mongoose.mk +++ b/buildroot/package/mongoose/mongoose.mk @@ -4,10 +4,11 @@ # ################################################################################ -MONGOOSE_VERSION = 6.18 +MONGOOSE_VERSION = 7.1 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE +MONGOOSE_CPE_ID_VENDOR = cesenta MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO @@ -16,7 +17,10 @@ MONGOOSE_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl -MONGOOSE_CFLAGS += -DMG_ENABLE_SSL +MONGOOSE_CFLAGS += -DMG_ENABLE_OPENSSL=1 +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +MONGOOSE_DEPENDENCIES += mbedtls +MONGOOSE_CFLAGS += -DMG_ENABLE_MBEDTLS=1 endif define MONGOOSE_BUILD_CMDS diff --git a/buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch b/buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch deleted file mode 100644 index 7bc7384ad..000000000 --- a/buildroot/package/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5232ec11c74eb49fb220a7e2df80e46ac621e941 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Sat, 7 Feb 2015 09:49:37 +0100 -Subject: [PATCH] Disable backtrace on not supported uclibc - -Signed-off-by: Angelo Compagnucci -Signed-off-by: Thomas Petazzoni ---- - libgc/include/gc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgc/include/gc.h b/libgc/include/gc.h -index 2265fdb..6485fc0 100644 ---- a/libgc/include/gc.h -+++ b/libgc/include/gc.h -@@ -500,7 +500,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb)); - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif --- -2.1.0 - diff --git a/buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch b/buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch deleted file mode 100644 index 4c1d52242..000000000 --- a/buildroot/package/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6f8346438e0257259867b5dca6bb6db54eb96705 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 7 Feb 2015 09:50:24 +0100 -Subject: [PATCH] Adjust libc.so path depending on C library being used - -By default, on Linux systems, Mono assumes that the C library is -libc.so.6. While this is true for glibc, it is not true for uClibc and -Musl based systems. This patch adds support for such systems. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 5d9961a..f6a7909 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2978,6 +2978,12 @@ case "$host" in - SQLITE="libsqlite.so" - SQLITE3="libsqlite3.so" - ;; -+ *-*-*uclibc*) -+ LIBC="libc.so.0" -+ ;; -+ *-*-*musl*) -+ LIBC="libc.so" -+ ;; - *-*-*linux*) - AC_PATH_X - dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh` --- -2.1.0 - diff --git a/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch b/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch deleted file mode 100644 index 8ff6b2f5c..000000000 --- a/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4dc1d1fe553f3a8ad00919324419aba54675239e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 May 2019 22:30:01 +0200 -Subject: [PATCH] configure.ac: checks for libunwind - -_Unwind_GetIP is used in build_stack_trace however this function can be -provided by libunwind so check for it to avoid the following build -failure: - -/home/buildroot/autobuild/run/instance-1/output/host/lib/gcc/arm-buildroot-linux-musleabihf/7.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: ./.libs/libmini.a(libmini_la-mini-exceptions.o): in function `build_stack_trace': -/home/buildroot/autobuild/run/instance-1/output/build/mono-5.20.1.27/mono/mini/mini-exceptions.c:365: undefined reference to `_Unwind_GetIP' -collect2: error: ld returned 1 exit status - -Fixes: - - http://autobuild.buildroot.net/results/dbd64c89815d393a4e28b312d74fd80ee6de92da - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d724f9e2d27..c3067246f08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2206,6 +2206,11 @@ if test x$host_win32 = xno; then - dnl ***************************** - AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket") - -+ dnl ***************************** -+ dnl *** Checks for libunwind *** -+ dnl **************************** -+ AC_CHECK_LIB(unwind, _Unwind_GetIP, LIBS="$LIBS -lunwind") -+ - case "$host" in - *-*-*freebsd*) - dnl ***************************** --- -2.20.1 - diff --git a/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch b/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch deleted file mode 100644 index cfda7fdfa..000000000 --- a/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 121928d29ac1e0aebb80531b3ebcca1a9ffcd618 Mon Sep 17 00:00:00 2001 -From: Bernhard Urban-Forster -Date: Fri, 6 Dec 2019 11:35:11 +0100 -Subject: [PATCH] [ppc32] delete leftover code from pre-monoctx area (#18072) - -Also update assert which doesn't make sense since we have moved over to MonoContext - -Some context: e7011c780f676914f559f14f25e76c192bb2b0b2 - -Fixes: https://github.com/mono/mono/issues/18064 -[Retrieved from: -https://github.com/mono/mono/commit/121928d29ac1e0aebb80531b3ebcca1a9ffcd618] -Signed-off-by: Fabrice Fontaine ---- - mono/mini/exceptions-ppc.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/mono/mini/exceptions-ppc.c b/mono/mini/exceptions-ppc.c -index 44d09bcaba1d..d14f8383eba9 100644 ---- a/mono/mini/exceptions-ppc.c -+++ b/mono/mini/exceptions-ppc.c -@@ -692,10 +692,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s - /* may need to adjust pointers in the new struct copy, depending on the OS */ - uc_copy = (MonoContext*)(sp + 16); - mono_sigctx_to_monoctx (uc, uc_copy); --#if defined(__linux__) && !defined(__mono_ppc64__) -- uc_copy->uc_mcontext.uc_regs = (gpointer)((char*)uc_copy + ((char*)uc->uc_mcontext.uc_regs - (char*)uc)); --#endif -- g_assert (mono_arch_ip_from_context (uc) == mono_arch_ip_from_context (uc_copy)); -+ g_assert (mono_arch_ip_from_context (uc) == MONO_CONTEXT_GET_IP (uc_copy)); - /* at the return form the signal handler execution starts in altstack_handle_and_restore() */ - UCONTEXT_REG_LNK(uc) = UCONTEXT_REG_NIP(uc); - #ifdef PPC_USES_FUNCTION_DESCRIPTOR diff --git a/buildroot/package/mono/Config.in b/buildroot/package/mono/Config.in index 0d555bfa8..44b8cf858 100644 --- a/buildroot/package/mono/Config.in +++ b/buildroot/package/mono/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS default y if (BR2_arm || BR2_armeb || BR2_i386 || \ BR2_powerpc || BR2_x86_64) depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS config BR2_PACKAGE_MONO bool "mono" @@ -15,6 +16,7 @@ config BR2_PACKAGE_MONO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBATOMIC_OPS help An open source, cross-platform, implementation of C# and the CLR that is binary compatible with Microsoft.NET. diff --git a/buildroot/package/mono/mono.hash b/buildroot/package/mono/mono.hash index fa5333867..2477e9231 100644 --- a/buildroot/package/mono/mono.hash +++ b/buildroot/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 ed5df4ec663a4e228e89e910e954fa18d33f72e790c11174e1b62fc8cca90ba0 mono-6.8.0.96.tar.xz +sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/buildroot/package/mono/mono.mk b/buildroot/package/mono/mono.mk index 274d9817e..df3481a49 100644 --- a/buildroot/package/mono/mono.mk +++ b/buildroot/package/mono/mono.mk @@ -4,12 +4,13 @@ # ################################################################################ -MONO_VERSION = 6.8.0.96 +MONO_VERSION = 6.12.0.90 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial MONO_LICENSE_FILES = LICENSE mcs/COPYING \ external/Newtonsoft.Json/Tools/7-zip/copying.txt +MONO_CPE_ID_VENDOR = mono-project MONO_INSTALL_STAGING = YES ## Mono native @@ -42,7 +43,8 @@ endif MONO_DEPENDENCIES += \ host-mono \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + libatomic_ops ## Mono managed diff --git a/buildroot/package/monolite/monolite.hash b/buildroot/package/monolite/monolite.hash index bd953591b..b008d42eb 100644 --- a/buildroot/package/monolite/monolite.hash +++ b/buildroot/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 4b75a73bb4a99b8e3b51837afb72192cce27b482cb5ec70cc136b293071f902e monolite-linux-ABB721D6-116A-4555-B4FD-9248146D2051-latest.tar.gz +sha256 0ac314f75ca2bc4455785f12ceb50da89b6dac90162f9f46afbbb988a8752d4b monolite-linux-1A5E0066-58DC-428A-B21C-0AD6CDAE2789-latest.tar.gz diff --git a/buildroot/package/monolite/monolite.mk b/buildroot/package/monolite/monolite.mk index b9e3990c4..b0042aabf 100644 --- a/buildroot/package/monolite/monolite.mk +++ b/buildroot/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = ABB721D6-116A-4555-B4FD-9248146D2051 +MONOLITE_VERSION = 1A5E0066-58DC-428A-B21C-0AD6CDAE2789 MONOLITE_SITE = http://download.mono-project.com/monolite MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial diff --git a/buildroot/package/mosquitto/mosquitto.hash b/buildroot/package/mosquitto/mosquitto.hash index 13f0c8de2..225d4f2b3 100644 --- a/buildroot/package/mosquitto/mosquitto.hash +++ b/buildroot/package/mosquitto/mosquitto.hash @@ -1,8 +1,8 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-1.6.12.tar.gz.asc -sha256 548d73d19fb787dd0530334e398fd256ef3a581181678488a741a995c4f007fb mosquitto-1.6.12.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.7.tar.gz.asc +sha256 a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e mosquitto-2.0.7.tar.gz # License files -sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 +sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt +sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 diff --git a/buildroot/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk index fcd9cb7de..7dfdf5945 100644 --- a/buildroot/package/mosquitto/mosquitto.mk +++ b/buildroot/package/mosquitto/mosquitto.mk @@ -4,13 +4,15 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.6.12 +MOSQUITTO_VERSION = 2.0.7 MOSQUITTO_SITE = https://mosquitto.org/files/source -MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 -MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 +MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 +MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 +MOSQUITTO_CPE_ID_VENDOR = eclipse MOSQUITTO_INSTALL_STAGING = YES MOSQUITTO_MAKE_OPTS = \ + CLIENT_STATIC_LDADD="$(MOSQUITTO_STATIC_LIBS)" \ UNAME=Linux \ STRIP=true \ prefix=/usr \ @@ -50,13 +52,20 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MOSQUITTO_DEPENDENCIES += host-pkgconf openssl -MOSQUITTO_MAKE_OPTS += \ - WITH_TLS=yes \ - CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" +MOSQUITTO_MAKE_OPTS += WITH_TLS=yes +MOSQUITTO_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` else MOSQUITTO_MAKE_OPTS += WITH_TLS=no endif +ifeq ($(BR2_PACKAGE_CJSON),y) +MOSQUITTO_DEPENDENCIES += cjson +MOSQUITTO_MAKE_OPTS += WITH_CJSON=yes +MOSQUITTO_STATIC_LIBS += -lcjson +else +MOSQUITTO_MAKE_OPTS += WITH_CJSON=no +endif + ifeq ($(BR2_PACKAGE_C_ARES),y) MOSQUITTO_DEPENDENCIES += c-ares MOSQUITTO_MAKE_OPTS += WITH_SRV=yes diff --git a/buildroot/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch b/buildroot/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch new file mode 100644 index 000000000..e120b3e4e --- /dev/null +++ b/buildroot/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch @@ -0,0 +1,38 @@ +From 4c37d0b316a15213381bd7e07c5dee7526471fc8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 1 Feb 2021 08:10:45 +0100 +Subject: [PATCH] src/tag/meson.build: fix GenParseName linking + +Set link_language to cpp for GenParseName to avoid the following build +failure due to gcc being used to link a C and C++ source file: + +FAILED: src/tag/GenParseName +/usr/bin/gcc -o src/tag/GenParseName src/tag/GenParseName.p/GenParseName.cxx.o src/tag/GenParseName.p/Names.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 +/usr/bin/ld: src/tag/GenParseName.p/GenParseName.cxx.o: in function `std::_Rb_tree >, std::pair > const, TagType>, std::_Select1st > const, TagType> >, std::less > >, std::allocator > const, TagType> > >::_M_erase(std::_Rb_tree_node > const, TagType> >*)': +GenParseName.cxx: +(.text._ZNSt8_Rb_treeISt17basic_string_viewIcSt11char_traitsIcEESt4pairIKS3_7TagTypeESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E[_ZNSt8_Rb_treeISt17basic_string_viewIcSt11char_traitsIcEESt4pairIKS3_7TagTypeESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E]+0x23): undefined reference to `operator delete(void*)' + +Fixes: + - http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MusicPlayerDaemon/MPD/pull/1068] +--- + src/tag/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tag/meson.build b/src/tag/meson.build +index 064eada18..4fda35e52 100644 +--- a/src/tag/meson.build ++++ b/src/tag/meson.build +@@ -2,6 +2,7 @@ generate_parse_name = executable( + 'GenParseName', + 'GenParseName.cxx', + 'Names.c', ++ link_language: 'cpp', + native: true, + ) + +-- +2.29.2 + diff --git a/buildroot/package/mpd/Config.in b/buildroot/package/mpd/Config.in index c7cb96315..9748c7d0a 100644 --- a/buildroot/package/mpd/Config.in +++ b/buildroot/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_6 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -84,13 +84,6 @@ config BR2_PACKAGE_MPD_LIBSOXR comment "Decoder plugins" -config BR2_PACKAGE_MPD_AUDIOFILE - bool "audiofile" - select BR2_PACKAGE_AUDIOFILE - help - Enable audiofile input/streaming support. - Select this if you want to play back WAV files. - config BR2_PACKAGE_MPD_DSD bool "dsd" help @@ -405,11 +398,10 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_7 diff --git a/buildroot/package/mpd/mpd.hash b/buildroot/package/mpd/mpd.hash index 038143077..866c61d15 100644 --- a/buildroot/package/mpd/mpd.hash +++ b/buildroot/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201 mpd-0.21.25.tar.xz +sha256 338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf mpd-0.22.3.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mpd/mpd.mk b/buildroot/package/mpd/mpd.mk index 687363bbf..5dfb5b42a 100644 --- a/buildroot/package/mpd/mpd.mk +++ b/buildroot/package/mpd/mpd.mk @@ -4,13 +4,16 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.21 -MPD_VERSION = $(MPD_VERSION_MAJOR).25 +MPD_VERSION_MAJOR = 0.22 +MPD_VERSION = $(MPD_VERSION_MAJOR).3 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING +MPD_CONF_OPTS = \ + -Daudiofile=disabled \ + -Ddocumentation=disabled # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) @@ -42,13 +45,6 @@ else MPD_CONF_OPTS += -Dao=disabled endif -ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y) -MPD_DEPENDENCIES += audiofile -MPD_CONF_OPTS += -Daudiofile=enabled -else -MPD_CONF_OPTS += -Daudiofile=disabled -endif - ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) MPD_DEPENDENCIES += bzip2 MPD_CONF_OPTS += -Dbzip2=enabled diff --git a/buildroot/package/mpfr/mpfr.mk b/buildroot/package/mpfr/mpfr.mk index ef2999eb1..837aff3aa 100644 --- a/buildroot/package/mpfr/mpfr.mk +++ b/buildroot/package/mpfr/mpfr.mk @@ -9,6 +9,7 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER +MPFR_CPE_ID_VENDOR = gnu MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp diff --git a/buildroot/package/mpv/Config.in b/buildroot/package/mpv/Config.in index 697ad57ba..812491e3a 100644 --- a/buildroot/package/mpv/Config.in +++ b/buildroot/package/mpv/Config.in @@ -1,12 +1,15 @@ config BR2_PACKAGE_MPV bool "mpv" + depends on BR2_INSTALL_LIBSTDCPP # libass + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE + select BR2_PACKAGE_LIBASS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # Select xkbcommon for wayland to avoid being mysterious @@ -23,8 +26,10 @@ config BR2_PACKAGE_MPV https://mpv.io/ -comment "mpv needs a toolchain w/ threads, gcc >= 4.5" +comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/mpv/mpv.hash b/buildroot/package/mpv/mpv.hash index 37db77135..548a0f015 100644 --- a/buildroot/package/mpv/mpv.hash +++ b/buildroot/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9163f64832226d22e24bbc4874ebd6ac02372cd717bef15c28a0aa858c5fe592 mpv-0.32.0.tar.gz +sha256 f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 mpv-0.33.0.tar.gz sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/buildroot/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk index a7c9f7d74..18f307d18 100644 --- a/buildroot/package/mpv/mpv.mk +++ b/buildroot/package/mpv/mpv.mk @@ -4,10 +4,10 @@ # ################################################################################ -MPV_VERSION = 0.32.0 +MPV_VERSION = 0.33.0 MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ - host-pkgconf ffmpeg zlib \ + host-pkgconf ffmpeg libass zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPL-2.0+ MPV_LICENSE_FILES = LICENSE.GPL @@ -23,7 +23,6 @@ MPV_CONF_OPTS = \ --disable-coreaudio \ --disable-cuda-hwaccel \ --disable-opensles \ - --disable-rsound \ --disable-rubberband \ --disable-uchardet \ --disable-vapoursynth @@ -77,14 +76,6 @@ else MPV_CONF_OPTS += --disable-libarchive endif -# libass subtitle support -ifeq ($(BR2_PACKAGE_LIBASS),y) -MPV_CONF_OPTS += --enable-libass -MPV_DEPENDENCIES += libass -else -MPV_CONF_OPTS += --disable-libass -endif - # bluray support ifeq ($(BR2_PACKAGE_LIBBLURAY),y) MPV_CONF_OPTS += --enable-libbluray @@ -150,14 +141,6 @@ else MPV_CONF_OPTS += --disable-pulse endif -# samba support -ifeq ($(BR2_PACKAGE_SAMBA4),y) -MPV_CONF_OPTS += --enable-libsmbclient -MPV_DEPENDENCIES += samba4 -else -MPV_CONF_OPTS += --disable-libsmbclient -endif - # SDL support # Sdl2 requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) diff --git a/buildroot/package/mrouted/Config.in b/buildroot/package/mrouted/Config.in index e5d9348d1..f8dd173c4 100644 --- a/buildroot/package/mrouted/Config.in +++ b/buildroot/package/mrouted/Config.in @@ -3,5 +3,24 @@ config BR2_PACKAGE_MROUTED depends on BR2_USE_MMU # fork() help An implementation of the DVMRP multicast routing protocol. + Unlike PIM a DVMRP router has a distance vector protocol (like + RIP) built-in to figure out the reverse-path to the multicast + source. This package comes with mrouted and mroutectl. Where + the latter is used to query status and control operation. + + Note: at least two interfaces with MULTICAST flag is requried. http://github.com/troglobit/mrouted + +if BR2_PACKAGE_MROUTED + +config BR2_PACKAGE_MROUTED_RSRR + bool "enable RSRR for RSVP" + help + Routing Support for Resource Reservation, currently used by + RSVP. This is an EXPERIMENTAL feature. + + For details, see: + http://tools.ietf.org/html/draft-ietf-rsvp-routing-02 + +endif diff --git a/buildroot/package/sysklogd/S02klogd b/buildroot/package/mrouted/S41mrouted old mode 100644 new mode 100755 similarity index 77% rename from buildroot/package/sysklogd/S02klogd rename to buildroot/package/mrouted/S41mrouted index ba728aa99..7dca25825 --- a/buildroot/package/sysklogd/S02klogd +++ b/buildroot/package/mrouted/S41mrouted @@ -1,11 +1,9 @@ #!/bin/sh -DAEMON="klogd" +DAEMON="mrouted" PIDFILE="/var/run/$DAEMON.pid" -KLOGD_ARGS="" - -KLOGD_RELOAD="0" +MROUTED_ARGS="-w 30" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" @@ -14,7 +12,7 @@ start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ - -- $KLOGD_ARGS + -- $MROUTED_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" @@ -42,11 +40,10 @@ restart() { start } -# SIGUSR1 makes klogd reload kernel module symbols -# SIGUSR2 makes klogd reload static kernel symbols and kernel module symbols +# SIGHUP makes mrouted reload its configuration reload() { printf 'Reloading %s: ' "$DAEMON" - start-stop-daemon -K -s "$KLOGD_RELOAD" -q -p "$PIDFILE" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/buildroot/package/mrouted/mrouted.hash b/buildroot/package/mrouted/mrouted.hash index 22eeb8cef..188293025 100644 --- a/buildroot/package/mrouted/mrouted.hash +++ b/buildroot/package/mrouted/mrouted.hash @@ -1,6 +1,6 @@ -# From https://github.com/troglobit/mrouted/releases/download/4.1/mrouted-4.1.tar.gz.md5 -md5 e1f9bc0a895a2accae511a44e2a4a6f7 mrouted-4.1.tar.gz +# From https://github.com/troglobit/mrouted/releases/download/4.2/mrouted-4.2.tar.gz.md5 +md5 b921f9e152e039efdac745438ef8362c mrouted-4.2.tar.gz # Locally calculated -sha256 fd4735316f5510dfccfcbed441aa11619b261501dccf9e793a311d618c0843c5 mrouted-4.1.tar.gz +sha256 689541334ea951286054b771640e9d0f26b6a3242ff7f3894a3ef1b680811b34 mrouted-4.2.tar.gz sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/buildroot/package/mrouted/mrouted.mk b/buildroot/package/mrouted/mrouted.mk index ae2f8a4e2..95da0c622 100644 --- a/buildroot/package/mrouted/mrouted.mk +++ b/buildroot/package/mrouted/mrouted.mk @@ -4,17 +4,35 @@ # ################################################################################ -MROUTED_VERSION = 4.1 +MROUTED_VERSION = 4.2 MROUTED_SITE = \ https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION) MROUTED_DEPENDENCIES = host-bison MROUTED_LICENSE = BSD-3-Clause MROUTED_LICENSE_FILES = LICENSE -MROUTED_CONFIGURE_OPTS = --enable-rsrr +MROUTED_CPE_ID_VENDOR = troglobit + +ifeq ($(BR2_PACKAGE_MROUTED_RSRR),y) +MROUTED_CONF_OPTS += --enable-rsrr +else +MROUTED_CONF_OPTS += --disable-rsrr +endif + +define MROUTED_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/mrouted/S41mrouted \ + $(TARGET_DIR)/etc/init.d/S41mrouted +endef define MROUTED_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/mrouted.service \ $(TARGET_DIR)/usr/lib/systemd/system/mrouted.service endef +# We will asume that CONFIG_NET and CONFIG_INET are already +# set in the kernel configuration provided by the user. +define MROUTED_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MULTICAST) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_MROUTE) +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/msmtp/msmtp.hash b/buildroot/package/msmtp/msmtp.hash index 8fc674bfa..1e73d9247 100644 --- a/buildroot/package/msmtp/msmtp.hash +++ b/buildroot/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.11.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.14.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 f25f0fa177ce9e0ad65c127e790a37f35fb64fee9e33d90345844c5c86780e60 msmtp-1.8.11.tar.xz +sha256 d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4 msmtp-1.8.14.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk index 43a9ed1e9..cae03d772 100644 --- a/buildroot/package/msmtp/msmtp.mk +++ b/buildroot/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.11 +MSMTP_VERSION = 1.8.14 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/mtd/mtd.mk b/buildroot/package/mtd/mtd.mk index 9f259b35d..c4fa56d26 100644 --- a/buildroot/package/mtd/mtd.mk +++ b/buildroot/package/mtd/mtd.mk @@ -9,6 +9,8 @@ MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 MTD_LICENSE_FILES = COPYING +MTD_CPE_ID_VENDOR = mtd-utils_project +MTD_CPE_ID_PRODUCT = mtd-utils MTD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) diff --git a/buildroot/package/mtools/mtools.hash b/buildroot/package/mtools/mtools.hash index 8930c0219..86cfe693d 100644 --- a/buildroot/package/mtools/mtools.hash +++ b/buildroot/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c443306ae1c5ae9ce749e6f0acc4b8f02d583fe6e4b3732489edb2e7329307d6 mtools-4.0.24.tar.lz +sha256 d09cff66d7277ad36a7573fc3e9803bfa558cdda83baabaafbf7761317462283 mtools-4.0.26.tar.lz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mtools/mtools.mk b/buildroot/package/mtools/mtools.mk index 268c3003d..6d63a565b 100644 --- a/buildroot/package/mtools/mtools.mk +++ b/buildroot/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.24 +MTOOLS_VERSION = 4.0.26 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/buildroot/package/mtr/mtr.mk b/buildroot/package/mtr/mtr.mk index 7a4b14026..263482534 100644 --- a/buildroot/package/mtr/mtr.mk +++ b/buildroot/package/mtr/mtr.mk @@ -11,5 +11,6 @@ MTR_CONF_OPTS = --without-gtk MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses) MTR_LICENSE = GPL-2.0 MTR_LICENSE_FILES = COPYING +MTR_SELINUX_MODULES = netutils $(eval $(autotools-package)) diff --git a/buildroot/package/musl/0003-rewrite-wcsnrtombs-to-fix-buffer-overflow-and-other-.patch b/buildroot/package/musl/0003-rewrite-wcsnrtombs-to-fix-buffer-overflow-and-other-.patch deleted file mode 100644 index 2fb29940a..000000000 --- a/buildroot/package/musl/0003-rewrite-wcsnrtombs-to-fix-buffer-overflow-and-other-.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 3ab2a4e02682df1382955071919d8aa3c3ec40d4 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Thu, 19 Nov 2020 17:12:43 -0500 -Subject: [PATCH] rewrite wcsnrtombs to fix buffer overflow and other bugs - -the original wcsnrtombs implementation, which has been largely -untouched since 0.5.0, attempted to build input-length-limiting -conversion on top of wcsrtombs, which only limits output length. as -best I recall, this choice was made out of a mix of disdain over -having yet another variant function to implement (added in POSIX 2008; -not standard C) and preference not to switch things around and -implement the wcsrtombs in terms of the more general new function, -probably over namespace issues. the strategy employed was to impose -output limits that would ensure the input limit wasn't exceeded, then -finish up the tail character-at-a-time. unfortunately, none of that -worked correctly. - -first, the logic in the wcsrtombs loop was wrong in that it could -easily get stuck making no forward progress, by imposing an output -limit too small to convert even one character. - -the character-at-a-time loop that followed was even worse. it made no -effort to ensure that the converted multibyte character would fit in -the remaining output space, only that there was a nonzero amount of -output space remaining. it also employed an incorrect interpretation -of wcrtomb's interface contract for converting the null character, -thereby failing to act on end of input, and remaining space accounting -was subject to unsigned wrap-around. together these errors allow -unbounded overflow of the destination buffer, controlled by input -length limit and input wchar_t string contents. - -given the extent to which this function was broken, it's plausible -that most applications that would have been rendered exploitable were -sufficiently broken not to be usable in the first place. however, it's -also plausible that common (especially ASCII-only) inputs succeeded in -the wcsrtombs loop, which mostly worked, while leaving the wildly -erroneous code in the second loop exposed to particular non-ASCII -inputs. - -CVE-2020-28928 has been assigned for this issue. - -Signed-off-by: Peter Korsgaard ---- - src/multibyte/wcsnrtombs.c | 46 ++++++++++++++++---------------------- - 1 file changed, 19 insertions(+), 27 deletions(-) - -diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c -index 676932b5..95e25e70 100644 ---- a/src/multibyte/wcsnrtombs.c -+++ b/src/multibyte/wcsnrtombs.c -@@ -1,41 +1,33 @@ - #include -+#include -+#include - - size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict st) - { -- size_t l, cnt=0, n2; -- char *s, buf[256]; - const wchar_t *ws = *wcs; -- const wchar_t *tmp_ws; -- -- if (!dst) s = buf, n = sizeof buf; -- else s = dst; -- -- while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) { -- if (n2>=n) n2=n; -- tmp_ws = ws; -- l = wcsrtombs(s, &ws, n2, 0); -- if (!(l+1)) { -- cnt = l; -- n = 0; -+ size_t cnt = 0; -+ if (!dst) n=0; -+ while (ws && wn) { -+ char tmp[MB_LEN_MAX]; -+ size_t l = wcrtomb(nn) break; -+ memcpy(dst, tmp, l); -+ } -+ dst += l; - n -= l; - } -- wn = ws ? wn - (ws - tmp_ws) : 0; -- cnt += l; -- } -- if (ws) while (n && wn) { -- l = wcrtomb(s, *ws, 0); -- if ((l+1)<=1) { -- if (!l) ws = 0; -- else cnt = l; -+ if (!*ws) { -+ ws = 0; - break; - } -- ws++; wn--; -- /* safe - this loop runs fewer than sizeof(buf) times */ -- s+=l; n-=l; -+ ws++; -+ wn--; - cnt += l; - } - if (dst) *wcs = ws; --- -2.20.1 - diff --git a/buildroot/package/musl/musl.hash b/buildroot/package/musl/musl.hash index 39f105796..4ab18cebd 100644 --- a/buildroot/package/musl/musl.hash +++ b/buildroot/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://musl.libc.org/releases/musl-1.2.1.tar.gz.asc -sha256 68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b musl-1.2.1.tar.gz +# https://musl.libc.org/releases/musl-1.2.2.tar.gz.asc +sha256 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/buildroot/package/musl/musl.mk b/buildroot/package/musl/musl.mk index bc4237968..82b3eeaf5 100644 --- a/buildroot/package/musl/musl.mk +++ b/buildroot/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.2.1 +MUSL_VERSION = 1.2.2 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk index 587232e82..9557983a0 100644 --- a/buildroot/package/mutt/mutt.mk +++ b/buildroot/package/mutt/mutt.mk @@ -8,6 +8,7 @@ MUTT_VERSION = 1.14.7 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL +MUTT_CPE_ID_VENDOR = mutt MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp @@ -35,6 +36,15 @@ else MUTT_CONF_OPTS += --without-idn --without-idn2 endif +ifeq ($(BR2_PACKAGE_LIBGPGME),y) +MUTT_DEPENDENCIES += libgpgme +MUTT_CONF_OPTS += \ + --enable-gpgme \ + --with-gpgme-prefix=$(STAGING_DIR)/usr +else +MUTT_CONF_OPTS += --disable-gpgme +endif + ifeq ($(BR2_PACKAGE_MUTT_IMAP),y) MUTT_CONF_OPTS += --enable-imap else @@ -51,12 +61,23 @@ endif ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl -MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr +MUTT_CONF_OPTS += \ + --without-gnutls \ + --with-ssl=$(STAGING_DIR)/usr +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +MUTT_DEPENDENCIES += gnutls +MUTT_CONF_OPTS += \ + --with-gnutls=$(STAGING_DIR)/usr \ + --without-ssl else -MUTT_CONF_OPTS += --without-ssl +MUTT_CONF_OPTS += \ + --without-gnutls \ + --without-ssl endif else -MUTT_CONF_OPTS += --without-ssl +MUTT_CONF_OPTS += \ + --without-gnutls \ + --without-ssl endif ifeq ($(BR2_PACKAGE_SQLITE),y) diff --git a/buildroot/package/mxsldr/Config.in.host b/buildroot/package/mxsldr/Config.in.host index 0a02877c8..7c49f0201 100644 --- a/buildroot/package/mxsldr/Config.in.host +++ b/buildroot/package/mxsldr/Config.in.host @@ -1,9 +1,14 @@ config BR2_PACKAGE_HOST_MXSLDR bool "host mxsldr" depends on BR2_arm || BR2_armeb + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package contains tools to download and execute code on Freescale i.MX23 and i.MX28 SoC's through the Serial Download Protocol. https://gitlab.denx.de/denx/mxsldr + +comment "host mxsldr needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_armeb + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/nano/Config.in b/buildroot/package/nano/Config.in index 4b340ff5b..b0b7a3e7a 100644 --- a/buildroot/package/nano/Config.in +++ b/buildroot/package/nano/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_NANO A nice ncurses-based editor. Started out as a clone of pico. Great editor for new users. - http://www.nano-editor.org/ + https://www.nano-editor.org/ if BR2_PACKAGE_NANO diff --git a/buildroot/package/nano/nano.hash b/buildroot/package/nano/nano.hash index 792f18a09..4498414fd 100644 --- a/buildroot/package/nano/nano.hash +++ b/buildroot/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v5/nano-5.2.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.5.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 32c2da43e1ae9a5e43437d8c6e1ec0388af870c7762c479e5bffb5f292bda7e1 nano-5.2.tar.xz +sha256 390b81bf9b41ff736db997aede4d1f60b4453fbd75a519a4ddb645f6fd687e4a nano-5.5.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/nano/nano.mk b/buildroot/package/nano/nano.mk index 67ce07298..d47c749ef 100644 --- a/buildroot/package/nano/nano.mk +++ b/buildroot/package/nano/nano.mk @@ -5,14 +5,11 @@ ################################################################################ NANO_VERSION_MAJOR = 5 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION = $(NANO_VERSION_MAJOR).5 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ NANO_LICENSE_FILES = COPYING -NANO_CONF_OPTS = \ - --without-slang \ - --with-wordbounds NANO_DEPENDENCIES = ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -22,18 +19,23 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false NANO_MAKE_ENV += CURSES_LIB="-lncurses" endif -ifeq ($(BR2_PACKAGE_FILE),y) -NANO_DEPENDENCIES += file -NANO_CONF_OPTS += --enable-libmagic -else -NANO_CONF_OPTS += --disable-libmagic -endif - ifeq ($(BR2_PACKAGE_NANO_TINY),y) -NANO_CONF_OPTS += --enable-tiny +NANO_CONF_OPTS += \ + --enable-tiny \ + --disable-libmagic \ + --disable-color \ + --disable-nanorc define NANO_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano endef -endif +else +NANO_CONF_OPTS += --disable-tiny +ifeq ($(BR2_PACKAGE_FILE),y) +NANO_DEPENDENCIES += file +NANO_CONF_OPTS += --enable-libmagic --enable-color --enable-nanorc +else +NANO_CONF_OPTS += --disable-libmagic --disable-libmagic --disable-color +endif # BR2_PACKAGE_FILE +endif # BR2_PACKAGE_NANO_TINY $(eval $(autotools-package)) diff --git a/buildroot/package/ncmpc/ncmpc.hash b/buildroot/package/ncmpc/ncmpc.hash index a95358ec5..3215b35b1 100644 --- a/buildroot/package/ncmpc/ncmpc.hash +++ b/buildroot/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 64ebe320c2fbe4dfbff4461ceae730001841d06d48c4882d69f320912a0f11a8 ncmpc-0.39.tar.xz +sha256 a5f7471d766a71c222374efa4aa17ef6ee0e42ad48d15528edd935d1f0f6cd4d ncmpc-0.42.tar.xz # Hash for license file: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/ncmpc/ncmpc.mk b/buildroot/package/ncmpc/ncmpc.mk index 1742ad20f..c229fd298 100644 --- a/buildroot/package/ncmpc/ncmpc.mk +++ b/buildroot/package/ncmpc/ncmpc.mk @@ -5,7 +5,7 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).39 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).42 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = \ @@ -16,6 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING +NCMPC_CPE_ID_VALID = YES NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ diff --git a/buildroot/package/ncurses/ncurses.mk b/buildroot/package/ncurses/ncurses.mk index 4d8dcecc3..97e3e2c32 100644 --- a/buildroot/package/ncurses/ncurses.mk +++ b/buildroot/package/ncurses/ncurses.mk @@ -10,6 +10,7 @@ NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING +NCURSES_CPE_ID_VENDOR = gnu NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ diff --git a/buildroot/package/ne10/ne10.mk b/buildroot/package/ne10/ne10.mk index 58652c045..e529caf2a 100644 --- a/buildroot/package/ne10/ne10.mk +++ b/buildroot/package/ne10/ne10.mk @@ -12,6 +12,8 @@ NE10_INSTALL_STAGING = YES NE10_CONF_OPTS = \ -DGNULINUX_PLATFORM=ON \ + -DNE10_BUILD_EXAMPLES=OFF \ + -DNE10_BUILD_UNIT_TEST=OFF \ -DNE10_LINUX_TARGET_ARCH=$(if $(BR2_aarch64),aarch64,armv7) ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/neofetch/Config.in b/buildroot/package/neofetch/Config.in new file mode 100644 index 000000000..409466bc1 --- /dev/null +++ b/buildroot/package/neofetch/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_NEOFETCH + bool "neofetch" + depends on BR2_USE_MMU # bash + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_BASH # runtime dependency + help + Neofetch is a bash script to display system information, + including hardware, in a visually pleasing way. + + https://github.com/dylanaraps/neofetch diff --git a/buildroot/package/neofetch/neofetch.hash b/buildroot/package/neofetch/neofetch.hash new file mode 100644 index 000000000..092771514 --- /dev/null +++ b/buildroot/package/neofetch/neofetch.hash @@ -0,0 +1,2 @@ +sha256 58a95e6b714e41efc804eca389a223309169b2def35e57fa934482a6b47c27e7 neofetch-7.1.0.tar.gz +sha256 fc3034b3dd3a08db109949b629210213bba52aa95455cbc5c2fefa2fc1183efe LICENSE.md diff --git a/buildroot/package/neofetch/neofetch.mk b/buildroot/package/neofetch/neofetch.mk new file mode 100644 index 000000000..4ea6c27b2 --- /dev/null +++ b/buildroot/package/neofetch/neofetch.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# neofetch +# +################################################################################ + +NEOFETCH_VERSION = 7.1.0 +NEOFETCH_SITE = $(call github,dylanaraps,neofetch,$(NEOFETCH_VERSION)) +NEOFETCH_LICENSE = MIT +NEOFETCH_LICENSE_FILES = LICENSE.md + +define NEOFETCH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/neofetch \ + $(TARGET_DIR)/usr/bin/neofetch +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/net-tools/net-tools.hash b/buildroot/package/net-tools/net-tools.hash index 510cac365..e29415b8f 100644 --- a/buildroot/package/net-tools/net-tools.hash +++ b/buildroot/package/net-tools/net-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f7cfe9e73825bac9ab1a6f99d1fc7f54bfd9d33a6f62ba58d28a566905c4e86c net-tools-479bb4a7e11a4084e2935c0a576388f92469225b.tar.gz +sha256 4c68ef33d97cc807fe437fa64a801355c36d638774c0c8a4342742f6bdceea78 net-tools-479bb4a7e11a4084e2935c0a576388f92469225b-br1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/netcat-openbsd/Config.in b/buildroot/package/netcat-openbsd/Config.in index 4734ff990..beaa8ed45 100644 --- a/buildroot/package/netcat-openbsd/Config.in +++ b/buildroot/package/netcat-openbsd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NETCAT_OPENBSD bool "netcat-openbsd" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # libbsd depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS @@ -21,8 +22,9 @@ config BR2_PACKAGE_NETCAT_OPENBSD https://packages.debian.org/sid/netcat-openbsd -comment "netcat-openbsd needs a glibc toolchain w/ threads, headers >= 3.12" +comment "netcat-openbsd needs a glibc toolchain w/ dynamic library, threads, headers >= 3.12" depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/buildroot/package/netcat-openbsd/netcat-openbsd.hash b/buildroot/package/netcat-openbsd/netcat-openbsd.hash index cfa65ee24..b70cae886 100644 --- a/buildroot/package/netcat-openbsd/netcat-openbsd.hash +++ b/buildroot/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b46c11f83f66c41ad8f413e842c51a9fb2c495e9a2ed836e6ee75bc314545c30 netcat-openbsd-debian_1.195-2.tar.gz -sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright +sha256 55e578f652cbf6ffc95f75ea3e2645ab335fab63649568bd7cdb0a6331ca87de netcat-openbsd-debian_1.195-2-br1.tar.gz +sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright diff --git a/buildroot/package/netcat/netcat.mk b/buildroot/package/netcat/netcat.mk index eb7ddcac2..c9d7952e5 100644 --- a/buildroot/package/netcat/netcat.mk +++ b/buildroot/package/netcat/netcat.mk @@ -8,5 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING +NETCAT_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch b/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch deleted file mode 100644 index 76c71d0ff..000000000 --- a/buildroot/package/netopeer2/0001-scripts-FEATURE-support-using-current-user-for-SR-mo.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 4a950257fa353e27ef1bd753bca4d0279f41bc77 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Mon, 24 Aug 2020 13:47:40 +0200 -Subject: [PATCH] scripts FEATURE support using current user for SR modules - -Mostly for special cases user/group configuration -when the user/group cannot be retrieved normally. - -Fixes #701 ---- - CMakeLists.txt | 10 +++++----- - scripts/setup.sh | 23 +++++++++++++++++++---- - 2 files changed, 24 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77aea1f..8fd6b43 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,19 +68,19 @@ if(NOT MODULES_OWNER) - OUTPUT_VARIABLE MODULES_OWNER OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE) - if(RET) -- message(FATAL_ERROR "Learning server module user failed: ${ERROR_STR}") -+ message(WARNING "Learning server module user failed (${ERROR_STR}), the current user will be used.") - endif() - endif() --set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules") --if(NOT MODULES_GROUP) -+set(MODULES_OWNER "${MODULES_OWNER}" CACHE STRING "System user that will become the owner of server modules, empty means the current user") -+if(NOT MODULES_GROUP AND MODULES_OWNER) - execute_process(COMMAND id -gn ${MODULES_OWNER} RESULT_VARIABLE RET - OUTPUT_VARIABLE MODULES_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_VARIABLE ERROR_STR OUTPUT_STRIP_TRAILING_WHITESPACE) - if(RET) -- message(FATAL_ERROR "Learning server module group failed: ${ERROR_STR}") -+ message(WARNING "Learning server module group failed (${ERROR_STR}), the current user group will be used.") - endif() - endif() --set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to") -+set(MODULES_GROUP "${MODULES_GROUP}" CACHE STRING "System group that the server modules will belong to, empty means the current user group") - - # set prefix for the PID file - if(NOT PIDFILE_PREFIX) -diff --git a/scripts/setup.sh b/scripts/setup.sh -index 9591a49..b7c7ba4 100755 ---- a/scripts/setup.sh -+++ b/scripts/setup.sh -@@ -1,7 +1,8 @@ - #!/bin/bash - --# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS, NP2_MODULE_OWNER, NP2_MODULE_GROUP must be defined when executing this script! --if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" -o -z "$NP2_MODULE_OWNER" -o -z "$NP2_MODULE_GROUP" ]; then -+# env variables NP2_MODULE_DIR, NP2_MODULE_PERMS must be defined and NP2_MODULE_OWNER, NP2_MODULE_GROUP will be used if -+# defined when executing this script! -+if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" ]; then - echo "Required environment variables not defined!" - exit 1 - fi -@@ -37,7 +38,14 @@ MODULES=( - - # functions - INSTALL_MODULE() { -- "$SYSREPOCTL" -a -i $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 -+ CMD="'$SYSREPOCTL' -a -i $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" -+ if [ ! -z ${OWNER} ]; then -+ CMD="$CMD -o '$OWNER'" -+ fi -+ if [ ! -z ${GROUP} ]; then -+ CMD="$CMD -g '$GROUP'" -+ fi -+ eval $CMD - local rc=$? - if [ $rc -ne 0 ]; then - exit $rc -@@ -45,7 +53,14 @@ INSTALL_MODULE() { - } - - UPDATE_MODULE() { -- "$SYSREPOCTL" -a -U $MODDIR/$1 -s "$MODDIR" -p "$PERMS" -o "$OWNER" -g "$GROUP" -v2 -+ CMD="'$SYSREPOCTL' -a -U $MODDIR/$1 -s '$MODDIR' -p '$PERMS' -v2" -+ if [ ! -z ${OWNER} ]; then -+ CMD="$CMD -o '$OWNER'" -+ fi -+ if [ ! -z ${GROUP} ]; then -+ CMD="$CMD -g '$GROUP'" -+ fi -+ eval $CMD - local rc=$? - if [ $rc -ne 0 ]; then - exit $rc --- -2.20.1 - diff --git a/buildroot/package/netopeer2/netopeer2.hash b/buildroot/package/netopeer2/netopeer2.hash index 1d5997505..801c353e1 100644 --- a/buildroot/package/netopeer2/netopeer2.hash +++ b/buildroot/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e983683eda68792fedd73af54a5c7997496091489aa921f2a9e0dd27f2f6e19a netopeer2-1.1.39.tar.gz +sha256 6b43026211a787d5cb91d47cb7fdd7923649044c55f264aaf85bf5676c004211 netopeer2-1.1.53.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/buildroot/package/netopeer2/netopeer2.mk b/buildroot/package/netopeer2/netopeer2.mk index 5787d3a8c..be5ffd2be 100644 --- a/buildroot/package/netopeer2/netopeer2.mk +++ b/buildroot/package/netopeer2/netopeer2.mk @@ -4,18 +4,37 @@ # ################################################################################ -NETOPEER2_VERSION = 1.1.39 +NETOPEER2_VERSION = 1.1.53 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause NETOPEER2_LICENSE_FILES = LICENSE -NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo +NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo NETOPEER2_CONF_OPTS = -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) +# Set a build specific SYSREPO_SHM_PREFIX to ensure we can safely delete the +# files. This also ensures that concurrent parallel builds will not be +# affected mutualy. +NETOPEER2_SYSREPO_SHM_PREFIX = sr_buildroot$(subst /,_,$(CONFIG_DIR))_netopeer2 + +NETOPEER2_MAKE_ENV = \ + SYSREPOCTL_EXECUTABLE=$(HOST_DIR)/bin/sysrepoctl \ + SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) + define NETOPEER2_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/netopeer2/S52netopeer2 \ $(TARGET_DIR)/etc/init.d/S52netopeer2 endef +# The host sysrepo used to install the netopeer2 modules will leave +# its shared memory files lingering about. Clean up in its stead... +# We need to clean up both before and after installation, to catch +# the case of a previous build that failed before we run that hook. +define NETOPEER2_CLEANUP + rm -f /dev/shm/$(NETOPEER2_SYSREPO_SHM_PREFIX)* +endef +NETOPEER2_PRE_INSTALL_TARGET_HOOKS += NETOPEER2_CLEANUP +NETOPEER2_POST_INSTALL_TARGET_HOOKS += NETOPEER2_CLEANUP + $(eval $(cmake-package)) diff --git a/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch b/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch deleted file mode 100644 index b07682a76..000000000 --- a/buildroot/package/netsniff-ng/0001-mausezahn-remove-unused-MZ_SIZE_LONG_INT.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c6dd9abd8d7a5332d0c1078196528926054791ae Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Mon, 15 Jun 2020 18:05:09 +0200 -Subject: [PATCH] mausezahn: remove unused MZ_SIZE_LONG_INT - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/c6dd9abd8d7a5332d0c1078196528926054791ae] -Signed-off-by: Fabrice Fontaine ---- - staging/mausezahn.c | 3 --- - staging/mz.h | 2 -- - 2 files changed, 5 deletions(-) - -diff --git a/staging/mausezahn.c b/staging/mausezahn.c -index 6c36166e..19d2937a 100644 ---- a/staging/mausezahn.c -+++ b/staging/mausezahn.c -@@ -192,9 +192,6 @@ int reset(void) - int i; - time_t t; - -- // Determine platform type sizes: -- MZ_SIZE_LONG_INT = sizeof(long int); -- - mz_default_config_path[0] = 0x00; - mz_default_log_path[0] = 0x00; - -diff --git a/staging/mz.h b/staging/mz.h -index 5afe57d1..c7a131d8 100644 ---- a/staging/mz.h -+++ b/staging/mz.h -@@ -108,8 +108,6 @@ static inline void verbose_l2(const char *format, ...) - #define IPADDRSIZE 46 - - --int MZ_SIZE_LONG_INT; -- - char mz_default_config_path[256]; - char mz_default_log_path[256]; - diff --git a/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch b/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch deleted file mode 100644 index d944406f3..000000000 --- a/buildroot/package/netsniff-ng/0002-mausezahn-make-needlessly-global-variables-static.patch +++ /dev/null @@ -1,139 +0,0 @@ -From bfa3c89317869ffe1e90b7e01e7cacad7a7ea10e Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Thu, 13 Aug 2020 12:09:28 +0200 -Subject: [PATCH] mausezahn: make needlessly global variables static - -Move variables only used withing a single compilation unit from mz.h and -make them static. This avoids "multiple definition of symbol" linker -errors with gcc-10. - -Updates #216 - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/bfa3c89317869ffe1e90b7e01e7cacad7a7ea10e] -Signed-off-by: Fabrice Fontaine ---- - staging/dns.c | 2 ++ - staging/mz.h | 28 +--------------------------- - staging/rcv_rtp.c | 19 +++++++++++++++++++ - staging/rtp.c | 1 - - 4 files changed, 22 insertions(+), 28 deletions(-) - -diff --git a/staging/dns.c b/staging/dns.c -index bfa61d84..83227e25 100644 ---- a/staging/dns.c -+++ b/staging/dns.c -@@ -89,6 +89,8 @@ - "| arcount (or arc) ........... Number of RRs in additional records section 0 / 0\n" \ - "\n" - -+static u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily -+static u_int32_t gbuf_s; - - int dns_get_query (char* argval); - int dns_get_answer (char* argval); -diff --git a/staging/mz.h b/staging/mz.h -index c7a131d8..42e64cfc 100644 ---- a/staging/mz.h -+++ b/staging/mz.h -@@ -285,11 +285,6 @@ FILE *fp, *fp2; // global multipurpose file pointer - long double total_d; - clock_t mz_start, mz_stop; - --enum rtp_display_mode { -- BAR, NCURSES, TEXT --} rtp_dm; -- -- - int mz_rand; - int bwidth; - -@@ -298,14 +293,7 @@ struct mz_timestamp { - u_int32_t nsec; - }; - --struct mz_timestamp -- tv, -- timeTX[TIME_COUNT_MAX], -- timeRX[TIME_COUNT_MAX]; -- - int32_t -- time0, -- jitter_rfc, - jitter[TIME_COUNT_MAX]; - - int -@@ -322,14 +310,8 @@ u_int16_t - sqnr_next; - - u_int32_t -- drop, // packet drop count -- dis, // packet disorder count - gind, // a global index to run through deltaRX, deltaTX, and jitter -- gind_max, // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT -- gtotal; // counts number of file write cycles (see "got_rtp_packet()") -- -- --char rtp_filter_str[64]; -+ gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT - - struct tx_struct - { -@@ -496,14 +478,6 @@ struct tx_struct - - } tx; // NOTE: tx elements are considered as default values for MOPS - -- -- -- -- --u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily --u_int32_t gbuf_s; // -- -- - // ************************************ - // - // Prototypes: General Tools -diff --git a/staging/rcv_rtp.c b/staging/rcv_rtp.c -index 0a911552..f43b92cd 100644 ---- a/staging/rcv_rtp.c -+++ b/staging/rcv_rtp.c -@@ -39,6 +39,25 @@ - #include "mz.h" - #include "mops.h" - -+static enum rtp_display_mode { -+ BAR, NCURSES, TEXT -+} rtp_dm; -+ -+static int32_t -+ time0, -+ jitter_rfc; -+ -+static struct mz_timestamp -+ timeTX[TIME_COUNT_MAX], -+ timeRX[TIME_COUNT_MAX]; -+ -+static u_int32_t -+ drop, // packet drop count -+ dis, // packet disorder count -+ gtotal; // counts number of file write cycles (see "got_rtp_packet()") -+ -+static char rtp_filter_str[64]; -+ - // Initialize the rcv_rtp process: Read user parameters and initialize globals - int rcv_rtp_init(void) - { -diff --git a/staging/rtp.c b/staging/rtp.c -index 54a195eb..da40884b 100644 ---- a/staging/rtp.c -+++ b/staging/rtp.c -@@ -56,7 +56,6 @@ - "|\n" - - -- - int create_rtp_packet(void) - { - u_int8_t byte1, byte2; diff --git a/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch b/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch deleted file mode 100644 index 12662d78f..000000000 --- a/buildroot/package/netsniff-ng/0003-mausezahn-move-variable-definitions-cli-h-to-cli-c.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0d5aa3246c20dad2d76165559fb575136b7216e8 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Wed, 19 Aug 2020 12:04:47 +0200 -Subject: [PATCH] mausezahn: move variable definitions cli.h to cli.c - -Move variable definitions to avoid "multiple definition of symbol" -linker errors with gcc-10. - -Updates #216 - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/0d5aa3246c20dad2d76165559fb575136b7216e8] -Signed-off-by: Fabrice Fontaine ---- - staging/cli.c | 13 +++++++++++++ - staging/cli.h | 20 ++++++++++---------- - 2 files changed, 23 insertions(+), 10 deletions(-) - -diff --git a/staging/cli.c b/staging/cli.c -index 5b5a1592..dbfdb550 100644 ---- a/staging/cli.c -+++ b/staging/cli.c -@@ -23,6 +23,19 @@ - #include "mops.h" - #include "llist.h" - -+struct cli_def *gcli; -+ -+char mz_username[32]; -+char mz_password[32]; -+char mz_enable[32]; -+char mz_listen_addr[16]; -+int mz_port; -+struct mops *clipkt; // actual packet used by CLI thread -+ -+int clidev; -+ -+int cli_debug; -+ - void mz_cli_init(void) - { - amp_head = automops_init(); -diff --git a/staging/cli.h b/staging/cli.h -index 1a0156fd..2ec153a0 100644 ---- a/staging/cli.h -+++ b/staging/cli.h -@@ -54,19 +54,19 @@ - #define MZ_DEFAULT_ENABLE_PASSWORD "mops" - #define MZ_DEFAULT_PORT 25542 // Towel day and 42 - --struct cli_def *gcli; -- --char mz_username[32]; --char mz_password[32]; --char mz_enable[32]; --char mz_listen_addr[16]; --int mz_port; --struct mops *clipkt; // actual packet used by CLI thread -+extern struct cli_def *gcli; -+ -+extern char mz_username[32]; -+extern char mz_password[32]; -+extern char mz_enable[32]; -+extern char mz_listen_addr[16]; -+extern int mz_port; -+extern struct mops *clipkt; // actual packet used by CLI thread - --int clidev; -+extern int clidev; - - // ================================================================= --int cli_debug; -+extern int cli_debug; - - // Flags from 0x0000 to 0xFFFF - // cli_debug & 8000 => Developer specific debugs diff --git a/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch b/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch deleted file mode 100644 index 834ee93a9..000000000 --- a/buildroot/package/netsniff-ng/0004-mausezahn-move-variable-definitions-from-mops-h-to-mops-c.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Wed, 19 Aug 2020 12:58:51 +0200 -Subject: [PATCH] mausezahn: move variable definitions from mops.h to mops.c - -Move variable definitions to avoid "multiple definition of symbol" -linker errors with gcc-10. - -Updates #216 - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/3178ceb8c7e0a94ed29bbd1e277f03bb0d5a3d44] -Signed-off-by: Fabrice Fontaine ---- - staging/mops.c | 5 ++++- - staging/mops.h | 8 ++++---- - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/staging/mops.c b/staging/mops.c -index 599d317f..fc00e29a 100644 ---- a/staging/mops.c -+++ b/staging/mops.c -@@ -46,8 +46,11 @@ - #include "mz.h" - #include "mops.h" - -+unsigned int min_frame_s; -+unsigned int max_frame_s; - -- -+struct automops * amp_head; -+struct mops *mp_head; // This global will point to the head of the mops list - - // Creates first element, aka "head" element - // This element can also be used! See mops_alloc_packet! -diff --git a/staging/mops.h b/staging/mops.h -index 96953e66..cf19f098 100644 ---- a/staging/mops.h -+++ b/staging/mops.h -@@ -114,8 +114,8 @@ - // These are initialized with the definitions MIN_MOPS_FRAME_SIZE and - // MAX_MOPS_FRAME_SIZE above but can be overridden by the user (without - // extending these limits) --unsigned int min_frame_s; --unsigned int max_frame_s; -+extern unsigned int min_frame_s; -+extern unsigned int max_frame_s; - - struct mops_counter - { -@@ -246,7 +246,7 @@ struct automops { - }; - - --struct automops * amp_head; -+extern struct automops * amp_head; - - - struct mops -@@ -688,7 +688,7 @@ struct mops_ext_syslog //TODO - - ///////////////////////////////////////////////////////////////// - --struct mops *mp_head; // This global will point to the head of the mops list -+extern struct mops *mp_head; // This global will point to the head of the mops list - - ///////////////////////////////////////////////////////////////// - // MOPS Prototypes: diff --git a/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch b/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch deleted file mode 100644 index 99eba8e7d..000000000 --- a/buildroot/package/netsniff-ng/0005-mausezahn-move-variable-definitions-from-llist-h-to-llist-c.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6f20cd366ea73b8b9cf49568e9b95cd79922daed Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Wed, 19 Aug 2020 13:13:34 +0200 -Subject: [PATCH] mausezahn: move variable definitions from llist.h to llist.c - -Move variable definitions to avoid "multiple definition of symbol" -linker errors with gcc-10. - -Updates #216 - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/6f20cd366ea73b8b9cf49568e9b95cd79922daed] -Signed-off-by: Fabrice Fontaine ---- - staging/llist.c | 2 ++ - staging/llist.h | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/staging/llist.c b/staging/llist.c -index d729e465..9ef2d1a2 100644 ---- a/staging/llist.c -+++ b/staging/llist.c -@@ -40,6 +40,8 @@ - * - */ - -+struct mz_ll *packet_sequences; -+struct mz_ll *cli_seq; // currently edited packet sequence used by CLI - - // Create new list element - may be the first one (list==NULL) - // -diff --git a/staging/llist.h b/staging/llist.h -index 49a87c7d..d9e59b86 100644 ---- a/staging/llist.h -+++ b/staging/llist.h -@@ -49,8 +49,8 @@ struct mz_ll { - void *data; // points to your data - }; - --struct mz_ll *packet_sequences; --struct mz_ll *cli_seq; // currently edited packet sequence used by CLI -+extern struct mz_ll *packet_sequences; -+extern struct mz_ll *cli_seq; // currently edited packet sequence used by CLI - - // prototypes - struct mz_ll * mz_ll_create_new_element(struct mz_ll *list); diff --git a/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch b/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch deleted file mode 100644 index d8db7dffd..000000000 --- a/buildroot/package/netsniff-ng/0006-mausezahn-move-variable-definitions-from-mz-h-to-mausezahn-c.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 56f8f399a20275a4a73ebc4450bd8eeba7ee1656 Mon Sep 17 00:00:00 2001 -From: Tobias Klauser -Date: Wed, 19 Aug 2020 13:13:54 +0200 -Subject: [PATCH] mausezahn: move variable definitions from mz.h to mausezahn.c - -Move variable definitions to avoid "multiple definition of symbol" -linker errors with gcc-10. - -Fixes #216 - -Signed-off-by: Tobias Klauser -[Retrieved from: -https://github.com/netsniff-ng/netsniff-ng/commit/56f8f399a20275a4a73ebc4450bd8eeba7ee1656] -Signed-off-by: Fabrice Fontaine ---- - staging/mausezahn.c | 46 ++++++++++++++++++++++++++++++++++++++++ - staging/mz.h | 51 +++++++++++++++++++++++++-------------------- - 2 files changed, 74 insertions(+), 23 deletions(-) - -diff --git a/staging/mausezahn.c b/staging/mausezahn.c -index 19d2937a..cae57a1b 100644 ---- a/staging/mausezahn.c -+++ b/staging/mausezahn.c -@@ -32,8 +32,54 @@ - #include "die.h" - #include "dev.h" - -+enum operating_modes mode; -+ -+int ipv6_mode; -+int quiet; // don't even print 'important standard short messages' -+int verbose; // report character -+int simulate; // if 1 then don't really send frames -+ -+char path[256]; -+char filename[256]; -+FILE *fp, *fp2; // global multipurpose file pointer -+ -+long double total_d; -+clock_t mz_start, mz_stop; -+ -+int mz_rand; -+int bwidth; -+ -+int32_t -+ jitter[TIME_COUNT_MAX]; -+ -+int -+ rtp_log, -+ time0_flag, // If set then time0 has valid data -+ sqnr0_flag; -+ -+u_int8_t -+ mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() -+ -+u_int16_t -+ sqnr_cur, -+ sqnr_last, -+ sqnr_next; -+ -+u_int32_t -+ gind, // a global index to run through deltaRX, deltaTX, and jitter -+ gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT -+ -+struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS -+ -+struct device_struct device_list[MZ_MAX_DEVICES]; -+ -+int device_list_entries; -+ - int verbose_level = 0; - -+char mz_default_config_path[256]; -+char mz_default_log_path[256]; -+ - static const char *short_options = "46hqvVSxra:A:b:B:c:d:E:f:F:l:p:P:R:t:T:M:Q:X:"; - - static void signal_handler(int number) -diff --git a/staging/mz.h b/staging/mz.h -index 42e64cfc..33e74e60 100644 ---- a/staging/mz.h -+++ b/staging/mz.h -@@ -108,8 +108,8 @@ static inline void verbose_l2(const char *format, ...) - #define IPADDRSIZE 46 - - --char mz_default_config_path[256]; --char mz_default_log_path[256]; -+extern char mz_default_config_path[256]; -+extern char mz_default_log_path[256]; - - - struct arp_table_struct { -@@ -159,9 +159,11 @@ struct device_struct - struct pcap *p_arp; // pcap handle - struct arp_table_struct *arp_table; // dedicated ARP table - int ps; // packet socket --} device_list[MZ_MAX_DEVICES]; -+}; -+ -+extern struct device_struct device_list[MZ_MAX_DEVICES]; - --int device_list_entries; -+extern int device_list_entries; - - - #pragma pack(1) -@@ -270,46 +272,47 @@ enum operating_modes - SYSLOG, - LLDP, - IGMP --} mode; -+}; - -+extern enum operating_modes mode; - --int ipv6_mode; --int quiet; // don't even print 'important standard short messages' --int verbose; // report character --int simulate; // if 1 then don't really send frames -+extern int ipv6_mode; -+extern int quiet; // don't even print 'important standard short messages' -+extern int verbose; // report character -+extern int simulate; // if 1 then don't really send frames - --char path[256]; --char filename[256]; --FILE *fp, *fp2; // global multipurpose file pointer -+extern char path[256]; -+extern char filename[256]; -+extern FILE *fp, *fp2; // global multipurpose file pointer - --long double total_d; --clock_t mz_start, mz_stop; -+extern long double total_d; -+extern clock_t mz_start, mz_stop; - --int mz_rand; --int bwidth; -+extern int mz_rand; -+extern int bwidth; - - struct mz_timestamp { - u_int32_t sec; - u_int32_t nsec; - }; - --int32_t -- jitter[TIME_COUNT_MAX]; -+extern int32_t -+ jitter[TIME_COUNT_MAX]; - --int -+extern int - rtp_log, - time0_flag, // If set then time0 has valid data - sqnr0_flag; - --u_int8_t -+extern u_int8_t - mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() - --u_int16_t -+extern u_int16_t - sqnr_cur, - sqnr_last, - sqnr_next; - --u_int32_t -+extern u_int32_t - gind, // a global index to run through deltaRX, deltaTX, and jitter - gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT - -@@ -476,7 +479,9 @@ struct tx_struct - rtp_sqnr, - rtp_stmp; - --} tx; // NOTE: tx elements are considered as default values for MOPS -+}; -+ -+extern struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS - - // ************************************ - // diff --git a/buildroot/package/netsniff-ng/netsniff-ng.hash b/buildroot/package/netsniff-ng/netsniff-ng.hash index 80736f85c..40b015cb0 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.hash +++ b/buildroot/package/netsniff-ng/netsniff-ng.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 96d85f2d216abcf6ba0ff610809b62c3a6430e21cbdd7bfef48cd9bde074848f netsniff-ng-0.6.7.tar.xz +sha256 77d17d4158faf1d93c7d922a1bd7f093a8b437bd658292c830708540e10894ba netsniff-ng-0.6.8.tar.xz # Locally computed sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING diff --git a/buildroot/package/netsniff-ng/netsniff-ng.mk b/buildroot/package/netsniff-ng/netsniff-ng.mk index 46f1b3d15..f45246da6 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.mk +++ b/buildroot/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = 0.6.7 +NETSNIFF_NG_VERSION = 0.6.8 NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 diff --git a/buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch index 8431d4686..bf61fdfe7 100644 --- a/buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch +++ b/buildroot/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch @@ -1,7 +1,7 @@ From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 12 Sep 2018 20:16:39 +0200 -Subject: [PATCH 1/3] configure, static linking: Fix SSL checks +Subject: [PATCH] configure, static linking: Fix SSL checks During checking of DTLS_method, the stub program is linked only with -ssl libssl.a lacks some function from -lcrypto: @@ -19,13 +19,17 @@ See also https://sourceforge.net/p/net-snmp/patches/1374/. Signed-off-by: Giulio Benetti [bvanassche: Edited subject / rewrote this patch] +[yann.morin.1998@free.fr: + - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 +] +Signed-off-by: Yann E. MORIN --- configure | 52 ++++++++++++++++++++++++++++++++++--- configure.d/config_os_libs2 | 14 +++++++--- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 6504a8e58..1116cecaa 100755 +index 6504a8e58a..1116cecaad 100755 --- a/configure +++ b/configure @@ -23228,16 +23228,60 @@ fi @@ -74,12 +78,12 @@ index 6504a8e58..1116cecaa 100755 +$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } +if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : + CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" ++fi ++ ++ fi - fi -+ -+fi -+ + else + LIBCRYPTO="-l${CRYPTO}" + fi @@ -98,11 +102,11 @@ index 6504a8e58..1116cecaa 100755 netsnmp_save_LIBS="$LIBS" - LIBS="-lssl" + LIBS="-lssl $LIBCRYPTO" - for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings + for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 4a1ad1551..75214cfff 100644 +index 4a1ad1551f..75214cfff3 100644 --- a/configure.d/config_os_libs2 +++ b/configure.d/config_os_libs2 @@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then @@ -138,5 +142,5 @@ index 4a1ad1551..75214cfff 100644 [SSL_library_init SSL_load_error_strings]) LIBS="$netsnmp_save_LIBS" -- -2.17.1 +2.25.1 diff --git a/buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch index 3ec0c2278..50387c839 100644 --- a/buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch +++ b/buildroot/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch @@ -1,19 +1,22 @@ -From d8694929b12b47febb0f7f43f46041387874fe52 Mon Sep 17 00:00:00 2001 +From 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 17 Sep 2018 07:33:34 -0700 -Subject: [PATCH 2/3] configure: Fix -lcrypto -lz test +Subject: [PATCH] configure: Fix -lcrypto -lz test Avoid that the second crypto library test uses the cached result from the first test by explicitly clearing the cached test result. -Signed-off-by: Giulio Benetti +[yann.morin.1998@free.fr: + - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 +] +Signed-off-by: Yann E. MORIN --- configure | 1 + configure.d/config_os_libs2 | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure -index 1116cecaa..33b8c93e5 100755 +index 1116cecaad..33b8c93e57 100755 --- a/configure +++ b/configure @@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : @@ -25,7 +28,7 @@ index 1116cecaa..33b8c93e5 100755 $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_EVP_md5+:} false; then : diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 75214cfff..81788a209 100644 +index 75214cfff3..81788a2096 100644 --- a/configure.d/config_os_libs2 +++ b/configure.d/config_os_libs2 @@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then @@ -37,5 +40,5 @@ index 75214cfff..81788a209 100644 [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], [-lz]) -- -2.17.1 +2.25.1 diff --git a/buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch index a731f2576..2618cbee7 100644 --- a/buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch +++ b/buildroot/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch @@ -32,8 +32,8 @@ index 93044000b..c811c63ec 100644 - LIBS="-lssl $LIBCRYPTO" + LIBS="-lssl $LIBCRYPTO $LIBS" AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]) - LIBS="$netsnmp_save_LIBS" + [SSL_library_init SSL_load_error_strings]dnl + [ERR_get_error_all]) -- 2.17.1 diff --git a/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch b/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch deleted file mode 100644 index 2d5b38eb3..000000000 --- a/buildroot/package/netsnmp/0005-MIB-II-Only-log-once-that-opening-proc-net-if_inet6-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cd09fd82522861830aaf9d237b26eef5f9ba50d2 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Wed, 21 Nov 2018 20:47:42 -0800 -Subject: [PATCH] MIB-II: Only log once that opening /proc/net/if_inet6 failed - -If IPv6 has been disabled (ipv6.disable=1) then opening /proc/net/if_inet6 -fails. Only log this once instead of thousand of times a day. - -Reported-by: Fif -Signed-off-by: Peter Korsgaard ---- - agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c -index 5ddead3e0c..280575ce39 100644 ---- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c -+++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c -@@ -234,7 +234,7 @@ _load_v6(netsnmp_container *container, int idx_offset) - - #define PROCFILE "/proc/net/if_inet6" - if (!(in = fopen(PROCFILE, "r"))) { -- snmp_log_perror("ipaddress_linux: could not open " PROCFILE); -+ NETSNMP_LOGONCE((LOG_ERR, "ipaddress_linux: could not open " PROCFILE)); - return -2; - } - --- -2.20.1 - diff --git a/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch b/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch deleted file mode 100644 index fb68e175e..000000000 --- a/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7c073e3a1b736689135fd2ed44ede5b83790bd37 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 26 Aug 2019 18:32:08 -0700 -Subject: IP-MIB, Linux: Fix a memory leak in an error path - -When a Linux system is booted with "ipv6.disable=1" in the kernel command -line, the file "/proc/net/snmp6" is not created. Fix the memory leak in -_systemstats_v6_load_systemstats() that is triggered with IPv6 disabled. - -See also https://sourceforge.net/p/net-snmp/bugs/2976/. - -Reported-by: Mark E Rusk ---- - agent/mibgroup/ip-mib/data_access/systemstats_linux.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c -index e28ff93..f68d122 100644 ---- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c -+++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c -@@ -560,10 +560,12 @@ _systemstats_v6_load_systemstats(netsnmp_container* container, u_int load_flags) - * try to open file. If we can't, that's ok - maybe the module hasn't - * been loaded yet. - */ -- if (!(devin = fopen(filename, "r"))) { -+ devin = fopen(filename, "r"); -+ if (!devin) { - DEBUGMSGTL(("access:systemstats", - "Failed to load Systemstats Table (linux1), cannot open %s\n", - filename)); -+ netsnmp_access_systemstats_entry_free(entry); - return 0; - } - --- -2.7.4 - diff --git a/buildroot/package/netsnmp/netsnmp.hash b/buildroot/package/netsnmp/netsnmp.hash index d05a7de9d..e3adb28c6 100644 --- a/buildroot/package/netsnmp/netsnmp.hash +++ b/buildroot/package/netsnmp/netsnmp.hash @@ -1,6 +1,4 @@ -# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.8/ -md5 63bfc65fbb86cdb616598df1aff6458a net-snmp-5.8.tar.gz -sha1 78f70731df9dcdb13fe8f60eb7d80d7583da4d2c net-snmp-5.8.tar.gz -# Locally computed -sha256 b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf net-snmp-5.8.tar.gz -sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING +# Locally calculated after checking pgp signature at +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9/net-snmp-5.9.tar.gz.asc +# using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 +sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 net-snmp-5.9.tar.gz diff --git a/buildroot/package/netsnmp/netsnmp.mk b/buildroot/package/netsnmp/netsnmp.mk index 904279d1f..5b22d1a06 100644 --- a/buildroot/package/netsnmp/netsnmp.mk +++ b/buildroot/package/netsnmp/netsnmp.mk @@ -4,11 +4,13 @@ # ################################################################################ -NETSNMP_VERSION = 5.8 +NETSNMP_VERSION = 5.9 NETSNMP_SITE = https://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING +NETSNMP_CPE_ID_VENDOR = net-snmp +NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no NETSNMP_CONF_OPTS = \ diff --git a/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash index 8e3bbabf0..dfdc99982 100644 --- a/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash +++ b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e2d93e25623761c5de39c8c94750c982335acc1c2da4439b1a2088ecd4455c9 netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555.tar.gz +sha256 150a3a45c3f433a35451506b316a35c14630112fc557f9e1f02c9e08b50e0cce netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555-br1.tar.gz sha256 b2ddc1d607332423f6cf415b2ac619a1c03dd565facdc39a571282a520929a65 llvm/LICENSE.TXT diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk index 50ebdc706..68844976e 100644 --- a/buildroot/package/nettle/nettle.mk +++ b/buildroot/package/nettle/nettle.mk @@ -10,6 +10,7 @@ NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 +NETTLE_CPE_ID_VALID = YES # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index 2a04b00ce..ad170cbe6 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/package/network-manager/network-manager.mk @@ -13,6 +13,7 @@ NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ libgcrypt wpa_supplicant util-linux host-intltool readline libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING +NETWORK_MANAGER_SELINUX_MODULES = networkmanager NETWORK_MANAGER_CONF_ENV = \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ diff --git a/buildroot/package/nfs-utils/nfs-utils.mk b/buildroot/package/nfs-utils/nfs-utils.mk index d60b5055a..df581b381 100644 --- a/buildroot/package/nfs-utils/nfs-utils.mk +++ b/buildroot/package/nfs-utils/nfs-utils.mk @@ -10,6 +10,8 @@ NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VE NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc +NFS_UTILS_CPE_ID_VENDOR = linux-nfs +NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no diff --git a/buildroot/package/nftables/nftables.mk b/buildroot/package/nftables/nftables.mk index 8a003a5e3..f9468c525 100644 --- a/buildroot/package/nftables/nftables.mk +++ b/buildroot/package/nftables/nftables.mk @@ -11,6 +11,7 @@ NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc +NFTABLES_SELINUX_MODULES = iptables ifeq ($(BR2_PACKAGE_GMP),y) NFTABLES_DEPENDENCIES += gmp diff --git a/buildroot/package/nghttp2/nghttp2.mk b/buildroot/package/nghttp2/nghttp2.mk index 7b611c88f..9190fa30d 100644 --- a/buildroot/package/nghttp2/nghttp2.mk +++ b/buildroot/package/nghttp2/nghttp2.mk @@ -9,6 +9,7 @@ NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_V NGHTTP2_LICENSE = MIT NGHTTP2_LICENSE_FILES = COPYING NGHTTP2_INSTALL_STAGING = YES +NGHTTP2_CPE_ID_VENDOR = nghttp2 NGHTTP2_DEPENDENCIES = host-pkgconf NGHTTP2_CONF_OPTS = --enable-lib-only diff --git a/buildroot/package/nginx/S50nginx b/buildroot/package/nginx/S50nginx index 964652b92..6c243f40b 100644 --- a/buildroot/package/nginx/S50nginx +++ b/buildroot/package/nginx/S50nginx @@ -9,7 +9,7 @@ PIDFILE=/var/run/nginx.pid case "$1" in start) echo "Starting nginx..." - mkdir -p /var/log/nginx /var/tmp/nginx + mkdir -p /var/log/nginx /var/cache/nginx start-stop-daemon -S -x "$NGINX" -p "$PIDFILE" ;; stop) diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 00fb14768..9c3254683 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -8,6 +8,7 @@ NGINX_VERSION = 1.18.0 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE +NGINX_CPE_ID_VENDOR = nginx NGINX_DEPENDENCIES = host-pkgconf NGINX_CONF_OPTS = \ @@ -55,11 +56,11 @@ NGINX_CONF_OPTS += \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \ --http-log-path=/var/log/nginx/access.log \ - --http-client-body-temp-path=/var/tmp/nginx/client-body \ - --http-proxy-temp-path=/var/tmp/nginx/proxy \ - --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi \ - --http-scgi-temp-path=/var/tmp/nginx/scgi \ - --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi + --http-client-body-temp-path=/var/cache/nginx/client-body \ + --http-proxy-temp-path=/var/cache/nginx/proxy \ + --http-fastcgi-temp-path=/var/cache/nginx/fastcgi \ + --http-scgi-temp-path=/var/cache/nginx/scgi \ + --http-uwsgi-temp-path=/var/cache/nginx/uwsgi NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \ diff --git a/buildroot/package/nginx/nginx.service b/buildroot/package/nginx/nginx.service index f203cecdc..11ccd6223 100644 --- a/buildroot/package/nginx/nginx.service +++ b/buildroot/package/nginx/nginx.service @@ -4,8 +4,9 @@ After=syslog.target network.target [Service] Type=forking +LogsDirectory=nginx +CacheDirectory=nginx PIDFile=/run/nginx.pid -ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;' ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;' ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload diff --git a/buildroot/package/ngircd/ngircd.hash b/buildroot/package/ngircd/ngircd.hash index 72874c8d4..e46e8e666 100644 --- a/buildroot/package/ngircd/ngircd.hash +++ b/buildroot/package/ngircd/ngircd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6 ngircd-26.tar.xz +sha256 55c16fd26009f6fc6a007df4efac87a02e122f680612cda1ce26e17a18d86254 ngircd-26.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ngircd/ngircd.mk b/buildroot/package/ngircd/ngircd.mk index 4859a29c2..47d8ef226 100644 --- a/buildroot/package/ngircd/ngircd.mk +++ b/buildroot/package/ngircd/ngircd.mk @@ -4,11 +4,12 @@ # ################################################################################ -NGIRCD_VERSION = 26 +NGIRCD_VERSION = 26.1 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz NGIRCD_SITE = https://arthur.barton.de/pub/ngircd NGIRCD_LICENSE = GPL-2.0+ NGIRCD_LICENSE_FILES = COPYING +NGIRCD_CPE_ID_VENDOR = barton ifeq ($(BR2_PACKAGE_LINUX_PAM),y) NGIRCD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr diff --git a/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch b/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch deleted file mode 100644 index d75b78fde..000000000 --- a/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4645f74eb668cc1cf876d1e9bef933591da7575c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 3 Feb 2020 06:21:57 -0800 -Subject: [PATCH] set minimum cmake version to 3.10 - -The CMakeLists.txt file uses the CMP0091 which is an MSVC runtime library flag -abstraction macro. - -Because we are not building ninja for Microsoft, it is safe to remove this -macro and set the minimum version to 3.10. - -Signed-off-by: Adam Duskett ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 60fd8a1..a040e0b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,4 @@ --cmake_minimum_required(VERSION 3.15) --cmake_policy(SET CMP0091 NEW) -+cmake_minimum_required(VERSION 3.10) - project(ninja) - - if(CMAKE_BUILD_TYPE MATCHES "Release") --- -2.24.1 - diff --git a/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch b/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch deleted file mode 100644 index d419ab48d..000000000 --- a/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 87caa8c4bc536f745aceed757ce8a492fbdba84f Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 3 Feb 2020 07:36:58 -0800 -Subject: [PATCH] remove fdiagnostics-color from make command - --fdiagnostics-color was introduced in gcc 4.9 and the minimum supported version -that Buildroot supports is 4.8. - -Signed-off-by: Adam Duskett ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a040e0b..af8010f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ if(MSVC) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /GR- /Zc:__cplusplus") - else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fdiagnostics-color") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") - endif() - - find_program(RE2C re2c) --- -2.24.1 - diff --git a/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch b/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch deleted file mode 100644 index 8f8fac994..000000000 --- a/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7982ecebe1c1c41e82779a65fa2d93f19ffd755f Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 5 Feb 2020 12:28:44 +0100 -Subject: [PATCH] CMake: fix object library usage - -Object libraries cannot be use in target_link_libraries() command -as they are no normal binary files like *.a or *.so but a collection -of object files. - -See add_library() definition for details. - -Signed-off-by: Yegor Yefremov ---- - CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af8010f..028a7bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -83,8 +83,7 @@ target_compile_definitions(libninja PRIVATE _WIN32_WINNT=0x0601 __USE_MINGW_ANSI - endif() - - # Main executable is library plus main() function. --add_executable(ninja src/ninja.cc) --target_link_libraries(ninja PRIVATE libninja libninja-re2c) -+add_executable(ninja src/ninja.cc $ $) - - # Tests all build into ninja_test executable. - add_executable(ninja_test -@@ -106,11 +105,12 @@ add_executable(ninja_test - src/subprocess_test.cc - src/test.cc - src/util_test.cc -+ $ -+ $ - ) - if(WIN32) - target_sources(ninja_test PRIVATE src/includes_normalize_test.cc src/msvc_helper_test.cc) - endif() --target_link_libraries(ninja_test PRIVATE libninja libninja-re2c) - - foreach(perftest - build_log_perftest -@@ -120,8 +120,7 @@ foreach(perftest - hash_collision_bench - manifest_parser_perftest - ) -- add_executable(${perftest} src/${perftest}.cc) -- target_link_libraries(${perftest} PRIVATE libninja libninja-re2c) -+ add_executable(${perftest} src/${perftest}.cc $ $) - endforeach() - - enable_testing() --- -2.17.0 diff --git a/buildroot/package/ninja/ninja.hash b/buildroot/package/ninja/ninja.hash index cd9bb0883..fd2c594a7 100644 --- a/buildroot/package/ninja/ninja.hash +++ b/buildroot/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f ninja-1.10.0.tar.gz -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING +sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed ninja-1.10.2.tar.gz +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/buildroot/package/ninja/ninja.mk b/buildroot/package/ninja/ninja.mk index 060893d85..ab1941023 100644 --- a/buildroot/package/ninja/ninja.mk +++ b/buildroot/package/ninja/ninja.mk @@ -4,7 +4,7 @@ # ################################################################################ -NINJA_VERSION = 1.10.0 +NINJA_VERSION = 1.10.2 NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING diff --git a/buildroot/package/nmap/nmap.hash b/buildroot/package/nmap/nmap.hash index d7446f1ea..8f69bbf61 100644 --- a/buildroot/package/nmap/nmap.hash +++ b/buildroot/package/nmap/nmap.hash @@ -1,5 +1,5 @@ -# From https://nmap.org/dist/sigs/nmap-7.80.tar.bz2.digest.txt (lowercase) -sha256 fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa nmap-7.80.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.digest.txt (lowercase) +sha256 18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 nmap-7.91.tar.bz2 # Locally calculated -sha256 a6afaad36c803dc602734451d9421ed363b48d1ca0faadf0907fc2d91a000284 COPYING +sha256 8254a9bc733f3312c6dcfe0d5a129c29e96ecb8b33408c652a8c7beb2e25b471 LICENSE diff --git a/buildroot/package/nmap/nmap.mk b/buildroot/package/nmap/nmap.mk index 5da1ce925..aed278ccb 100644 --- a/buildroot/package/nmap/nmap.mk +++ b/buildroot/package/nmap/nmap.mk @@ -4,14 +4,15 @@ # ################################################################################ -NMAP_VERSION = 7.80 +NMAP_VERSION = 7.91 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ --with-libdnet=included NMAP_LICENSE = nmap license -NMAP_LICENSE_FILES = COPYING +NMAP_LICENSE_FILES = LICENSE +NMAP_SELINUX_MODULES = netutils # needed by libpcap NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash index b3ea15ca3..7abb3c3b5 100644 --- a/buildroot/package/nodejs/nodejs.hash +++ b/buildroot/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.20.1/SHASUMS256.txt -sha256 e00eee325d705b2bfa9929b7d061eb2315402d7e8548945eac9870bf84321853 node-v12.20.1.tar.xz +# From https://nodejs.org/dist/v12.21.0/SHASUMS256.txt +sha256 052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d node-v12.21.0.tar.xz # Hash for license file sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk index 8916d4794..f8b29d368 100644 --- a/buildroot/package/nodejs/nodejs.mk +++ b/buildroot/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.20.1 +NODEJS_VERSION = 12.21.0 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 \ @@ -14,6 +14,8 @@ HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python host-zlib NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE +NODEJS_CPE_ID_VENDOR = nodejs +NODEJS_CPE_ID_PRODUCT = node.js NODEJS_CONF_OPTS = \ --without-snapshot \ diff --git a/buildroot/package/ntfs-3g/ntfs-3g.mk b/buildroot/package/ntfs-3g/ntfs-3g.mk index cbb356195..1a388af76 100644 --- a/buildroot/package/ntfs-3g/ntfs-3g.mk +++ b/buildroot/package/ntfs-3g/ntfs-3g.mk @@ -12,6 +12,7 @@ NTFS_3G_INSTALL_STAGING = YES NTFS_3G_DEPENDENCIES = host-pkgconf NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+ NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB +NTFS_3G_CPE_ID_VENDOR = tuxera # 0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch NTFS_3G_IGNORE_CVES += CVE-2019-9755 diff --git a/buildroot/package/ntp/ntp.mk b/buildroot/package/ntp/ntp.mk index f82eeae9b..0dc75a7a6 100644 --- a/buildroot/package/ntp/ntp.mk +++ b/buildroot/package/ntp/ntp.mk @@ -5,11 +5,16 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p15 +NTP_VERSION_MINOR = 8 +NTP_VERSION_POINT = 15 +NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT) NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP NTP_LICENSE_FILES = COPYRIGHT +NTP_CPE_ID_VENDOR = ntp +NTP_CPE_ID_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR) +NTP_CPE_ID_UPDATE = p$(NTP_VERSION_POINT) NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no POSIX_SHELL=/bin/sh NTP_CONF_OPTS = \ --with-shared \ diff --git a/buildroot/package/nvidia-modprobe/Config.in b/buildroot/package/nvidia-modprobe/Config.in new file mode 100644 index 000000000..4e287bc7d --- /dev/null +++ b/buildroot/package/nvidia-modprobe/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_NVIDIA_MODPROBE + bool "nvidia-modprobe" + depends on BR2_USE_MMU # fork() + help + nvidia-modprobe package adds a utility and headers for + probing the NVIDIA hardware at runtime. + + https://github.com/NVIDIA/nvidia-modprobe diff --git a/buildroot/package/nvidia-modprobe/nvidia-modprobe.hash b/buildroot/package/nvidia-modprobe/nvidia-modprobe.hash new file mode 100644 index 000000000..99908680f --- /dev/null +++ b/buildroot/package/nvidia-modprobe/nvidia-modprobe.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/nvidia-modprobe/nvidia-modprobe.mk b/buildroot/package/nvidia-modprobe/nvidia-modprobe.mk new file mode 100644 index 000000000..75d416b31 --- /dev/null +++ b/buildroot/package/nvidia-modprobe/nvidia-modprobe.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# nvidia-modprobe +# +################################################################################ + +NVIDIA_MODPROBE_VERSION = 450.57 +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) +NVIDIA_MODPROBE_LICENSE = GPL-2.0 +NVIDIA_MODPROBE_LICENSE_FILES = COPYING + +define NVIDIA_MODPROBE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + OUTPUTDIR=. ./nvidia-modprobe.unstripped +endef + +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/nvidia-modprobe.unstripped \ + $(TARGET_DIR)/usr/bin/nvidia-modprobe +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/nvme/nvme.mk b/buildroot/package/nvme/nvme.mk index 678b97821..53f9dff75 100644 --- a/buildroot/package/nvme/nvme.mk +++ b/buildroot/package/nvme/nvme.mk @@ -18,6 +18,15 @@ else NVME_MAKE_OPTS += LIBUUID=1 endif +# Yes, HAVE_SYSTEMD=0 means systemd support enabled. +# HAVE_SYSTEMD=1 means systemd support disabled. +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +NVME_DEPENDENCIES += systemd +NVME_MAKE_OPTS += HAVE_SYSTEMD=0 +else +NVME_MAKE_OPTS += HAVE_SYSTEMD=1 +endif + define NVME_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ $(NVME_MAKE_OPTS) -C $(@D) diff --git a/buildroot/package/odhcp6c/odhcp6c.hash b/buildroot/package/odhcp6c/odhcp6c.hash index 2ac4a6821..26ee71168 100644 --- a/buildroot/package/odhcp6c/odhcp6c.hash +++ b/buildroot/package/odhcp6c/odhcp6c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e715c1408982152306c65f1c3ce7c58fb6f15fa8f9626c266819119239f32418 odhcp6c-f575351cbb3defc0bf52680c9082912a6c264374.tar.gz +sha256 c3622120b5209d1c14d5ac92884240bf0e4f652633562355e70dbf482f6c37b4 odhcp6c-f575351cbb3defc0bf52680c9082912a6c264374-br1.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch b/buildroot/package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch new file mode 100644 index 000000000..b15df2408 --- /dev/null +++ b/buildroot/package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch @@ -0,0 +1,33 @@ +From 2f9311668dfdeee0453f5fceb27e8c95c065c4b6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jan 2020 17:29:56 +0100 +Subject: [PATCH] lib/pud/Makefile: fix parallel build + +nmealib is needed to build olsrd_pud plugin otherwise build fails on: + +[LD] olsrd_pud.so.3.0.0 (nmealib dynamically linked) +/home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.8.3/../../../../arm-none-linux-gnueabi/bin/ld: cannot find -lnmea +wireformat/lib/libOlsrdPudWireFormat.so: file not recognized: File truncated + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OLSR/olsrd/pull/78] +--- + lib/pud/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/pud/Makefile b/lib/pud/Makefile +index e2524421..28330d92 100644 +--- a/lib/pud/Makefile ++++ b/lib/pud/Makefile +@@ -108,7 +108,7 @@ endif + + default_target: nmealib library $(PLUGIN_FULLNAME) + +-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt ++$(PLUGIN_FULLNAME): $(OBJS) version-script.txt nmealib + ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) + ifeq ($(VERBOSE),0) + @echo "[LD] $@ (nmealib dynamically linked)" +-- +2.24.1 + diff --git a/buildroot/package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch b/buildroot/package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch new file mode 100644 index 000000000..f97798d60 --- /dev/null +++ b/buildroot/package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch @@ -0,0 +1,105 @@ +From b2dfb6c27fcf4ddae87b0e99492f4bb8472fa39a Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Thu, 13 Feb 2020 17:26:41 -0300 +Subject: [PATCH] pud: adapt to API changes in gpsd 3.20 + +The timestamp fields were changed from double to struct timespec, and +the geoid separation field was moved to fix.geoid_sep. + +Signed-off-by: Eneas U de Queiroz + +[Retrieved from: +https://github.com/OLSR/olsrd/commit/b2dfb6c27fcf4ddae87b0e99492f4bb8472fa39a] +Signed-off-by: Fabrice Fontaine +--- + lib/pud/src/gpsdclient.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) + +diff --git a/lib/pud/src/gpsdclient.c b/lib/pud/src/gpsdclient.c +index 9e7fb708d..2a7a26eef 100644 +--- a/lib/pud/src/gpsdclient.c ++++ b/lib/pud/src/gpsdclient.c +@@ -79,6 +79,23 @@ static void gpsdError(const char *s) { + syslog(LOG_ERR, "gpsd error: %s", s); + } + ++#if GPSD_API_MAJOR_VERSION >= 9 ++static double time_as_double(struct timespec *ts) { ++ return (ts->tv_sec + ts->tv_nsec * 1e-9); ++} ++ ++static bool is_online(struct gps_data_t *gpsdata) { ++ return !!gpsdata->online.tv_sec; ++} ++#else ++ ++#define time_as_double(x) *(x) ++ ++static bool is_online(struct gps_data_t *gpsdata) { ++ return !!gpsdata->online; ++} ++#endif ++ + /* standard parsing of a GPS data source spec */ + void gpsdParseSourceSpec(char *arg, GpsDaemon *gpsDaemon) { + if (!arg // +@@ -298,8 +315,8 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon + 8, // + dev->parity, // + dev->stopbits, // +- dev->cycle, // +- dev->mincycle); ++ time_as_double(&dev->cycle), // ++ time_as_double(&dev->mincycle)); + + connectionTracking->devSeen[i] = true; + connectionTracking->dev[i] = *dev; +@@ -367,11 +384,18 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_SMASK); + + /* date & time */ ++#if GPSD_API_MAJOR_VERSION >= 9 ++ if (gpsdata->fix.time.tv_sec > 0) { ++ struct tm *time = gmtime(&gpsdata->fix.time.tv_sec); ++ unsigned int hsec = (unsigned int) (gpsdata->fix.time.tv_nsec / 10000000); ++#else + if (!isNaN(gpsdata->fix.time)) { + double seconds; + double fraction = modf(fabs(gpsdata->fix.time), &seconds); + long sec = lrint(seconds); + struct tm *time = gmtime(&sec); ++ unsigned int hsec = (unsigned int) lrint(fraction * 100); ++#endif + if (time) { + info->utc.year = (unsigned int) time->tm_year + 1900; + info->utc.mon = (unsigned int) time->tm_mon + 1; +@@ -379,7 +403,7 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon + info->utc.hour = (unsigned int) time->tm_hour; + info->utc.min = (unsigned int) time->tm_min; + info->utc.sec = (unsigned int) time->tm_sec; +- info->utc.hsec = (unsigned int) lrint(fraction * 100); ++ info->utc.hsec = hsec; + + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_UTCDATE | NMEALIB_PRESENT_UTCTIME); + } +@@ -387,7 +411,7 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon + gpsdata->set &= ~TIME_SET; + + /* sig & fix */ +- if (!gpsdata->online) { ++ if (!is_online(gpsdata)) { + gpsdata->fix.mode = MODE_NO_FIX; + } + +@@ -454,7 +478,11 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon + if ((gpsdata->fix.mode >= MODE_3D) // + && !isNaN(gpsdata->fix.altitude)) { + info->elevation = gpsdata->fix.altitude; ++#if GPSD_API_MAJOR_VERSION >= 9 ++ info->height = gpsdata->fix.geoid_sep; ++#else + info->height = gpsdata->separation; ++#endif + nmeaInfoSetPresent(&info->present, NMEALIB_PRESENT_ELV | NMEALIB_PRESENT_HEIGHT); + } + gpsdata->set &= ~ALTITUDE_SET; diff --git a/buildroot/package/olsr/olsr.mk b/buildroot/package/olsr/olsr.mk index f930b3cac..b2c8e7e00 100644 --- a/buildroot/package/olsr/olsr.mk +++ b/buildroot/package/olsr/olsr.mk @@ -10,8 +10,8 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ mdns nameservice netjson poprouting p2pd pgraph secure txtinfo watchdog # Doesn't really need quagga but not very useful without it OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) -OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+ -OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE +OLSR_LICENSE = BSD-3-Clause +OLSR_LICENSE_FILES = license.txt OLSR_DEPENDENCIES = host-flex host-bison OLSR_CFLAGS = $(TARGET_CFLAGS) @@ -19,6 +19,13 @@ OLSR_CFLAGS = $(TARGET_CFLAGS) # it needs -fPIC to link on lot of architectures OLSR_CFLAGS += -fPIC +ifeq ($(BR2_PACKAGE_GPSD),y) +OLSR_LICENSE += , LGPL-2.1+ (nmealib) +OLSR_LICENSE_FILES += lib/pud/nmealib/LICENSE +OLSR_DEPENDENCIES += gpsd +OLSR_PLUGINS += pud +endif + define OLSR_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd diff --git a/buildroot/package/omxplayer/Config.in b/buildroot/package/omxplayer/Config.in index 80e48d09c..d2e4b5ace 100644 --- a/buildroot/package/omxplayer/Config.in +++ b/buildroot/package/omxplayer/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OMXPLAYER depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # ffmpeg depends on BR2_INSTALL_LIBSTDCPP # boost depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, boost, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_WCHAR # boost depends on BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_ALSA_LIB @@ -25,10 +26,11 @@ config BR2_PACKAGE_OMXPLAYER https://github.com/popcornmix/omxplayer -comment "omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library" +comment "omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" depends on BR2_arm depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on !BR2_PACKAGE_RPI_USERLAND depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS + || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/oniguruma/oniguruma.mk b/buildroot/package/oniguruma/oniguruma.mk index e7aaa43c2..ef63a5e8a 100644 --- a/buildroot/package/oniguruma/oniguruma.mk +++ b/buildroot/package/oniguruma/oniguruma.mk @@ -10,6 +10,7 @@ ONIGURUMA_SITE = \ ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING +ONIGURUMA_CPE_ID_VALID = YES ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch b/buildroot/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch new file mode 100644 index 000000000..52a9cbaac --- /dev/null +++ b/buildroot/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch @@ -0,0 +1,27 @@ +From 61f9440dfeacad517965451773371aca0332d700 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 5 Jan 2021 23:08:53 +0100 +Subject: [PATCH] CMakeLists.txt: project only contains C code + +Make sure CMake doesn't check for a C++ compiler when it's not needed, +as open62541 is in C. + +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94ceb127..acc41ab2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0...3.12) +-project(open62541) ++project(open62541 C) + # set(CMAKE_VERBOSE_MAKEFILE ON) + if(${CMAKE_VERSION} VERSION_LESS 3.12) + cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) +-- +2.29.2 + diff --git a/buildroot/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch b/buildroot/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch new file mode 100644 index 000000000..94ee76ad9 --- /dev/null +++ b/buildroot/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch @@ -0,0 +1,37 @@ +From a312e82124fb8c9f139d5a40fa5a28123bb77a33 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 10 Jan 2021 14:25:56 +0100 +Subject: [PATCH] arch/posix/CMakeLists.txt: fix build without threads + +Fix the following build failure without threads: + +[100%] Linking C shared library bin/libopen62541.so +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread +collect2: error: ld returned 1 exit status +CMakeFiles/open62541.dir/build.make:192: recipe for target 'bin/libopen62541.so.0.0.0' failed +make[3]: *** [bin/libopen62541.so.0.0.0] Error 1 + +Fixes: + - http://autobuild.buildroot.org/results/87ec3c987c991f790757276316d6caf81e635fa2 + +Signed-off-by: Fabrice Fontaine +--- + arch/posix/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt +index bb24757c..a53c9f2c 100644 +--- a/arch/posix/CMakeLists.txt ++++ b/arch/posix/CMakeLists.txt +@@ -20,8 +20,6 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix") + ua_architecture_append_to_library(netdb ndblib socket) + else() + ua_architecture_append_to_library(m) +- #TODO - Error on first make run if pthread is included conditional? +- ua_architecture_append_to_library(pthread) + if(UA_ENABLE_MULTITHREADING OR UA_BUILD_UNIT_TESTS) + ua_architecture_append_to_library(pthread) + endif() +-- +2.29.2 + diff --git a/buildroot/package/open62541/Config.in b/buildroot/package/open62541/Config.in new file mode 100644 index 000000000..a835595e8 --- /dev/null +++ b/buildroot/package/open62541/Config.in @@ -0,0 +1,71 @@ +config BR2_PACKAGE_OPEN62541 + bool "open62541" + help + open62541 is an open source and free implementation of OPC UA. + + http://open62541.org + +if BR2_PACKAGE_OPEN62541 + +choice + prompt "namespace zero nodes" + help + Namespace zero contains the standard-defined nodes. The full + namespace zero may not be required for all applications. + +config BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_DEFAULT + bool "default" + help + Use the default namespace zero contents. + +config BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_MINIMAL + bool "minimal" + help + A barebones namespace zero that is compatible with most + clients. But this namespace 0 is so small that it does not + pass the CTT (Conformance Testing Tools of the OPC + Foundation). + +config BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_REDUCED + bool "reduced" + help + Small namespace zero that passes the CTT. + +config BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_FULL + bool "full" + help + Full namespace zero generated from the official XML + definitions. + +endchoice + +config BR2_PACKAGE_OPEN62541_JSON_ENCODING + bool "json encoding" + +config BR2_PACKAGE_OPEN62541_PUBSUB + bool "publish/subscribe" + help + Enable the experimental OPC UA PubSub support. The option + will include the PubSub UDP multicast plugin. + +if BR2_PACKAGE_OPEN62541_PUBSUB + +config BR2_PACKAGE_OPEN62541_PUBSUB_DELTAFRAMES + bool "publish/subscribe deltaframes" + help + The PubSub messages differentiate between keyframe (all + published values contained) and deltaframe (only changed + values contained) messages. Deltaframe messages creation + consumes some additional ressources. + +config BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL + bool "publish/subscribe information model" + depends on BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_REDUCED || \ + BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_FULL + help + Enable the information model representation of the PubSub + configuration. + +endif # BR2_PACKAGE_OPEN62541_PUBSUB + +endif diff --git a/buildroot/package/open62541/open62541.hash b/buildroot/package/open62541/open62541.hash new file mode 100644 index 000000000..3da8c8f5f --- /dev/null +++ b/buildroot/package/open62541/open62541.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 36273793e5247586fadaa73c0edad89be610100cbc839d1fb5f567f20c3cbc44 open62541-1.0-br1.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/buildroot/package/open62541/open62541.mk b/buildroot/package/open62541/open62541.mk new file mode 100644 index 000000000..102e09a42 --- /dev/null +++ b/buildroot/package/open62541/open62541.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# open62541 +# +################################################################################ + +OPEN62541_VERSION = 1.0 +OPEN62541_DL_VERSION = v$(OPEN62541_VERSION) +OPEN62541_SITE_METHOD = git +OPEN62541_SITE = git://github.com/open62541/open62541.git +OPEN62541_GIT_SUBMODULES = YES +OPEN62541_INSTALL_STAGING = YES +OPEN62541_LICENSE = MPL-2.0 +OPEN62541_LICENSE_FILES = LICENSE + +# Force Release build to remove -Werror. +# Don't use git describe to get the version number. +# Disable hardening options to let Buildroot handle it. +OPEN62541_CONF_OPTS = \ + -DCMAKE_BUILD_TYPE=Release \ + -DGIT_EXECUTABLE=NO \ + -DOPEN62541_VERSION=v$(OPEN62541_VERSION) \ + -DUA_ENABLE_HARDENING=OFF + +ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_MINIMAL),y) +OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=MINIMAL +else ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_REDUCED),y) +OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=REDUCED +else ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_FULL),y) +OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=FULL +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_JSON_ENCODING),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_JSON_ENCODING=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_JSON_ENCODING=OFF +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_PUBSUB),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB=OFF +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_PUBSUB_DELTAFRAMES),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_DELTAFRAMES=OFF +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/openblas/0001-fix-gfortran-detection.patch b/buildroot/package/openblas/0001-fix-gfortran-detection.patch new file mode 100644 index 000000000..1fecdac3e --- /dev/null +++ b/buildroot/package/openblas/0001-fix-gfortran-detection.patch @@ -0,0 +1,30 @@ +From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Wed, 10 Feb 2021 14:22:59 +0100 +Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string + to avoid misinterpretation + +See https://github.com/xianyi/OpenBLAS/issues/3099 for details. + +Upstream-status: backport + +[for import into Buildroot] +Signed-off-by: Thomas De Schampheleire + + +--- + f_check | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/f_check b/f_check +index e9aca4ff9..ffe9c6b46 100644 +--- a/f_check ++++ b/f_check +@@ -75,6 +75,7 @@ if ($compiler eq "") { + + } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { + ++ $data =~ s/\(+.*?\)+//g; + $data =~ /(\d+)\.(\d+).(\d+)/; + $major = $1; + $minor = $2; diff --git a/buildroot/package/openblas/Config.in b/buildroot/package/openblas/Config.in index 3f658c862..0144e93a3 100644 --- a/buildroot/package/openblas/Config.in +++ b/buildroot/package/openblas/Config.in @@ -73,4 +73,25 @@ config BR2_PACKAGE_OPENBLAS_TARGET string "OpenBLAS target CPU" default BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET +config BR2_PACKAGE_OPENBLAS_USE_THREAD + bool "use multithreading" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + Tell OpenBLAS to use multithreading, by passing USE_THREAD=1. + +config BR2_PACKAGE_OPENBLAS_USE_LOCKING + bool "use locking" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_OPENBLAS_USE_THREAD + help + Tell OpenBLAS to use locking, by passing USE_LOCKING=1. + Locking is implicitly enabled when USE_THREAD=1. + However, if USE_THREAD=0 (i.e. OpenBLAS itself will run in + single-threaded mode) but an application makes OpenBLAS + function calls from multiple threads, then locking is + mandatory for correct operation. + endif diff --git a/buildroot/package/openblas/openblas.mk b/buildroot/package/openblas/openblas.mk index 9701df914..21d05cf30 100644 --- a/buildroot/package/openblas/openblas.mk +++ b/buildroot/package/openblas/openblas.mk @@ -25,12 +25,19 @@ OPENBLAS_MAKE_OPTS += ONLY_CBLAS=1 endif # Enable/Disable multi-threading (not for static-only since it uses dlfcn.h) -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS):$(BR2_STATIC_LIBS),y:) +ifeq ($(BR2_PACKAGE_OPENBLAS_USE_THREAD),y) OPENBLAS_MAKE_OPTS += USE_THREAD=1 else OPENBLAS_MAKE_OPTS += USE_THREAD=0 endif +ifeq ($(BR2_PACKAGE_OPENBLAS_USE_LOCKING),y) +OPENBLAS_MAKE_OPTS += USE_LOCKING=1 +else +# not passing USE_LOCKING=0 as this could be confusing: its effect is implicit +# in case of USE_THREAD=1. +endif + # We don't know if OpenMP is available or not, so disable OPENBLAS_MAKE_OPTS += USE_OPENMP=0 diff --git a/buildroot/package/opencv3/opencv3.hash b/buildroot/package/opencv3/opencv3.hash index 545108a73..04eed67cf 100644 --- a/buildroot/package/opencv3/opencv3.hash +++ b/buildroot/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13 opencv3-3.4.12.tar.gz +sha256 70230049194ae03ed8bfaab6cd1388569aa1b5c482d8b50d3af1cd2ae5a0b95d opencv3-3.4.13.tar.gz sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 LICENSE diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk index e888485d2..b1b86ba71 100644 --- a/buildroot/package/opencv3/opencv3.mk +++ b/buildroot/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.12 +OPENCV3_VERSION = 3.4.13 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause diff --git a/buildroot/package/openfpgaloader/Config.in b/buildroot/package/openfpgaloader/Config.in index 5bf496627..f1b34ef5d 100644 --- a/buildroot/package/openfpgaloader/Config.in +++ b/buildroot/package/openfpgaloader/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OPENFPGALOADER bool "openfpgaloader" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi1 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi1 -> libusb depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFTDI1 help @@ -8,5 +9,7 @@ config BR2_PACKAGE_OPENFPGALOADER https://github.com/trabucayre/openFPGALoader/ -comment "openfpgaloader needs a toolchain w/ threads, C++" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP +comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in index 3b35c725e..1b60d80dc 100644 --- a/buildroot/package/openjdk/Config.in +++ b/buildroot/package/openjdk/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_OPENJDK depends on !BR2_STATIC_LIBS # glibc depends on BR2_INSTALL_LIBSTDCPP # cups depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_MMU # cups depends on BR2_PACKAGE_XORG7 @@ -151,12 +152,14 @@ comment "openjdk needs X.Org" depends on BR2_USE_MMU depends on !BR2_PACKAGE_XORG7 -comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++" +comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 comment "openjdk does not support soft float configurations" depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS diff --git a/buildroot/package/openjpeg/openjpeg.mk b/buildroot/package/openjpeg/openjpeg.mk index 7663cbb0b..7f2a2c439 100644 --- a/buildroot/package/openjpeg/openjpeg.mk +++ b/buildroot/package/openjpeg/openjpeg.mk @@ -8,6 +8,7 @@ OPENJPEG_VERSION = 2.4.0 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE +OPENJPEG_CPE_ID_VENDOR = uclouvain OPENJPEG_INSTALL_STAGING = YES OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) diff --git a/buildroot/package/openlayers/openlayers.hash b/buildroot/package/openlayers/openlayers.hash index 2774b8064..23683bd6e 100644 --- a/buildroot/package/openlayers/openlayers.hash +++ b/buildroot/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 8371bbca2f7b33be0db5b416a78bc9559dd8f9afb6a406994daeeecf7b37f3f6 v6.4.3-dist.zip +sha256 ab80014b15963404ec269a71f563fd3568581c55de160d5663600ea0787cf568 v6.5.0-dist.zip diff --git a/buildroot/package/openlayers/openlayers.mk b/buildroot/package/openlayers/openlayers.mk index c3e137adc..db464ef8a 100644 --- a/buildroot/package/openlayers/openlayers.mk +++ b/buildroot/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.4.3 +OPENLAYERS_VERSION = 6.5.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause diff --git a/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch b/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch new file mode 100644 index 000000000..a611b9ff5 --- /dev/null +++ b/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch @@ -0,0 +1,26 @@ +From 9badb73425a67768c09bcaed1a9c26c684af6c30 Mon Sep 17 00:00:00 2001 +From: Howard Chu +Date: Sat, 6 Feb 2021 20:52:06 +0000 +Subject: [PATCH] ITS#9454 fix issuerAndThisUpdateCheck + +Signed-off-by: Peter Korsgaard +--- + servers/slapd/schema_init.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c +index 31be1154e..8b1e25539 100644 +--- a/servers/slapd/schema_init.c ++++ b/servers/slapd/schema_init.c +@@ -3900,6 +3900,8 @@ issuerAndThisUpdateCheck( + break; + } + } ++ if ( tu->bv_len < STRLENOF("YYYYmmddHHmmssZ") ) return LDAP_INVALID_SYNTAX; ++ + x.bv_val += tu->bv_len + 1; + x.bv_len -= tu->bv_len + 1; + +-- +2.20.1 + diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index e361fc420..ec11e4fa7 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -9,9 +9,13 @@ OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License OPENLDAP_LICENSE_FILES = LICENSE +OPENLDAP_CPE_ID_VENDOR = openldap OPENLDAP_INSTALL_STAGING = YES OPENLDAP_DEPENDENCIES = host-pkgconf +# 0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch +OPENLDAP_IGNORE_CVES += CVE-2021-27212 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENLDAP_TLS = openssl OPENLDAP_DEPENDENCIES += openssl diff --git a/buildroot/package/openntpd/openntpd.mk b/buildroot/package/openntpd/openntpd.mk index 9076f3ddd..30c39e45e 100644 --- a/buildroot/package/openntpd/openntpd.mk +++ b/buildroot/package/openntpd/openntpd.mk @@ -8,6 +8,7 @@ OPENNTPD_VERSION = 6.2p3 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause OPENNTPD_LICENSE_FILES = COPYING +OPENNTPD_CPE_ID_VENDOR = openntpd OPENNTPD_DEPENDENCIES = host-bison # Need to autoreconf for our libtool patch to apply properly OPENNTPD_AUTORECONF = YES diff --git a/buildroot/package/openocd/Config.in b/buildroot/package/openocd/Config.in index 448872061..f2e79f29f 100644 --- a/buildroot/package/openocd/Config.in +++ b/buildroot/package/openocd/Config.in @@ -13,6 +13,7 @@ comment "Adapters" config BR2_PACKAGE_OPENOCD_CMSIS_DAP bool "CMSIS-DAP compliant debuggers" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_PACKAGE_HAS_UDEV # hidapi depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi select BR2_PACKAGE_LIBUSB @@ -24,6 +25,7 @@ config BR2_PACKAGE_OPENOCD_CMSIS_DAP config BR2_PACKAGE_OPENOCD_FTDI bool "MPSSE mode of FTDI based devices" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the MPSSE mode of FTDI @@ -32,6 +34,7 @@ config BR2_PACKAGE_OPENOCD_FTDI config BR2_PACKAGE_OPENOCD_STLINK bool "ST-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the ST-Link JTAG @@ -40,6 +43,7 @@ config BR2_PACKAGE_OPENOCD_STLINK config BR2_PACKAGE_OPENOCD_TI_ICDI bool "TI ICDI JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the TI ICDI JTAG @@ -48,6 +52,7 @@ config BR2_PACKAGE_OPENOCD_TI_ICDI config BR2_PACKAGE_OPENOCD_ULINK bool "Keil ULINK JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Keil ULINK JTAG @@ -56,6 +61,7 @@ config BR2_PACKAGE_OPENOCD_ULINK config BR2_PACKAGE_OPENOCD_UBLASTER2 bool "Altera USB-Blaster II Compatible" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Altera USB-Blaster @@ -64,6 +70,7 @@ config BR2_PACKAGE_OPENOCD_UBLASTER2 config BR2_PACKAGE_OPENOCD_JLINK bool "Segger J-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Segger J-Link JTAG Programmer and clone such as Atmel @@ -72,6 +79,7 @@ config BR2_PACKAGE_OPENOCD_JLINK config BR2_PACKAGE_OPENOCD_OSDBM bool "OSDBM JTAG (only) Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the OSBDM (JTAG only) @@ -80,6 +88,7 @@ config BR2_PACKAGE_OPENOCD_OSDBM config BR2_PACKAGE_OPENOCD_OPENDOUS bool "eStick/opendous JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the eStick/opendous JTAG @@ -89,6 +98,7 @@ config BR2_PACKAGE_OPENOCD_AICE bool "Andes JTAG Programmer" depends on BR2_USE_MMU # use fork() depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Enable building support for the Andes JTAG @@ -97,6 +107,7 @@ config BR2_PACKAGE_OPENOCD_AICE config BR2_PACKAGE_OPENOCD_VSLLINK bool "Versaloon-Link JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -106,6 +117,7 @@ config BR2_PACKAGE_OPENOCD_VSLLINK config BR2_PACKAGE_OPENOCD_USBPROG bool "USBProg JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -115,6 +127,7 @@ config BR2_PACKAGE_OPENOCD_USBPROG config BR2_PACKAGE_OPENOCD_RLINK bool "Raisonance RLink JTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -124,6 +137,7 @@ config BR2_PACKAGE_OPENOCD_RLINK config BR2_PACKAGE_OPENOCD_ARMEW bool "Olimex ARM-JTAG-EW Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb-compat -> libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -143,6 +157,7 @@ config BR2_PACKAGE_OPENOCD_VPI config BR2_PACKAGE_OPENOCD_UBLASTER bool "Altera USB-Blaster" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 help Enable building support for the Altera USB-Blaster @@ -183,6 +198,7 @@ config BR2_PACKAGE_OPENOCD_GW16012 config BR2_PACKAGE_OPENOCD_PRESTO bool "ASIX Presto Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 help Enable building support for ASIX Presto Programmer @@ -191,6 +207,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO config BR2_PACKAGE_OPENOCD_OPENJTAG bool "OpenJTAG Programmer" depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI1 select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h @@ -209,10 +226,11 @@ config BR2_PACKAGE_OPENOCD_SYSFS Enable building support for programming driven via sysfs gpios. -# Many adapters need libusb or libusb-compat, which require threads, -# but we don't want to duplicate this comment for all adapters that -# select libusb or libusb-compat. -comment "many openocd adapters needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +# Many adapters need libusb or libusb-compat, which require threads and +# gcc >= 4.9 but we don't want to duplicate this comment for all +# adapters that select libusb or libusb-compat. +comment "many openocd adapters needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 endif # BR2_PACKAGE_OPENOCD diff --git a/buildroot/package/openocd/Config.in.host b/buildroot/package/openocd/Config.in.host index e1d0e6330..8ff37379a 100644 --- a/buildroot/package/openocd/Config.in.host +++ b/buildroot/package/openocd/Config.in.host @@ -1,6 +1,10 @@ config BR2_PACKAGE_HOST_OPENOCD bool "host openocd" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help OpenOCD - Open On-Chip Debugger http://openocd.org/ + +comment "host openocd needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/openrc/openrc.mk b/buildroot/package/openrc/openrc.mk index ba1691e70..e9e35c4d1 100644 --- a/buildroot/package/openrc/openrc.mk +++ b/buildroot/package/openrc/openrc.mk @@ -8,6 +8,7 @@ OPENRC_VERSION = 0.42.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE +OPENRC_CPE_ID_VALID = YES # 0007-checkpath-fix-CVE-2018-21269.patch OPENRC_IGNORE_CVES += CVE-2018-21269 diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 64ac22181..edcbfc2f6 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -5,6 +5,8 @@ ################################################################################ OPENSSH_VERSION = 8.3p1 +OPENSSH_CPE_ID_VERSION = 8.3 +OPENSSH_CPE_ID_UPDATE = p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE @@ -12,6 +14,7 @@ OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` +OPENSSH_CPE_ID_VENDOR = openbsd OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ --with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \ diff --git a/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch b/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index eb474b56a..000000000 --- a/buildroot/package/openswan/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3324d5ab1d00920ea46f453240da1356e0639e98 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 24 Sep 2020 21:55:31 +0200 -Subject: [PATCH] fix build with gcc 10 - -Define kw_host_list and kw_connaddrfamily_list as extern to avoid the following -build failure with gcc 10 (which defaults to -fno-common): - -/home/peko/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: initiate.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: multiple definition of `kw_host_list'; connections.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: first defined here - -Fixes: - - http://autobuild.buildroot.org/results/650fc0046fd063c70e17ce5ebd9592195657434d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xelerance/Openswan/pull/444] ---- - include/ipsecconf/keywords.h | 2 +- - include/pluto_constants.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/ipsecconf/keywords.h b/include/ipsecconf/keywords.h -index e32be7968..02e8e073e 100644 ---- a/include/ipsecconf/keywords.h -+++ b/include/ipsecconf/keywords.h -@@ -314,7 +314,7 @@ struct config_parsed { - bool got_default; - }; - --const struct keyword_enum_values kw_connaddrfamily_list; -+extern const struct keyword_enum_values kw_connaddrfamily_list; - - extern struct keyword_def ipsec_conf_keywords_v2[]; - extern const int ipsec_conf_keywords_v2_count; -diff --git a/include/pluto_constants.h b/include/pluto_constants.h -index c35dd9576..dcbd3b5b4 100644 ---- a/include/pluto_constants.h -+++ b/include/pluto_constants.h -@@ -665,7 +665,7 @@ enum keyword_host { - KH_IPADDR = LOOSE_ENUM_OTHER, - }; - /* keyword_name(&kw_host_list, type, buffer[KEYWORD_NAME_BUFLEN]) */ --struct keyword_enum_values kw_host_list; -+extern struct keyword_enum_values kw_host_list; - #define KH_ISWILDCARD(type) ((type) == KH_ANY || (type) == KH_DEFAULTROUTE) - #define KH_ISKNOWNADDR(type) ((type) == KH_IPADDR || (type)==KH_IFACE) - --- -2.28.0 - diff --git a/buildroot/package/openswan/Config.in b/buildroot/package/openswan/Config.in index 340686cc5..c71d064da 100644 --- a/buildroot/package/openswan/Config.in +++ b/buildroot/package/openswan/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_OPENSWAN bool "openswan" depends on BR2_USE_MMU # iproute2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE + depends on !BR2_TOOLCHAIN_USES_UCLIBC # ns_t_tkey select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 help @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPENSWAN http://www.openswan.org -comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.4" +comment "openswan needs a glibc or musl toolchain w/ headers >= 3.4" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ - BR2_TOOLCHAIN_USES_MUSL + BR2_TOOLCHAIN_USES_UCLIBC diff --git a/buildroot/package/openswan/openswan.hash b/buildroot/package/openswan/openswan.hash index a9b54dbaf..574009ebf 100644 --- a/buildroot/package/openswan/openswan.hash +++ b/buildroot/package/openswan/openswan.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d openswan-2.6.51.5.tar.gz -sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING -sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE +sha256 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331 openswan-3.0.0.tar.gz +sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING +sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE diff --git a/buildroot/package/openswan/openswan.mk b/buildroot/package/openswan/openswan.mk index aabf7d98c..7f083f695 100644 --- a/buildroot/package/openswan/openswan.mk +++ b/buildroot/package/openswan/openswan.mk @@ -4,16 +4,18 @@ # ################################################################################ -OPENSWAN_VERSION = 2.6.51.5 -OPENSWAN_SITE = https://download.openswan.org/openswan +OPENSWAN_VERSION = 3.0.0 +OPENSWAN_SITE = $(call github,xelerance,Openswan,v$(OPENSWAN_VERSION)) OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause OPENSWAN_LICENSE_FILES = COPYING LICENSE +OPENSWAN_CPE_ID_VENDOR = xelerance OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2 OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" POD2MAN="" XMLTO="" \ USERCOMPILE="$(TARGET_CFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ USERLINK="$(TARGET_LDFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false + INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false \ + USE_NOMANINSTALL=true ifeq ($(BR2_PACKAGE_LIBCURL),y) OPENSWAN_DEPENDENCIES += libcurl diff --git a/buildroot/package/openvpn/openvpn.hash b/buildroot/package/openvpn/openvpn.hash index b9b0a4d8d..4e371fc87 100644 --- a/buildroot/package/openvpn/openvpn.hash +++ b/buildroot/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 641f3add8694b2ccc39fd4fd92554e4f089ad16a8db6d2b473ec284839a5ebe2 openvpn-2.4.9.tar.xz -sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL +sha256 029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd openvpn-2.5.0.tar.xz +sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/buildroot/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk index bc01c893c..7c67e9507 100644 --- a/buildroot/package/openvpn/openvpn.mk +++ b/buildroot/package/openvpn/openvpn.mk @@ -4,19 +4,17 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.9 +OPENVPN_VERSION = 2.5.0 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL +OPENVPN_CPE_ID_VENDOR = openvpn OPENVPN_CONF_OPTS = \ - --enable-iproute2 \ + --disable-unit-tests \ $(if $(BR2_STATIC_LIBS),--disable-plugins) -OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ - NETSTAT=/bin/netstat \ - ROUTE=/sbin/route \ - IPROUTE=/sbin/ip +OPENVPN_CONF_ENV = NETSTAT=/bin/netstat ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) OPENVPN_CONF_OPTS += \ diff --git a/buildroot/package/opkg-utils/opkg-utils.hash b/buildroot/package/opkg-utils/opkg-utils.hash index 471ce4c2f..779852d9c 100644 --- a/buildroot/package/opkg-utils/opkg-utils.hash +++ b/buildroot/package/opkg-utils/opkg-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acb208fe32f93f7fc0f7fdf9f870c07e40a016bcb7fa07ada6c99503e033dafd opkg-utils-0.4.3.tar.gz +sha256 552c074630b6d6b39a32a35243fb34d7c5888b8a4f18118abb4daf92d0e847f2 opkg-utils-0.4.3-br1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/opusfile/opusfile.hash b/buildroot/package/opusfile/opusfile.hash index e9ecf83fe..30bf9b36d 100644 --- a/buildroot/package/opusfile/opusfile.hash +++ b/buildroot/package/opusfile/opusfile.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf opusfile-0.11.tar.gz +sha256 118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b opusfile-0.12.tar.gz # Hash for license file -sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING +sha256 0267ae795ab744c4e0f9c45e249440fdf2e75dac8c804f36066b28649bf74aaf COPYING diff --git a/buildroot/package/opusfile/opusfile.mk b/buildroot/package/opusfile/opusfile.mk index 49a53b395..72ae82e80 100644 --- a/buildroot/package/opusfile/opusfile.mk +++ b/buildroot/package/opusfile/opusfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUSFILE_VERSION = 0.11 +OPUSFILE_VERSION = 0.12 OPUSFILE_SITE = https://downloads.xiph.org/releases/opus OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus OPUSFILE_LICENSE = BSD-3-Clause diff --git a/buildroot/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/buildroot/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch new file mode 100644 index 000000000..0a4e7010f --- /dev/null +++ b/buildroot/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch @@ -0,0 +1,70 @@ +From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 15 Feb 2021 20:17:43 +0100 +Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11 + +Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and +https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235: + +FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c +../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv': +../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'? + 164 | if (buf[i] == AT_L1D_CACHESIZE) { + | ^~~~~~~~~~~~~~~~ + | AT_DCACHEBSIZE +../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in +../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? + 168 | if (buf[i] == AT_L2_CACHESIZE) { + | ^~~~~~~~~~~~~~~ + | AT_ICACHEBSIZE +../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? + 172 | if (buf[i] == AT_L3_CACHESIZE) { + | ^~~~~~~~~~~~~~~ + | AT_ICACHEBSIZE + +Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and +https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147 + +Fixes: + - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56] +--- + orc/orccpu-powerpc.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c +index 6796f17..340cf05 100644 +--- a/orc/orccpu-powerpc.c ++++ b/orc/orccpu-powerpc.c +@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void) + _orc_cpu_name = (char*)buf[i + 1]; + found++; + } ++#ifdef AT_L1D_CACHESIZE + if (buf[i] == AT_L1D_CACHESIZE) { + _orc_data_cache_size_level1 = buf[i + 1]; + found++; + } ++#endif ++#ifdef AT_L2_CACHESIZE + if (buf[i] == AT_L2_CACHESIZE) { + _orc_data_cache_size_level2 = buf[i + 1]; + found++; + } ++#endif ++#ifdef AT_L3_CACHESIZE + if (buf[i] == AT_L3_CACHESIZE) { + _orc_data_cache_size_level3 = buf[i + 1]; + found++; + } ++#endif + if (found == 6) + break; + } +-- +2.30.0 + diff --git a/buildroot/package/ortp/ortp.hash b/buildroot/package/ortp/ortp.hash index 65a514160..7853c6314 100644 --- a/buildroot/package/ortp/ortp.hash +++ b/buildroot/package/ortp/ortp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55d12b71ed7c3958abb8d892105e616499d66c88200c46e3ec3cfbbe79771b2e ortp-4.3.1.tar.gz +sha256 9b1d43f676a35920e2837abc0eb4d600d4d3e47d2621fa3b0897777cf587ee8d ortp-4.4.8.tar.gz sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/buildroot/package/ortp/ortp.mk b/buildroot/package/ortp/ortp.mk index 436e04c14..67bef9aeb 100644 --- a/buildroot/package/ortp/ortp.mk +++ b/buildroot/package/ortp/ortp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORTP_VERSION = 4.3.1 +ORTP_VERSION = 4.4.8 ORTP_SITE = https://gitlab.linphone.org/BC/public/ortp/-/archive/$(ORTP_VERSION) ORTP_LICENSE = GPL-3.0+ ORTP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/p11-kit/p11-kit.mk b/buildroot/package/p11-kit/p11-kit.mk index 81972f811..977150f57 100644 --- a/buildroot/package/p11-kit/p11-kit.mk +++ b/buildroot/package/p11-kit/p11-kit.mk @@ -13,6 +13,7 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING +P11_KIT_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi diff --git a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk index bf1c4a27b..161e53d48 100644 --- a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk +++ b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -11,10 +11,6 @@ PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10 PAHO_MQTT_CPP_INSTALL_STAGING = YES PAHO_MQTT_CPP_DEPENDENCIES = paho-mqtt-c -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling (for cmake < 3.10) -PAHO_MQTT_CPP_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_OPENSSL),y) PAHO_MQTT_CPP_DEPENDENCIES += openssl PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=TRUE diff --git a/buildroot/package/pango/Config.in b/buildroot/package/pango/Config.in index e810598ee..cf5170c8f 100644 --- a/buildroot/package/pango/Config.in +++ b/buildroot/package/pango/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_PANGO widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. - http://www.pango.org/ + https://pango.gnome.org/ comment "pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU diff --git a/buildroot/package/pango/pango.hash b/buildroot/package/pango/pango.hash index 32808c6ca..a672b7cfa 100644 --- a/buildroot/package/pango/pango.hash +++ b/buildroot/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/pango/1.46/pango-1.46.2.sha256sum -sha256 d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841 pango-1.46.2.tar.xz +# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.48/pango-1.48.0.sha256sum +sha256 391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6 pango-1.48.0.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/pango/pango.mk b/buildroot/package/pango/pango.mk index 92bd6c3ea..d719b7659 100644 --- a/buildroot/package/pango/pango.mk +++ b/buildroot/package/pango/pango.mk @@ -4,8 +4,8 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.46 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 +PANGO_VERSION_MAJOR = 1.48 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).0 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES @@ -13,7 +13,7 @@ PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING PANGO_CONF_OPTS = -Duse_fontconfig=true -HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false +HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=disabled PANGO_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -34,10 +34,10 @@ HOST_PANGO_DEPENDENCIES = \ host-freetype ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -PANGO_CONF_OPTS += -Dintrospection=true +PANGO_CONF_OPTS += -Dintrospection=enabled PANGO_DEPENDENCIES += gobject-introspection else -PANGO_CONF_OPTS += -Dintrospection=false +PANGO_CONF_OPTS += -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) diff --git a/buildroot/package/patch/patch.mk b/buildroot/package/patch/patch.mk index b7f5bac05..6f83d2418 100644 --- a/buildroot/package/patch/patch.mk +++ b/buildroot/package/patch/patch.mk @@ -9,6 +9,7 @@ PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz PATCH_SITE = $(BR2_GNU_MIRROR)/patch PATCH_LICENSE = GPL-3.0+ PATCH_LICENSE_FILES = COPYING +PATCH_CPE_ID_VENDOR = gnu # 0001-Fix-segfault-with-mangled-rename-patch.patch PATCH_IGNORE_CVES += CVE-2018-6951 diff --git a/buildroot/package/pax-utils/pax-utils.mk b/buildroot/package/pax-utils/pax-utils.mk index 502fc8744..704e50e73 100644 --- a/buildroot/package/pax-utils/pax-utils.mk +++ b/buildroot/package/pax-utils/pax-utils.mk @@ -9,6 +9,7 @@ PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz PAX_UTILS_LICENSE = GPL-2.0 PAX_UTILS_LICENSE_FILES = COPYING +PAX_UTILS_CPE_ID_VENDOR = gentoo PAX_UTILS_DEPENDENCIES = host-pkgconf PAX_UTILS_CONF_OPTS = --without-python diff --git a/buildroot/package/paxtest/paxtest.mk b/buildroot/package/paxtest/paxtest.mk index e632e222c..1b8d6699b 100644 --- a/buildroot/package/paxtest/paxtest.mk +++ b/buildroot/package/paxtest/paxtest.mk @@ -8,6 +8,7 @@ PAXTEST_VERSION = 0.9.15 PAXTEST_SITE = https://www.grsecurity.net/~spender PAXTEST_LICENSE = GPL-2.0+ PAXTEST_LICENSE_FILES = README +PAXTEST_CPE_ID_VENDOR = grsecurity define PAXTEST_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ diff --git a/buildroot/package/pcre/pcre.mk b/buildroot/package/pcre/pcre.mk index 3c280e593..c8498b7ac 100644 --- a/buildroot/package/pcre/pcre.mk +++ b/buildroot/package/pcre/pcre.mk @@ -9,6 +9,7 @@ PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3-Clause PCRE_LICENSE_FILES = LICENCE +PCRE_CPE_ID_VENDOR = pcre PCRE_INSTALL_STAGING = YES PCRE_CONFIG_SCRIPTS = pcre-config diff --git a/buildroot/package/pcre2/Config.in b/buildroot/package/pcre2/Config.in index f35877f37..f06f1914f 100644 --- a/buildroot/package/pcre2/Config.in +++ b/buildroot/package/pcre2/Config.in @@ -1,4 +1,3 @@ - config BR2_PACKAGE_PCRE2 bool "pcre2" help diff --git a/buildroot/package/pcsc-lite/Config.in b/buildroot/package/pcsc-lite/Config.in index 3250a463b..1b4d0f7d1 100644 --- a/buildroot/package/pcsc-lite/Config.in +++ b/buildroot/package/pcsc-lite/Config.in @@ -13,10 +13,14 @@ if BR2_PACKAGE_PCSC_LITE config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB bool "use libusb" depends on !BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Select Y if you want to support usb smart card readers. +comment "libusb support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_PCSC_LITE_DEBUGATR bool "enable ATR debug messages" help diff --git a/buildroot/package/pdbg/pdbg.hash b/buildroot/package/pdbg/pdbg.hash index bc5772f06..bc9f99b14 100644 --- a/buildroot/package/pdbg/pdbg.hash +++ b/buildroot/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 622446c76adbb41ccbe0b1e3a84b704ef66cdd8429e1e6fedec80493c54801e7 pdbg-3.1.tar.gz +sha256 c47adcac1c404266217be8c4acb408d9eba59562b094c941e96e4f77f3ced7d2 pdbg-3.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/pdbg/pdbg.mk b/buildroot/package/pdbg/pdbg.mk index 79e4f5c7c..e8bb36c32 100644 --- a/buildroot/package/pdbg/pdbg.mk +++ b/buildroot/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.1 +PDBG_VERSION = 3.2 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING diff --git a/buildroot/package/perl-date-manip/perl-date-manip.hash b/buildroot/package/perl-date-manip/perl-date-manip.hash index 207c59208..90961c74f 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.hash +++ b/buildroot/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 13c7600ff8a33d585b753874df85e4ea Date-Manip-6.82.tar.gz -sha256 fa96bcf94c6b4b7d3333f073f5d0faad59f546e5aec13ac01718f2e6ef14672a Date-Manip-6.82.tar.gz +md5 92be58690a9a64d51fb158198220fd63 Date-Manip-6.83.tar.gz +sha256 f491b2e1d876c222a59563b1bbd893c1034207ed0337304bf396311d9e9199fa Date-Manip-6.83.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/buildroot/package/perl-date-manip/perl-date-manip.mk b/buildroot/package/perl-date-manip/perl-date-manip.mk index a54a53a1f..ab5134691 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.mk +++ b/buildroot/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.82 +PERL_DATE_MANIP_VERSION = 6.83 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-devel-cycle/Config.in b/buildroot/package/perl-devel-cycle/Config.in new file mode 100644 index 000000000..7561f65fb --- /dev/null +++ b/buildroot/package/perl-devel-cycle/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_DEVEL_CYCLE + bool "perl-devel-cycle" + help + Find memory cycles in objects. + + https://metacpan.org/release/Devel-Cycle diff --git a/buildroot/package/perl-devel-cycle/perl-devel-cycle.hash b/buildroot/package/perl-devel-cycle/perl-devel-cycle.hash new file mode 100644 index 000000000..e7a93fde9 --- /dev/null +++ b/buildroot/package/perl-devel-cycle/perl-devel-cycle.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 3d9a963da87b17398fab9acbef63f277 Devel-Cycle-1.12.tar.gz +sha256 fd3365c4d898b2b2bddbb78a46d507a18cca8490a290199547dab7f1e7390bc2 Devel-Cycle-1.12.tar.gz + +# computed by scancpan +sha256 e47dfab3e7e9d20fe6313169ead2736ab97f1388003eee033dd934278649034d README diff --git a/buildroot/package/perl-devel-cycle/perl-devel-cycle.mk b/buildroot/package/perl-devel-cycle/perl-devel-cycle.mk new file mode 100644 index 000000000..0599e1c3a --- /dev/null +++ b/buildroot/package/perl-devel-cycle/perl-devel-cycle.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-devel-cycle +# +################################################################################ + +PERL_DEVEL_CYCLE_VERSION = 1.12 +PERL_DEVEL_CYCLE_SOURCE = Devel-Cycle-$(PERL_DEVEL_CYCLE_VERSION).tar.gz +PERL_DEVEL_CYCLE_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS +PERL_DEVEL_CYCLE_LICENSE = Artistic or GPL-1.0+ +PERL_DEVEL_CYCLE_LICENSE_FILES = README +PERL_DEVEL_CYCLE_DISTNAME = Devel-Cycle + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-devel-size/Config.in b/buildroot/package/perl-devel-size/Config.in new file mode 100644 index 000000000..b545cf184 --- /dev/null +++ b/buildroot/package/perl-devel-size/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PERL_DEVEL_SIZE + bool "perl-devel-size" + depends on !BR2_STATIC_LIBS + help + Perl extension for finding the memory usage of Perl + variables. + + https://metacpan.org/release/Devel-Size + +comment "perl-devel-size needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-devel-size/perl-devel-size.hash b/buildroot/package/perl-devel-size/perl-devel-size.hash new file mode 100644 index 000000000..c0fbcf29c --- /dev/null +++ b/buildroot/package/perl-devel-size/perl-devel-size.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 0b5335d69402c75d5ab9978027ae2f66 Devel-Size-0.83.tar.gz +sha256 757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3 Devel-Size-0.83.tar.gz + +# computed by scancpan +sha256 fca4ebe3a1f329aa33a4d259c0a5b136a15a40b987c60c2dd6f1007bb01a1513 README diff --git a/buildroot/package/perl-devel-size/perl-devel-size.mk b/buildroot/package/perl-devel-size/perl-devel-size.mk new file mode 100644 index 000000000..9acc67c9e --- /dev/null +++ b/buildroot/package/perl-devel-size/perl-devel-size.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-devel-size +# +################################################################################ + +PERL_DEVEL_SIZE_VERSION = 0.83 +PERL_DEVEL_SIZE_SOURCE = Devel-Size-$(PERL_DEVEL_SIZE_VERSION).tar.gz +PERL_DEVEL_SIZE_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NW/NWCLARK +PERL_DEVEL_SIZE_LICENSE = Artistic or GPL-1.0+ +PERL_DEVEL_SIZE_LICENSE_FILES = README +PERL_DEVEL_SIZE_DISTNAME = Devel-Size + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash b/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash new file mode 100644 index 000000000..7028b96be --- /dev/null +++ b/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 b86318f2b6ac6af3ee985299e1e38fe5 ExtUtils-PkgConfig-1.16.tar.gz +sha256 bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e ExtUtils-PkgConfig-1.16.tar.gz + +# computed by scancpan +sha256 1ca66d6d9d2e14426825889848f0b5b4d4e153afcd74b8f42a1f2937c3a9973d README diff --git a/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk b/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk new file mode 100644 index 000000000..cb11e9f58 --- /dev/null +++ b/buildroot/package/perl-extutils-pkgconfig/perl-extutils-pkgconfig.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# perl-extutils-pkgconfig +# +################################################################################ + +PERL_EXTUTILS_PKGCONFIG_VERSION = 1.16 +PERL_EXTUTILS_PKGCONFIG_SOURCE = ExtUtils-PkgConfig-$(PERL_EXTUTILS_PKGCONFIG_VERSION).tar.gz +PERL_EXTUTILS_PKGCONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/X/XA/XAOC +PERL_EXTUTILS_PKGCONFIG_LICENSE = LGPL-2.1 +PERL_EXTUTILS_PKGCONFIG_LICENSE_FILES = README +PERL_EXTUTILS_PKGCONFIG_DISTNAME = ExtUtils-PkgConfig + +HOST_PERL_EXTUTILS_PKGCONFIG_DEPENDENCIES = host-pkgconf + +HOST_PERL_EXTUTILS_PKGCONFIG_CONF_ENV = PATH=$(BR_PATH) + +$(eval $(host-perl-package)) diff --git a/buildroot/package/perl-file-listing/perl-file-listing.hash b/buildroot/package/perl-file-listing/perl-file-listing.hash index 5496646d2..235896571 100644 --- a/buildroot/package/perl-file-listing/perl-file-listing.hash +++ b/buildroot/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6f298b96fdc072fbd0e0c2890a70ab2e File-Listing-6.11.tar.gz -sha256 c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e File-Listing-6.11.tar.gz +md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz +sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz # computed by scancpan sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE diff --git a/buildroot/package/perl-file-listing/perl-file-listing.mk b/buildroot/package/perl-file-listing/perl-file-listing.mk index f8d449ba3..61bbc18eb 100644 --- a/buildroot/package/perl-file-listing/perl-file-listing.mk +++ b/buildroot/package/perl-file-listing/perl-file-listing.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.11 +PERL_FILE_LISTING_VERSION = 6.14 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/buildroot/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch new file mode 100644 index 000000000..af053c560 --- /dev/null +++ b/buildroot/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch @@ -0,0 +1,34 @@ +From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 24 Jan 2021 10:59:31 +0100 +Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc + +Cross-compilation will fail if gdlib.pc does not contain any cflags. +Indeed, if cflags is empty, Makefile.PL will use the default value for +INC (i.e. -I/usr/include -I/usr/include/gd) + +It should be noted that gdlib-config has been dropped from gd since +version 2.3.0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 25f2f93..7da3651 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - + END + } + +-@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; ++#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; + @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; + @LIBS = qw(-lgd) unless @LIBS; + +-- +2.29.2 + diff --git a/buildroot/package/perl-gd/Config.in b/buildroot/package/perl-gd/Config.in index ef28f7b97..044e60102 100644 --- a/buildroot/package/perl-gd/Config.in +++ b/buildroot/package/perl-gd/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_PERL_GD bool "perl-gd" depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GD help Perl interface to the gd2 graphics library. diff --git a/buildroot/package/perl-gd/perl-gd.mk b/buildroot/package/perl-gd/perl-gd.mk index d34328f0d..b402dfff4 100644 --- a/buildroot/package/perl-gd/perl-gd.mk +++ b/buildroot/package/perl-gd/perl-gd.mk @@ -7,16 +7,48 @@ PERL_GD_VERSION = 2.73 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN -PERL_GD_DEPENDENCIES = zlib libpng freetype gd +PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd PERL_GD_LICENSE = Artistic or GPL-1.0+ PERL_GD_LICENSE_FILES = LICENSE PERL_GD_DISTNAME = GD -PERL_GD_CONF_OPTS = \ +PERL_GD_CONF_ENV = \ + PATH=$(BR_PATH) \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +PERL_GD_DEPENDENCIES += fontconfig +PERL_GD_OPTIONS += FONTCONFIG +PERL_GD_CONF_OPTS += -lib_fontconfig_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +PERL_GD_DEPENDENCIES += freetype +PERL_GD_OPTIONS += FT +PERL_GD_CONF_OPTS += -lib_ft_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +PERL_GD_DEPENDENCIES += jpeg +PERL_GD_OPTIONS += JPEG +PERL_GD_CONF_OPTS += -lib_jpeg_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +PERL_GD_DEPENDENCIES += libpng +PERL_GD_OPTIONS += PNG +PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +PERL_GD_DEPENDENCIES += xlib_libXpm +PERL_GD_OPTIONS += XPM +PERL_GD_CONF_OPTS += -lib_xpm_path=$(STAGING_DIR)/usr +endif + +PERL_GD_CONF_OPTS += \ -lib_gd_path=$(STAGING_DIR)/usr \ - -lib_ft_path=$(STAGING_DIR)/usr \ - -lib_png_path=$(STAGING_DIR)/usr \ -lib_zlib_path=$(STAGING_DIR)/usr \ - -gdlib_config_path=$(STAGING_DIR)/usr/bin + -options=$(subst $(space),$(comma),$(PERL_GD_OPTIONS)) $(eval $(perl-package)) diff --git a/buildroot/package/perl-http-cookies/perl-http-cookies.hash b/buildroot/package/perl-http-cookies/perl-http-cookies.hash index 4099ce707..15d9e7a86 100644 --- a/buildroot/package/perl-http-cookies/perl-http-cookies.hash +++ b/buildroot/package/perl-http-cookies/perl-http-cookies.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8c663710244e70c85775393a8f5be443 HTTP-Cookies-6.08.tar.gz -sha256 49ebb73576eb41063c04bc079477df094496deec805ae033f3be338c23c3af59 HTTP-Cookies-6.08.tar.gz +md5 b4d7804231b1dfd10999d42283e0cf06 HTTP-Cookies-6.10.tar.gz +sha256 e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007 HTTP-Cookies-6.10.tar.gz # computed by scancpan -sha256 5204690d6efb272e6fde7c3e3b8aba5114e1458b706710eaf607041ac080344d LICENSE +sha256 82902ce20c8ed71d7f4e7a6a5b2b26e43a7e2e90c78098fb49aa49e03ac808e0 LICENSE diff --git a/buildroot/package/perl-http-cookies/perl-http-cookies.mk b/buildroot/package/perl-http-cookies/perl-http-cookies.mk index 6f802d644..745fd10a7 100644 --- a/buildroot/package/perl-http-cookies/perl-http-cookies.mk +++ b/buildroot/package/perl-http-cookies/perl-http-cookies.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_COOKIES_VERSION = 6.08 +PERL_HTTP_COOKIES_VERSION = 6.10 PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash index 882bf0a3d..69d5f6e97 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b5ead58775c2f151f2174651807fdf2d HTTP-Entity-Parser-0.24.tar.gz -sha256 f68e0fc87150cb9241ac23d7226fc2a35324d2e8990830c1e2a7203244f1e612 HTTP-Entity-Parser-0.24.tar.gz +md5 09663f9577975587e832e28ba5f5f8af HTTP-Entity-Parser-0.25.tar.gz +sha256 3a8cd0d8cba3d17cd8c04ee82d7341dfaa247dbdd94a49eb94b53f69e483ec3a HTTP-Entity-Parser-0.25.tar.gz # computed by scancpan sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk index 0b09ea41c..2304955bd 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_ENTITY_PARSER_VERSION = 0.24 +PERL_HTTP_ENTITY_PARSER_VERSION = 0.25 PERL_HTTP_ENTITY_PARSER_SOURCE = HTTP-Entity-Parser-$(PERL_HTTP_ENTITY_PARSER_VERSION).tar.gz PERL_HTTP_ENTITY_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_HTTP_ENTITY_PARSER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-http-message/perl-http-message.hash b/buildroot/package/perl-http-message/perl-http-message.hash index 989d7efd0..4e406c9d4 100644 --- a/buildroot/package/perl-http-message/perl-http-message.hash +++ b/buildroot/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3b4b64fff4885429b997390564521db0 HTTP-Message-6.26.tar.gz -sha256 6ce6c359de75c3bb86696a390189b485ec93e3ffc55326b6d044fa900f1725e1 HTTP-Message-6.26.tar.gz +md5 4b4038aef74f63c2b6baca189c6c6602 HTTP-Message-6.27.tar.gz +sha256 0be0f720fbbbdbae8711f6eec9b2f0d34bd5ed5046fc66b80dc3b42017c1e699 HTTP-Message-6.27.tar.gz # computed by scancpan sha256 1379396dcd2291f17a741d2d6bf14d379f5f2ab91b3c7e7b92c5f82856e2d7ac LICENSE diff --git a/buildroot/package/perl-http-message/perl-http-message.mk b/buildroot/package/perl-http-message/perl-http-message.mk index 114fc8000..72b94356b 100644 --- a/buildroot/package/perl-http-message/perl-http-message.mk +++ b/buildroot/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.26 +PERL_HTTP_MESSAGE_VERSION = 6.27 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash b/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash index 3f1a99c38..a53d4ec61 100644 --- a/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash +++ b/buildroot/package/perl-json-maybexs/perl-json-maybexs.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 2c40209b38b7a569b3bfc4d88e47d98c JSON-MaybeXS-1.004002.tar.gz -sha256 3b8e2fdc3b36d0c5edbc78121840dced63798ad49cabcf875d5c5e32336d77b5 JSON-MaybeXS-1.004002.tar.gz +md5 e46181e34588428d317932744597a7ab JSON-MaybeXS-1.004003.tar.gz +sha256 5bee3b17ff9dcffd6e99ab8cf7f35747650bfce1dc622e3ad10b85a194462fbf JSON-MaybeXS-1.004003.tar.gz # computed by scancpan sha256 0f2d6b537f7a735c981511875d832bc8ff767bf97d62848cf0bada964e40aadd LICENSE diff --git a/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk b/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk index bb11cd3a2..e6891f680 100644 --- a/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk +++ b/buildroot/package/perl-json-maybexs/perl-json-maybexs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_JSON_MAYBEXS_VERSION = 1.004002 +PERL_JSON_MAYBEXS_VERSION = 1.004003 PERL_JSON_MAYBEXS_SOURCE = JSON-MaybeXS-$(PERL_JSON_MAYBEXS_VERSION).tar.gz PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_JSON_MAYBEXS_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash index 58cb2e847..453463798 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 86601652f46b924a26acecad0fe5c110 libwww-perl-6.49.tar.gz -sha256 c3e4d0deae254c8b8fdc13e14b7b4b893594c947c43f4b5401e06322c96360a6 libwww-perl-6.49.tar.gz +md5 7b5959aff7b11509bd87fa1de753f127 libwww-perl-6.52.tar.gz +sha256 b63f67647b7cfb0bace19ada32e4feb2c2e8e0f4204546c62ce6247fa59d778d libwww-perl-6.52.tar.gz # computed by scancpan sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk index d749b1b60..d121dea91 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.49 +PERL_LIBWWW_PERL_VERSION = 6.52 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-lwp-protocol-https/Config.in b/buildroot/package/perl-lwp-protocol-https/Config.in index c4a7b306b..9793b6f5d 100644 --- a/buildroot/package/perl-lwp-protocol-https/Config.in +++ b/buildroot/package/perl-lwp-protocol-https/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_PERL_LWP_PROTOCOL_HTTPS help Provide https support for LWP::UserAgent. - https://metacpan.org/release/LWP-Protocol-https + https://github.com/libwww-perl/LWP-Protocol-https comment "perl-lwp-protocol-https needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash index 680e24f60..a3c011fe8 100644 --- a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash +++ b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6d497ec74f3cf88ad41898fcb8b01145 LWP-Protocol-https-6.09.tar.gz -sha256 16cfe1a511690b066db5667c8714802ee2b9c5d28a31a3e7bd36fbc70a3af592 LWP-Protocol-https-6.09.tar.gz +md5 cf64e4bc57a9266ac4343cdf0808c5c8 LWP-Protocol-https-6.10.tar.gz +sha256 cecfc31fe2d4fc854cac47fce13d3a502e8fdfe60c5bc1c09535743185f2a86c LWP-Protocol-https-6.10.tar.gz # computed by scancpan sha256 294e73f9bd40ea600e9478cd57489a7da72558a83c6a66f37a82e4e0d5a706d9 LICENSE diff --git a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk index 0c36e7aea..0663820b2 100644 --- a/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk +++ b/buildroot/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.09 +PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.10 PERL_LWP_PROTOCOL_HTTPS_SOURCE = LWP-Protocol-https-$(PERL_LWP_PROTOCOL_HTTPS_VERSION).tar.gz PERL_LWP_PROTOCOL_HTTPS_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LWP_PROTOCOL_HTTPS_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-math-int64/Config.in b/buildroot/package/perl-math-int64/Config.in new file mode 100644 index 000000000..8fbea44af --- /dev/null +++ b/buildroot/package/perl-math-int64/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_MATH_INT64 + bool "perl-math-int64" + depends on !BR2_STATIC_LIBS + help + Manipulate 64 bits integers in Perl. + + http://metacpan.org/release/Math-Int64 + +comment "perl-math-int64 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-math-int64/perl-math-int64.hash b/buildroot/package/perl-math-int64/perl-math-int64.hash new file mode 100644 index 000000000..4f2374b10 --- /dev/null +++ b/buildroot/package/perl-math-int64/perl-math-int64.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 1ad0ce8b5e903dfe9f7ffbabd8a43014 Math-Int64-0.54.tar.gz +sha256 dcfc51e698437ea6b9cefe0276215c56cdb6a7f85e3e24a2b6b4189f1960d351 Math-Int64-0.54.tar.gz + +# computed by scancpan +sha256 59feedfdc4f99a746c54e06ac46c4627fb1e29be3bc71756184f92333600f72b COPYING diff --git a/buildroot/package/perl-math-int64/perl-math-int64.mk b/buildroot/package/perl-math-int64/perl-math-int64.mk new file mode 100644 index 000000000..749ff60c9 --- /dev/null +++ b/buildroot/package/perl-math-int64/perl-math-int64.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-math-int64 +# +################################################################################ + +PERL_MATH_INT64_VERSION = 0.54 +PERL_MATH_INT64_SOURCE = Math-Int64-$(PERL_MATH_INT64_VERSION).tar.gz +PERL_MATH_INT64_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SA/SALVA +PERL_MATH_INT64_LICENSE = Artistic or GPL-1.0+ +PERL_MATH_INT64_LICENSE_FILES = COPYING +PERL_MATH_INT64_DISTNAME = Math-Int64 + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.hash b/buildroot/package/perl-mojolicious/perl-mojolicious.hash index 65a3b641a..a94c57abc 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.hash +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7033bd9404776d92b48c0f86b81a0983 Mojolicious-8.63.tar.gz -sha256 c62cc22d8a43982f6f81d47da6875f77ba6fbaa56760251857be4d13390085db Mojolicious-8.63.tar.gz +md5 f93e56c64cad7002bd7bc1f8091ed05b Mojolicious-8.71.tar.gz +sha256 155bfdcd1d49f4f10be71ec8eeb93de1873b9ab810f3d6d521d3ec10f0ef6e0d Mojolicious-8.71.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.mk b/buildroot/package/perl-mojolicious/perl-mojolicious.mk index 049783ff3..eed097d90 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.mk +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 8.63 +PERL_MOJOLICIOUS_VERSION = 8.71 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 diff --git a/buildroot/package/perl-moo/Config.in b/buildroot/package/perl-moo/Config.in index e4a6db290..9b2b4a8ca 100644 --- a/buildroot/package/perl-moo/Config.in +++ b/buildroot/package/perl-moo/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PERL_MOO bool "perl-moo" select BR2_PACKAGE_PERL_CLASS_METHOD_MODIFIERS # runtime - select BR2_PACKAGE_PERL_MODULE_RUNTIME # runtime select BR2_PACKAGE_PERL_ROLE_TINY # runtime select BR2_PACKAGE_PERL_SUB_QUOTE # runtime help diff --git a/buildroot/package/perl-moo/perl-moo.hash b/buildroot/package/perl-moo/perl-moo.hash index 00e8117ad..af0dd2e92 100644 --- a/buildroot/package/perl-moo/perl-moo.hash +++ b/buildroot/package/perl-moo/perl-moo.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e542104553d616b15631b5c66ccee904 Moo-2.004000.tar.gz -sha256 323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834 Moo-2.004000.tar.gz +md5 51f3732e043a1e856ab6cdc260d2814c Moo-2.004004.tar.gz +sha256 714b77b115788708c6d8ab6f18eea173f8109d397aecd34e32cc71a0ffcf2246 Moo-2.004004.tar.gz # computed by scancpan sha256 0f2d6b537f7a735c981511875d832bc8ff767bf97d62848cf0bada964e40aadd LICENSE diff --git a/buildroot/package/perl-moo/perl-moo.mk b/buildroot/package/perl-moo/perl-moo.mk index fce88f6ad..77c6c1e35 100644 --- a/buildroot/package/perl-moo/perl-moo.mk +++ b/buildroot/package/perl-moo/perl-moo.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOO_VERSION = 2.004000 +PERL_MOO_VERSION = 2.004004 PERL_MOO_SOURCE = Moo-$(PERL_MOO_VERSION).tar.gz PERL_MOO_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOO_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-net-dns/perl-net-dns.hash b/buildroot/package/perl-net-dns/perl-net-dns.hash index dfedb0a95..da09e91b0 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.hash +++ b/buildroot/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 204e08e5c8042ce0e7d7f0851af46d50 Net-DNS-1.27.tar.gz -sha256 f336277710f3672095b23efe0735d8093fc493070944c57c4ec39191a52abd41 Net-DNS-1.27.tar.gz +md5 2c9120830a68f18deb43a95826ea6372 Net-DNS-1.29.tar.gz +sha256 852d6ee87e8f0d014223026581cbb56924ba8cddd3ceb29c6191dbb6122d43c5 Net-DNS-1.29.tar.gz # computed by scancpan -sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README +sha256 e4f3224d86bd79ac3d11ea513fcb83c68c20701346653699225331e2b7a2d447 README diff --git a/buildroot/package/perl-net-dns/perl-net-dns.mk b/buildroot/package/perl-net-dns/perl-net-dns.mk index 3d9ee3a2f..f5e8328a1 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.mk +++ b/buildroot/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.27 +PERL_NET_DNS_VERSION = 1.29 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT diff --git a/buildroot/package/perl-net-http/perl-net-http.hash b/buildroot/package/perl-net-http/perl-net-http.hash index 5c93ad117..42ae6bd97 100644 --- a/buildroot/package/perl-net-http/perl-net-http.hash +++ b/buildroot/package/perl-net-http/perl-net-http.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6cbebcc76099ce822f0aa7764af11f73 Net-HTTP-6.19.tar.gz -sha256 52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4 Net-HTTP-6.19.tar.gz +md5 00f825fb848d50202aeec074c3608453 Net-HTTP-6.20.tar.gz +sha256 92527b2a24512961b8e3637c6216a057751e39b6fa751422ed181ff599779f1e Net-HTTP-6.20.tar.gz # computed by scancpan -sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE +sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE diff --git a/buildroot/package/perl-net-http/perl-net-http.mk b/buildroot/package/perl-net-http/perl-net-http.mk index c7d0e3d0a..f8da63100 100644 --- a/buildroot/package/perl-net-http/perl-net-http.mk +++ b/buildroot/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.19 +PERL_NET_HTTP_VERSION = 6.20 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-package-stash/perl-package-stash.hash b/buildroot/package/perl-package-stash/perl-package-stash.hash index be8760d2d..0bbac515e 100644 --- a/buildroot/package/perl-package-stash/perl-package-stash.hash +++ b/buildroot/package/perl-package-stash/perl-package-stash.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 dc2d802eea2cb0b52ed9c4dd178761dd Package-Stash-0.38.tar.gz -sha256 c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f Package-Stash-0.38.tar.gz +md5 287d80c9115c9230912aca684f8ca92e Package-Stash-0.39.tar.gz +sha256 9165f555112e080493ce0e9129de0886da30b2593fb353a2abd1c76b2d2621b5 Package-Stash-0.39.tar.gz # computed by scancpan -sha256 13aab710649bae5a8bbb1ae725587ece773bf390537dba2da71247bd937d54b4 LICENSE +sha256 810b319a6f4a53c9cbbef513da17b2f0c872accd149bb889f153f4b78cf8cbb8 LICENSE diff --git a/buildroot/package/perl-package-stash/perl-package-stash.mk b/buildroot/package/perl-package-stash/perl-package-stash.mk index b1a83bd95..bc116abca 100644 --- a/buildroot/package/perl-package-stash/perl-package-stash.mk +++ b/buildroot/package/perl-package-stash/perl-package-stash.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PACKAGE_STASH_VERSION = 0.38 +PERL_PACKAGE_STASH_VERSION = 0.39 PERL_PACKAGE_STASH_SOURCE = Package-Stash-$(PERL_PACKAGE_STASH_VERSION).tar.gz PERL_PACKAGE_STASH_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_PACKAGE_STASH_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-params-util/perl-params-util.hash b/buildroot/package/perl-params-util/perl-params-util.hash index d43b8baff..b0461372b 100644 --- a/buildroot/package/perl-params-util/perl-params-util.hash +++ b/buildroot/package/perl-params-util/perl-params-util.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eaf000a27bbd21abfd55f83473ab79fd Params-Util-1.101.tar.gz -sha256 97f391bc092b9c911e4536d103afd48058eb1f8a53d729af7adb65430eb338b7 Params-Util-1.101.tar.gz +md5 f1aa70ba570f03f14cd394096b9c6883 Params-Util-1.102.tar.gz +sha256 499bb1b482db24fda277a51525596ad092c2bd51dd508fa8fec2e9f849097402 Params-Util-1.102.tar.gz # computed by scancpan sha256 08c2ed7589aff3b2076b48b792078d3479c2295559ee7bc4615e93abe0473939 ARTISTIC-1.0 diff --git a/buildroot/package/perl-params-util/perl-params-util.mk b/buildroot/package/perl-params-util/perl-params-util.mk index 1a48a46fe..8c2a960c4 100644 --- a/buildroot/package/perl-params-util/perl-params-util.mk +++ b/buildroot/package/perl-params-util/perl-params-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PARAMS_UTIL_VERSION = 1.101 +PERL_PARAMS_UTIL_VERSION = 1.102 PERL_PARAMS_UTIL_SOURCE = Params-Util-$(PERL_PARAMS_UTIL_VERSION).tar.gz PERL_PARAMS_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK PERL_PARAMS_UTIL_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-plack/perl-plack.hash b/buildroot/package/perl-plack/perl-plack.hash index 7324b726a..c763d2c17 100644 --- a/buildroot/package/perl-plack/perl-plack.hash +++ b/buildroot/package/perl-plack/perl-plack.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9d37086aec1b29bab52a9575687e3557 Plack-1.0047.tar.gz -sha256 322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561 Plack-1.0047.tar.gz +md5 36282b473b4521219c44a9db437b650f Plack-1.0048.tar.gz +sha256 30f5f25e19b437859156a2526f61ca9ab708d50d5730c279189403aabfe542a6 Plack-1.0048.tar.gz # computed by scancpan -sha256 fb67655b5d1adedef83aed2c79bf4f89c68d8595a7060815520173f663a3631d LICENSE +sha256 fb67655b5d1adedef83aed2c79bf4f89c68d8595a7060815520173f663a3631d LICENSE diff --git a/buildroot/package/perl-plack/perl-plack.mk b/buildroot/package/perl-plack/perl-plack.mk index cccf5a622..b95f204d2 100644 --- a/buildroot/package/perl-plack/perl-plack.mk +++ b/buildroot/package/perl-plack/perl-plack.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PLACK_VERSION = 1.0047 +PERL_PLACK_VERSION = 1.0048 PERL_PLACK_SOURCE = Plack-$(PERL_PLACK_VERSION).tar.gz PERL_PLACK_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIYAGAWA PERL_PLACK_DEPENDENCIES = host-perl-file-sharedir-install diff --git a/buildroot/package/perl-role-tiny/perl-role-tiny.hash b/buildroot/package/perl-role-tiny/perl-role-tiny.hash index c05873e65..9de786800 100644 --- a/buildroot/package/perl-role-tiny/perl-role-tiny.hash +++ b/buildroot/package/perl-role-tiny/perl-role-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 98446826608b1e943e65c1f6e35942fe Role-Tiny-2.001004.tar.gz -sha256 92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687 Role-Tiny-2.001004.tar.gz +md5 065e459cdc3c6e163c6e8359baf69f45 Role-Tiny-2.002003.tar.gz +sha256 6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89 Role-Tiny-2.002003.tar.gz # computed by scancpan -sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE +sha256 a8a1595c2347f7d10e896809d4f3dea85ccc10ac5644b8073111233cd120b14a LICENSE diff --git a/buildroot/package/perl-role-tiny/perl-role-tiny.mk b/buildroot/package/perl-role-tiny/perl-role-tiny.mk index 0e1974fa1..5a6477f94 100644 --- a/buildroot/package/perl-role-tiny/perl-role-tiny.mk +++ b/buildroot/package/perl-role-tiny/perl-role-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_ROLE_TINY_VERSION = 2.001004 +PERL_ROLE_TINY_VERSION = 2.002003 PERL_ROLE_TINY_SOURCE = Role-Tiny-$(PERL_ROLE_TINY_VERSION).tar.gz PERL_ROLE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_ROLE_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-type-tiny/Config.in b/buildroot/package/perl-type-tiny/Config.in index 96e5ea135..5ee3db6f9 100644 --- a/buildroot/package/perl-type-tiny/Config.in +++ b/buildroot/package/perl-type-tiny/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_TYPE_TINY help tiny, yet Moo(se)-compatible type constraint. - http://typetiny.toby.ink/ + https://typetiny.toby.ink/ diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.hash b/buildroot/package/perl-type-tiny/perl-type-tiny.hash index 85e312c6f..2e2726e38 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.hash +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b56b6d578843f509100f49b6ffddc21e Type-Tiny-1.010006.tar.gz -sha256 f1568e3f0bf103e65faadc1804c6184fe29bf52559e7ff3c12f4dad437befd82 Type-Tiny-1.010006.tar.gz +md5 7feab0f3f99810290a3fdea8dbf24d7b Type-Tiny-1.012001.tar.gz +sha256 f907e5ad880fcc42fddb7e0de53c59429282abcbb3afb1a8651bf5ec6c42954d Type-Tiny-1.012001.tar.gz # computed by scancpan -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 34427749499bd6d6e5d206089bc03d76c647a1350f8b5f95ea628d2b6ff56e4c LICENSE diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.mk b/buildroot/package/perl-type-tiny/perl-type-tiny.mk index 3fa119a8c..2a475e53d 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.mk +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TYPE_TINY_VERSION = 1.010006 +PERL_TYPE_TINY_VERSION = 1.012001 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-uri/perl-uri.hash b/buildroot/package/perl-uri/perl-uri.hash index 39f2f4765..c6cb7971f 100644 --- a/buildroot/package/perl-uri/perl-uri.hash +++ b/buildroot/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 978454ba823a6908bad1c3c1804945d3 URI-5.05.tar.gz -sha256 a5c113d2d02706d9fbdca6a86f290c5b05b2f86836d4e7fe1447f063261b79ec URI-5.05.tar.gz +md5 3dd176c522e9d39d88bcf1221fcd7ab2 URI-5.06.tar.gz +sha256 68555c576763769be43340459b9db7e159378edcd7db6d7518e16efdabdeb0c1 URI-5.06.tar.gz # computed by scancpan sha256 65cd6f88516a30f56fd4e0080fb78ea69424fc89067470dc994e4abfba08664e LICENSE diff --git a/buildroot/package/perl-uri/perl-uri.mk b/buildroot/package/perl-uri/perl-uri.mk index 1a4886590..6eccb1b9b 100644 --- a/buildroot/package/perl-uri/perl-uri.mk +++ b/buildroot/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.05 +PERL_URI_VERSION = 5.06 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch deleted file mode 100644 index ae1ce0699..000000000 --- a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 30ae4c9e2ac6cd27138ebf124cbda9232c56bdf7 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Tue, 16 Oct 2018 21:20:12 +0200 -Subject: [PATCH] fix the generated subdirectory Makefiles - -all variables used by BR must be propagated - -similar to https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/commit/98e8532fffe5afa8186329acc44fb957427f1823 - -see https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/331, merged in EU-MM v7.35_08 - -Signed-off-by: Francois Perrad ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -index d579256e86..48642e98fa 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm -@@ -702,7 +702,7 @@ END - } - if ($self->{PARENT}) { - $self->{PARENT}->{CHILDREN}->{$newclass} = $self; -- foreach my $opt (qw(POLLUTE PERL_CORE LINKTYPE LD OPTIMIZE)) { -+ foreach my $opt (qw(POLLUTE PERL_CORE LINKTYPE AR FULL_AR CC CCFLAGS OPTIMIZE LD LDDLFLAGS LDFLAGS PERL_ARCHLIB DESTDIR )) { - if (exists $self->{PARENT}->{$opt} - and not exists $self->{$opt}) - { --- -2.17.1 - diff --git a/buildroot/package/perl/Config.in b/buildroot/package/perl/Config.in index 32a3fd2ee..0ead1c4a4 100644 --- a/buildroot/package/perl/Config.in +++ b/buildroot/package/perl/Config.in @@ -24,4 +24,14 @@ config BR2_PACKAGE_PERL_MODULES Leave empty for all modules (as far as the external libraries are available). +config BR2_PACKAGE_PERL_THREADS + bool "thread support" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Enable use of threads in Perl scripts + + WARNING: The use of interpreter-based threads in Perl + is officially discouraged. + See https://perldoc.perl.org/threads.html#WARNING + endif diff --git a/buildroot/package/perl/perl.hash b/buildroot/package/perl/perl.hash index ba3a39d43..42b7cc66c 100644 --- a/buildroot/package/perl/perl.hash +++ b/buildroot/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: http://www.cpan.org/src/5.0/perl-5.30.3.tar.xz.{md5,sha1,sha256}.txt -md5 0af2ab0f01ec13e37cc13a27de930936 perl-5.30.3.tar.xz -sha1 1003c6aa71d8966501038178459a9fa4e9aba747 perl-5.30.3.tar.xz -sha256 6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 perl-5.30.3.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz.{md5,sha1,sha256}.txt +md5 7f104064b906ad8c7329ca5e409a32d7 perl-5.32.1.tar.xz +sha1 1fb4f710d139da1e1a3e1fa4eaba201fcaa8e18e perl-5.32.1.tar.xz +sha256 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 perl-5.32.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.hash -sha256 755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba perl-cross-1.3.4.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.hash +sha256 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25 perl-cross-1.3.5.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 4916e95d32b84e07c045d839646f74996f577e5f497bbba8177a94b31415cee7 README +sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk index 2f82e1d6d..ec1cfd4d0 100644 --- a/buildroot/package/perl/perl.mk +++ b/buildroot/package/perl/perl.mk @@ -5,15 +5,15 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 30 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3 -PERL_SITE = http://www.cpan.org/src/5.0 +PERL_VERSION_MAJOR = 32 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.4 +PERL_CROSS_VERSION = 1.3.5 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz @@ -62,6 +62,10 @@ ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1) PERL_CONF_OPTS += -Dusedevel endif +ifeq ($(BR2_PACKAGE_PERL_THREADS),y) +PERL_CONF_OPTS += -Dusethreads +endif + ifeq ($(BR2_STATIC_LIBS),y) PERL_CONF_OPTS += --all-static --no-dynaloader endif diff --git a/buildroot/package/phidgetwebservice/Config.in b/buildroot/package/phidgetwebservice/Config.in index 50018e0af..b052f180f 100644 --- a/buildroot/package/phidgetwebservice/Config.in +++ b/buildroot/package/phidgetwebservice/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE bool "phidgetwebservice" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb, libphidget + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libphidget -> libusb depends on !BR2_STATIC_LIBS # libphidget select BR2_PACKAGE_LIBPHIDGET help @@ -17,6 +18,6 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE http://phidgets.com/ -comment "phidgetwebservice needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS +comment "phidgetwebservice needs a toolchain w/ threads, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 46c589661..d60164d96 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 php-7.4.14.tar.xz +sha256 9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8 php-7.4.15.tar.xz # License file sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index fa518c301..5ae2467a7 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.14 +PHP_VERSION = 7.4.15 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -13,6 +13,7 @@ PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install PHP_DEPENDENCIES = host-pkgconf pcre2 PHP_LICENSE = PHP-3.01 PHP_LICENSE_FILES = LICENSE +PHP_CPE_ID_VENDOR = php PHP_CONF_OPTS = \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ diff --git a/buildroot/package/piglit/piglit.hash b/buildroot/package/piglit/piglit.hash index 1a0011850..923569a6f 100644 --- a/buildroot/package/piglit/piglit.hash +++ b/buildroot/package/piglit/piglit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0d42dc46295a6b3ecfeb379887bd78128ce7938242ae56d58d5e9b3dea8c98b6 piglit-2affee53f3ad7a96f5b397a2b6d6408af8a374b0.tar.gz +sha256 ec2a80c49f10761980334f1591be54ee6f365165d7ac637270b4ca15a12ad674 piglit-2affee53f3ad7a96f5b397a2b6d6408af8a374b0-br1.tar.gz sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 diff --git a/buildroot/package/pigz/pigz.hash b/buildroot/package/pigz/pigz.hash index ec75b4e53..512bf785c 100644 --- a/buildroot/package/pigz/pigz.hash +++ b/buildroot/package/pigz/pigz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52 pigz-2.4.tar.gz -sha256 dc8f78258cdb4478b5922f4c00eb63d3cbac06c171dc829648fd414bb0cf4493 README +sha256 577673676cd5c7219f94b236075451220bae3e1ca451cf849947a2998fbf5820 pigz-2.6.tar.gz +sha256 830b3e1b05cc20f443d89d7d8703a3c63fd64c57ab716f5e81fd178517df1e11 README diff --git a/buildroot/package/pigz/pigz.mk b/buildroot/package/pigz/pigz.mk index 23df0f5fc..fdf5fa40e 100644 --- a/buildroot/package/pigz/pigz.mk +++ b/buildroot/package/pigz/pigz.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGZ_VERSION = 2.4 +PIGZ_VERSION = 2.6 PIGZ_SITE = $(call github,madler,pigz,v$(PIGZ_VERSION)) PIGZ_DEPENDENCIES = zlib HOST_PIGZ_DEPENDENCIES = host-zlib diff --git a/buildroot/package/pinentry/Config.in b/buildroot/package/pinentry/Config.in index 586ffea29..684e4eed4 100644 --- a/buildroot/package/pinentry/Config.in +++ b/buildroot/package/pinentry/Config.in @@ -15,6 +15,17 @@ menuconfig BR2_PACKAGE_PINENTRY if BR2_PACKAGE_PINENTRY +config BR2_PACKAGE_PINENTRY_EFL + bool "pinentry-efl" + depends on BR2_PACKAGE_EFL + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_EFL_X_XLIB + help + The pinentry-efl tool + +comment "pinentry-efl needs efl and X" + depends on !BR2_PACKAGE_EFL || !BR2_PACKAGE_XORG7 + config BR2_PACKAGE_PINENTRY_FLTK bool "pinentry-fltk" depends on BR2_USE_MMU # fltk diff --git a/buildroot/package/pinentry/pinentry.hash b/buildroot/package/pinentry/pinentry.hash index c9610d6eb..e5f3d9065 100644 --- a/buildroot/package/pinentry/pinentry.hash +++ b/buildroot/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0 pinentry-1.1.0.tar.bz2 +sha1 b8b88cab4fd844e3616d55aeba8f084f2b98fb0f pinentry-1.1.1.tar.bz2 # Locally computed -sha256 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 pinentry-1.1.0.tar.bz2 -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f pinentry-1.1.1.tar.bz2 +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/pinentry/pinentry.mk b/buildroot/package/pinentry/pinentry.mk index 1bc1adab1..8ebd35cfa 100644 --- a/buildroot/package/pinentry/pinentry.mk +++ b/buildroot/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.1.0 +PINENTRY_VERSION = 1.1.1 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ @@ -22,13 +22,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PINENTRY_CONF_ENV += LIBS=-latomic endif -# build with X if available -ifeq ($(BR2_PACKAGE_XORG7),y) -PINENTRY_CONF_OPTS += --with-x -else -PINENTRY_CONF_OPTS += --without-x -endif - ifeq ($(BR2_PACKAGE_LIBSECRET),y) PINENTRY_CONF_OPTS += --enable-libsecret PINENTRY_DEPENDENCIES += libsecret @@ -36,6 +29,14 @@ else PINENTRY_CONF_OPTS += --disable-libsecret endif +# pinentry-efl backend +ifeq ($(BR2_PACKAGE_PINENTRY_EFL),y) +PINENTRY_CONF_OPTS += --enable-pinentry-efl +PINENTRY_DEPENDENCIES += efl +else +PINENTRY_CONF_OPTS += --disable-pinentry-efl +endif + # pinentry-fltk backend ifeq ($(BR2_PACKAGE_PINENTRY_FLTK),y) PINENTRY_CONF_ENV += ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config diff --git a/buildroot/package/pixman/pixman.mk b/buildroot/package/pixman/pixman.mk index a446ebca4..d99005ecb 100644 --- a/buildroot/package/pixman/pixman.mk +++ b/buildroot/package/pixman/pixman.mk @@ -9,6 +9,7 @@ PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT PIXMAN_LICENSE_FILES = COPYING +PIXMAN_CPE_ID_VENDOR = pixman PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/pixz/0001-fix-linkage.patch b/buildroot/package/pixz/0001-fix-linkage.patch deleted file mode 100644 index 712c280ec..000000000 --- a/buildroot/package/pixz/0001-fix-linkage.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f385e7be8adb620ca7eb89f84abe4d1df94c1029 Mon Sep 17 00:00:00 2001 -From: Dave Vasilevsky -Date: Sat, 25 Apr 2020 19:16:05 -0400 -Subject: [PATCH] fix linkage - -[Retrieved from: -https://github.com/vasi/pixz/commit/f385e7be8adb620ca7eb89f84abe4d1df94c1029] -Signed-off-by: Fabrice Fontaine ---- - src/common.c | 2 +- - src/pixz.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/common.c b/src/common.c -index 59d3273..5938633 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -7,7 +7,7 @@ - - #pragma mark UTILS - --FILE *gInFile = NULL; -+FILE *gInFile = NULL, *gOutFile = NULL; - lzma_stream gStream = LZMA_STREAM_INIT; - - -diff --git a/src/pixz.h b/src/pixz.h -index 0fa60f2..0939a9a 100644 ---- a/src/pixz.h -+++ b/src/pixz.h -@@ -54,8 +54,8 @@ void pixz_read(bool verify, size_t nspecs, char **specs); - - #pragma mark UTILS - --FILE *gInFile, *gOutFile; --lzma_stream gStream; -+extern FILE *gInFile, *gOutFile; -+extern lzma_stream gStream; - - extern lzma_index *gIndex; - diff --git a/buildroot/package/pixz/pixz.hash b/buildroot/package/pixz/pixz.hash index 5491a016d..9e2a211cd 100644 --- a/buildroot/package/pixz/pixz.hash +++ b/buildroot/package/pixz/pixz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 pixz-1.0.6.tar.xz +sha256 e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5 pixz-1.0.7.tar.xz sha256 d036806b4d1efee7c6d86276451c4d833e9798751417e25daae62dfbe348641b LICENSE diff --git a/buildroot/package/pixz/pixz.mk b/buildroot/package/pixz/pixz.mk index 8d80f7861..680c05c32 100644 --- a/buildroot/package/pixz/pixz.mk +++ b/buildroot/package/pixz/pixz.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXZ_VERSION = 1.0.6 +PIXZ_VERSION = 1.0.7 PIXZ_SITE = https://github.com/vasi/pixz/releases/download/v$(PIXZ_VERSION) PIXZ_SOURCE = pixz-$(PIXZ_VERSION).tar.xz PIXZ_DEPENDENCIES = host-pkgconf libarchive xz diff --git a/buildroot/package/pkg-download.mk b/buildroot/package/pkg-download.mk index 951d2fb55..c0fb81020 100644 --- a/buildroot/package/pkg-download.mk +++ b/buildroot/package/pkg-download.mk @@ -17,6 +17,11 @@ export HG := $(call qstrip,$(BR2_HG)) export SCP := $(call qstrip,$(BR2_SCP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) +# Version of the format of the archives we generate in the corresponding +# download backend: +BR_FMT_VERSION_git = -br1 +BR_FMT_VERSION_svn = -br1 + DL_WRAPPER = support/download/dl-wrapper # DL_DIR may have been set already from the environment @@ -99,7 +104,8 @@ endif define DOWNLOAD $(Q)mkdir -p $($(2)_DL_DIR) - $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) $($(2)_DL_ENV) \ + flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(2)_DL_VERSION)' \ -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ diff --git a/buildroot/package/pkg-generic.mk b/buildroot/package/pkg-generic.mk index 021658d63..9fbc63d19 100644 --- a/buildroot/package/pkg-generic.mk +++ b/buildroot/package/pkg-generic.mk @@ -518,7 +518,7 @@ ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $$($(3)_SOURCE) else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_BASENAME_RAW).tar.gz + $(2)_SOURCE ?= $$($(2)_BASENAME_RAW)$$(call pkg_source_ext,$(2)) endif endif @@ -614,6 +614,76 @@ $(2)_REDISTRIBUTE ?= YES $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW) +# If any of the _CPE_ID_* variables are set, we assume the CPE ID +# information is valid for this package. +ifneq ($$($(2)_CPE_ID_VENDOR)$$($(2)_CPE_ID_PRODUCT)$$($(2)_CPE_ID_VERSION)$$($(2)_CPE_ID_UPDATE)$$($(2)_CPE_ID_PREFIX),) +$(2)_CPE_ID_VALID = YES +endif + +# When we're a host package, make sure to use the variables of the +# corresponding target package, if any. +ifneq ($$($(3)_CPE_ID_VENDOR)$$($(3)_CPE_ID_PRODUCT)$$($(3)_CPE_ID_VERSION)$$($(3)_CPE_ID_UPDATE)$$($(3)_CPE_ID_PREFIX),) +$(2)_CPE_ID_VALID = YES +endif + +# If the CPE ID is valid for the target package so it is for the host +# package +ifndef $(2)_CPE_ID_VALID + ifdef $(3)_CPE_ID_VALID + $(2)_CPE_ID_VALID = $$($(3)_CPE_ID_VALID) + endif +endif + +ifeq ($$($(2)_CPE_ID_VALID),YES) + # CPE_ID_VENDOR + ifndef $(2)_CPE_ID_VENDOR + ifdef $(3)_CPE_ID_VENDOR + $(2)_CPE_ID_VENDOR = $$($(3)_CPE_ID_VENDOR) + else + $(2)_CPE_ID_VENDOR = $$($(2)_RAWNAME)_project + endif + endif + + # CPE_ID_PRODUCT + ifndef $(2)_CPE_ID_PRODUCT + ifdef $(3)_CPE_ID_PRODUCT + $(2)_CPE_ID_PRODUCT = $$($(3)_CPE_ID_PRODUCT) + else + $(2)_CPE_ID_PRODUCT = $$($(2)_RAWNAME) + endif + endif + + # CPE_ID_VERSION + ifndef $(2)_CPE_ID_VERSION + ifdef $(3)_CPE_ID_VERSION + $(2)_CPE_ID_VERSION = $$($(3)_CPE_ID_VERSION) + else + $(2)_CPE_ID_VERSION = $$($(2)_VERSION) + endif + endif + + # CPE_ID_UPDATE + ifndef $(2)_CPE_ID_UPDATE + ifdef $(3)_CPE_ID_UPDATE + $(2)_CPE_ID_UPDATE = $$($(3)_CPE_ID_UPDATE) + else + $(2)_CPE_ID_UPDATE = * + endif + endif + + # CPE_ID_PREFIX + ifndef $(2)_CPE_ID_PREFIX + ifdef $(3)_CPE_ID_PREFIX + $(2)_CPE_ID_PREFIX = $$($(3)_CPE_ID_PREFIX) + else + $(2)_CPE_ID_PREFIX = cpe:2.3:a + endif + endif + + # Calculate complete CPE ID + $(2)_CPE_ID = $$($(2)_CPE_ID_PREFIX):$$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_PRODUCT):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_UPDATE):*:*:*:*:*:* +endif # ifeq ($$($(2)_CPE_ID_VALID),YES) + # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular # dependency. diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk index de0e6e8ea..aafb441fa 100644 --- a/buildroot/package/pkg-meson.mk +++ b/buildroot/package/pkg-meson.mk @@ -82,8 +82,8 @@ define $(2)_CONFIGURE_CMDS package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ - CC_FOR_BUILD="$(HOSTCC)" \ - CXX_FOR_BUILD="$(HOSTCC)" \ + CC_FOR_BUILD="$$(HOSTCC)" \ + CXX_FOR_BUILD="$$(HOSTCC)" \ $$($$(PKG)_CONF_ENV) \ $$(MESON) \ --prefix=/usr \ diff --git a/buildroot/package/pkg-qmake.mk b/buildroot/package/pkg-qmake.mk index 27727119d..a77286fe3 100644 --- a/buildroot/package/pkg-qmake.mk +++ b/buildroot/package/pkg-qmake.mk @@ -20,6 +20,13 @@ # ################################################################################ +# +# Hook to sync Qt headers +# +define QT_HEADERS_SYNC_HOOK + $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) +endef + ################################################################################ # inner-qmake-package -- defines how the configuration, compilation and # installation of a qmake package should be done, implements a few hooks @@ -44,6 +51,11 @@ ifneq ($(1),qt5base) $(2)_DEPENDENCIES += qt5base endif +ifeq ($$($(2)_SYNC_QT_HEADERS),YES) +$(2)_DEPENDENCIES += host-perl +$(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK +endif + # # Configure step. Only define it if not already defined by the package # .mk file. diff --git a/buildroot/package/pkg-utils.mk b/buildroot/package/pkg-utils.mk index 4fcb076e2..d0fcdd4e1 100644 --- a/buildroot/package/pkg-utils.mk +++ b/buildroot/package/pkg-utils.mk @@ -40,6 +40,11 @@ KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) pkgname = $(lastword $(subst /, ,$(pkgdir))) +# Helper to build the extension for a package archive, based on various +# conditions. +# $(1): upper-case package name +pkg_source_ext = $(BR_FMT_VERSION_$($(1)_SITE_METHOD)).tar.gz + # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) INFLATE.gz = $(ZCAT) @@ -91,6 +96,7 @@ endef # $(1): upper-case package or filesystem name define json-info "$($(1)_NAME)": { + "name": "$($(1)_RAWNAME)", "type": "$($(1)_TYPE)", $(if $(filter rootfs,$($(1)_TYPE)), \ $(call _json-info-fs,$(1)), \ @@ -119,6 +125,9 @@ define _json-info-pkg "reverse_dependencies": [ $(call make-comma-list,$(sort $($(1)_RDEPENDENCIES))) ] + $(if $($(1)_CPE_ID_VALID), \ + $(comma) "cpe-id": "$($(1)_CPE_ID)" \ + ) $(if $($(1)_IGNORE_CVES), $(comma) "ignore_cves": [ $(call make-comma-list,$(sort $($(1)_IGNORE_CVES))) @@ -158,8 +167,9 @@ endef clean-json = $(strip \ $(subst $(comma)},}, $(subst $(comma)$(space)},$(space)}, \ $(subst $(comma)],], $(subst $(comma)$(space)],$(space)], \ + $(subst \,\\, \ $(strip $(1)) \ - )))) \ + ))))) \ ) ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) diff --git a/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch index a7811752d..a039d0c1b 100644 --- a/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +++ b/buildroot/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -30,7 +30,7 @@ diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c index 8523709..7cd2fff 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c -@@ -160,6 +160,21 @@ dequote(const char *value) +@@ -161,6 +161,21 @@ dequote(const char *value) return buf; } @@ -52,7 +52,7 @@ index 8523709..7cd2fff 100644 /* * !doc * -@@ -180,6 +192,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch +@@ -181,6 +193,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch { char *dequote_value; pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1); @@ -61,7 +61,7 @@ index 8523709..7cd2fff 100644 pkgconf_tuple_find_delete(list, key); -@@ -187,9 +201,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch +@@ -188,9 +202,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, dequote_value, parse); @@ -76,7 +76,7 @@ index 8523709..7cd2fff 100644 else tuple->value = strdup(dequote_value); -@@ -233,27 +251,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c +@@ -234,27 +252,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c return NULL; } @@ -107,7 +107,7 @@ index 8523709..7cd2fff 100644 bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++) -@@ -293,7 +298,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -294,7 +299,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const if (kv != NULL) { @@ -116,7 +116,7 @@ index 8523709..7cd2fff 100644 strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf)); bptr += strlen(parsekv); -@@ -338,6 +343,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -339,6 +344,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const return strdup(buf); } diff --git a/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch b/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch index e79bea93a..f659a3b07 100644 --- a/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch +++ b/buildroot/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch @@ -19,7 +19,7 @@ diff --git a/cli/main.c b/cli/main.c index b52cc85..c5acc10 100644 --- a/cli/main.c +++ b/cli/main.c -@@ -955,18 +955,8 @@ main(int argc, char *argv[]) +@@ -1002,18 +1002,8 @@ main(int argc, char *argv[]) if ((want_flags & PKG_VERSION) == PKG_VERSION) { diff --git a/buildroot/package/pkgconf/pkgconf.hash b/buildroot/package/pkgconf/pkgconf.hash index 45848af94..f210869c0 100644 --- a/buildroot/package/pkgconf/pkgconf.hash +++ b/buildroot/package/pkgconf/pkgconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c pkgconf-1.6.1.tar.xz -sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING +sha256 61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210 pkgconf-1.6.3.tar.xz +sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING diff --git a/buildroot/package/pkgconf/pkgconf.mk b/buildroot/package/pkgconf/pkgconf.mk index 1851ecfca..3d51258d6 100644 --- a/buildroot/package/pkgconf/pkgconf.mk +++ b/buildroot/package/pkgconf/pkgconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.6.1 +PKGCONF_VERSION = 1.6.3 PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license diff --git a/buildroot/package/ply/0001-configure.ac-fix-error-with-version-string.patch b/buildroot/package/ply/0001-configure.ac-fix-error-with-version-string.patch new file mode 100644 index 000000000..e80599c64 --- /dev/null +++ b/buildroot/package/ply/0001-configure.ac-fix-error-with-version-string.patch @@ -0,0 +1,29 @@ +From 684bae6043fa2242a5c6551c3f260c9db0cf7dc8 Mon Sep 17 00:00:00 2001 +From: Andreas Klinger +Date: Mon, 4 Jan 2021 08:40:50 +0100 +Subject: [PATCH] configure.ac: fix error with version string + +When autoreconfiguring there's an error: "configure.ac:6: error: AC_INIT +should be called with package and version arguments". + +Put version string in square brackets to satisfy autoconfigure. + +Signed-off-by: Andreas Klinger +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 65387d6..7a0054e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_PREREQ(2.61) +-AC_INIT(ply, m4_esyscmd_s(git describe --always --dirty), ++AC_INIT(ply, [2.1.1], + https://github.com/wkz/ply/issues) + + AC_GNU_SOURCE +-- +2.20.1 + diff --git a/buildroot/package/ply/0002-printxf.h-add-stdarg.h-in-include.patch b/buildroot/package/ply/0002-printxf.h-add-stdarg.h-in-include.patch new file mode 100644 index 000000000..f56e9a8e7 --- /dev/null +++ b/buildroot/package/ply/0002-printxf.h-add-stdarg.h-in-include.patch @@ -0,0 +1,27 @@ +From 3fb3cb779c535ec28cbba80573bbea42435108c0 Mon Sep 17 00:00:00 2001 +From: Andreas Klinger +Date: Mon, 4 Jan 2021 20:48:41 +0100 +Subject: [PATCH] printxf.h: add stdarg.h in include + +Include of is needed for va_list. + +Signed-off-by: Andreas Klinger +--- + include/ply/printxf.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/ply/printxf.h b/include/ply/printxf.h +index a59f0d2..e985936 100644 +--- a/include/ply/printxf.h ++++ b/include/ply/printxf.h +@@ -8,6 +8,7 @@ + #define _PRINTXF_H + + #include ++#include + + struct printxf; + +-- +2.20.1 + diff --git a/buildroot/package/ply/Config.in b/buildroot/package/ply/Config.in new file mode 100644 index 000000000..0500e7883 --- /dev/null +++ b/buildroot/package/ply/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_PLY_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_powerpc + default y if BR2_x86_64 + +comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" + depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + +config BR2_PACKAGE_PLY + bool "ply" + depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on !BR2_STATIC_LIBS + help + ply is a light-weight dynamic tracer for Linux. By means of + using the BPF it can attach probes to the linux kernel + (e. g. kprobes). + + It's a small alternative to LLVM based tracers for embedded + systems. + + When using debugfs needs to be mounted on /sys/kernel/debug. + + https://wkz.github.io/ply/ diff --git a/buildroot/package/ply/ply.hash b/buildroot/package/ply/ply.hash new file mode 100644 index 000000000..0ee2709b3 --- /dev/null +++ b/buildroot/package/ply/ply.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 cecf0913c65027750ac3272e936110c9f843435938f9ca2edbc34e99ba6c00e2 ply-2.1.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ply/ply.mk b/buildroot/package/ply/ply.mk new file mode 100644 index 000000000..b72b29f31 --- /dev/null +++ b/buildroot/package/ply/ply.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# ply +# +################################################################################ + +PLY_VERSION = 2.1.1 +PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) +PLY_AUTORECONF = YES +PLY_LICENSE = GPL-2.0 +PLY_LICENSE_FILES = COPYING +PLY_INSTALL_STAGING = YES +PLY_DEPENDENCIES = host-flex host-bison + +$(eval $(autotools-package)) diff --git a/buildroot/package/pngquant/pngquant.hash b/buildroot/package/pngquant/pngquant.hash index f67807cb8..c73321670 100644 --- a/buildroot/package/pngquant/pngquant.hash +++ b/buildroot/package/pngquant/pngquant.hash @@ -1,4 +1,4 @@ # From https://pngquant.org/releases.html -sha256 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808 pngquant-2.12.5-src.tar.gz +sha256 4b911a11aa0c35d364b608c917d13002126185c8c314ba4aa706b62fd6a95a7a pngquant-2.13.1-src.tar.gz # Locally computed -sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT +sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/buildroot/package/pngquant/pngquant.mk b/buildroot/package/pngquant/pngquant.mk index a8845c797..c5a17e872 100644 --- a/buildroot/package/pngquant/pngquant.mk +++ b/buildroot/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.12.5 +PNGQUANT_VERSION = 2.13.1 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ diff --git a/buildroot/package/policycoreutils/policycoreutils.mk b/buildroot/package/policycoreutils/policycoreutils.mk index 4c0fdc71a..0dfdc7af0 100644 --- a/buildroot/package/policycoreutils/policycoreutils.mk +++ b/buildroot/package/policycoreutils/policycoreutils.mk @@ -8,6 +8,7 @@ POLICYCOREUTILS_VERSION = 3.1 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING +POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) diff --git a/buildroot/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk index 3ae42b231..e3fad5318 100644 --- a/buildroot/package/polkit/polkit.mk +++ b/buildroot/package/polkit/polkit.mk @@ -8,6 +8,7 @@ POLKIT_VERSION = 0.116 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING +POLKIT_CPE_ID_VALID = YES POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES diff --git a/buildroot/package/popperjs/Config.in b/buildroot/package/popperjs/Config.in new file mode 100644 index 000000000..eae963100 --- /dev/null +++ b/buildroot/package/popperjs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_POPPERJS + bool "popperjs" + help + Popper.js, a JavaScript Tooltip & Popover Positioning Engine. + + https://popper.js.org diff --git a/buildroot/package/popperjs/popperjs.hash b/buildroot/package/popperjs/popperjs.hash new file mode 100644 index 000000000..d9cdabc32 --- /dev/null +++ b/buildroot/package/popperjs/popperjs.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 83eecef51d10826faca2cd5cabb344e0bef6d4127d7e728db9e4d8308b7b15d1 popperjs-1.16.0.tar.gz +sha256 2961310ed05cd9373a08b8191c071425a7fede0ca5d807ca38fa5f5f61c5b834 LICENSE.md diff --git a/buildroot/package/popperjs/popperjs.mk b/buildroot/package/popperjs/popperjs.mk new file mode 100644 index 000000000..c5df302eb --- /dev/null +++ b/buildroot/package/popperjs/popperjs.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# popperjs +# +################################################################################ + +POPPERJS_VERSION = 1.16.0 +POPPERJS_SITE = $(call github,popperjs,popper-core,v$(POPPERJS_VERSION)) +POPPERJS_LICENSE = MIT +POPPERJS_LICENSE_FILES = LICENSE.md + +define POPPERJS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/dist/umd/popper.min.js \ + $(TARGET_DIR)/var/www/popperjs/js/popper.min.js + $(INSTALL) -m 0644 -D $(@D)/dist/umd/popper-utils.min.js \ + $(TARGET_DIR)/var/www/popperjs/js/popper-utils.min.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk index c5e1a800f..aba8602e0 100644 --- a/buildroot/package/poppler/poppler.mk +++ b/buildroot/package/poppler/poppler.mk @@ -17,12 +17,8 @@ POPPLER_CONF_OPTS = \ -DBUILD_GTK_TESTS=OFF \ -DBUILD_QT5_TESTS=OFF \ -DBUILD_CPP_TESTS=OFF \ - -DENABLE_GOBJECT_INTROSPECTION=OFF \ -DENABLE_GTK_DOC=OFF -# cmake older than 3.10 requires this to avoid try_run() in FindThreads -POPPLER_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif @@ -38,6 +34,13 @@ else POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=none -DWITH_JPEG=OFF endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +POPPLER_DEPENDENCIES += gobject-introspection +POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON +else +POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) POPPLER_DEPENDENCIES += libpng POPPLER_CONF_OPTS += -DWITH_PNG=ON diff --git a/buildroot/package/postgresql/Config.in b/buildroot/package/postgresql/Config.in index 2f677daf5..2debdc24d 100644 --- a/buildroot/package/postgresql/Config.in +++ b/buildroot/package/postgresql/Config.in @@ -19,6 +19,15 @@ config BR2_PACKAGE_POSTGRESQL http://www.postgresql.org +if BR2_PACKAGE_POSTGRESQL + +config BR2_PACKAGE_POSTGRESQL_FULL + bool "postgresql-full" + help + Build PostgreSQL, contrib, and documentation. + +endif + comment "postgresql needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/buildroot/package/postgresql/postgresql.hash b/buildroot/package/postgresql/postgresql.hash index 64fa22071..7dfe19483 100644 --- a/buildroot/package/postgresql/postgresql.hash +++ b/buildroot/package/postgresql/postgresql.hash @@ -1,7 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v12.5/postgresql-12.5.tar.bz2.md5 -md5 f19e48090bbd59ea81826b5fd99e7e97 postgresql-12.5.tar.bz2 -# From https://ftp.postgresql.org/pub/source/v12.5/postgresql-12.5.tar.bz2.sha256 -sha256 bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95 postgresql-12.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.bz2.sha256 +sha256 5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc postgresql-13.2.tar.bz2 # License file, Locally calculated -sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT +sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/buildroot/package/postgresql/postgresql.mk b/buildroot/package/postgresql/postgresql.mk index 85b767de7..9206c6246 100644 --- a/buildroot/package/postgresql/postgresql.mk +++ b/buildroot/package/postgresql/postgresql.mk @@ -4,17 +4,16 @@ # ################################################################################ -POSTGRESQL_VERSION = 12.5 +POSTGRESQL_VERSION = 13.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL POSTGRESQL_LICENSE_FILES = COPYRIGHT +POSTGRESQL_CPE_ID_VENDOR = postgresql POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config POSTGRESQL_CONF_ENV = \ ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_snprintf_long_long_int_modifier="ll" \ - pgac_cv_snprintf_size_t_support=yes \ LIBS=$(TARGET_NLS_LIBS) POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) @@ -24,6 +23,12 @@ POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # manually, you must unset MAKELEVEL or set it to zero" POSTGRESQL_MAKE_OPTS = MAKELEVEL=0 +ifeq ($(BR2_PACKAGE_POSTGRESQL_FULL),y) +POSTGRESQL_MAKE_OPTS += world +POSTGRESQL_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-world +POSTGRESQL_INSTALL_STAGING_OPTS += DESTDIR=$(STAGING_DIR) install-world +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # PostgreSQL does not build against uClibc with locales # enabled, due to an uClibc bug, see diff --git a/buildroot/package/powerpc-utils/powerpc-utils.mk b/buildroot/package/powerpc-utils/powerpc-utils.mk index cd96435a7..2f8b7d3b9 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.mk +++ b/buildroot/package/powerpc-utils/powerpc-utils.mk @@ -10,6 +10,7 @@ POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING +POWERPC_UTILS_CPE_ID_VALID = YES POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) diff --git a/buildroot/package/pppd/pppd.mk b/buildroot/package/pppd/pppd.mk index 685666a20..08560090b 100644 --- a/buildroot/package/pppd/pppd.mk +++ b/buildroot/package/pppd/pppd.mk @@ -10,6 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c +PPPD_CPE_ID_VENDOR = samba +PPPD_CPE_ID_PRODUCT = ppp # 0001-pppd-Fix-bounds-check.patch PPPD_IGNORE_CVES += CVE-2020-8597 diff --git a/buildroot/package/prelink-cross/prelink-cross.hash b/buildroot/package/prelink-cross/prelink-cross.hash index 3ac33ac3d..5bd2c6108 100644 --- a/buildroot/package/prelink-cross/prelink-cross.hash +++ b/buildroot/package/prelink-cross/prelink-cross.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz +sha256 d7c95e81993edead813accf417f6d5b05bcc84eea9ee2d711b9505ffb4f2865b prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2-br1.tar.gz sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/buildroot/package/privoxy/privoxy.hash b/buildroot/package/privoxy/privoxy.hash index 850208dd9..00c0f33bd 100644 --- a/buildroot/package/privoxy/privoxy.hash +++ b/buildroot/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.28%20%29stable%29/ -md5 493a3a643247e6c8bc60725e9993d4ee privoxy-3.0.29-stable-src.tar.gz -sha1 59873a122729b1b03e1d202d663036d2b5fa1120 privoxy-3.0.29-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.31%20%28stable%29/ +md5 014cc371d00e84b2db34d0e2b05c77d4 privoxy-3.0.31-stable-src.tar.gz +sha1 4f0e0c36d55f72f6b33e4c645a9c5d4f40026abd privoxy-3.0.31-stable-src.tar.gz # Locally computed -sha256 25c6069efdaf577d47c257da63b03cd6d063fb790e19cc39603d82e5db72489d privoxy-3.0.29-stable-src.tar.gz +sha256 077729a3aac79222a4e8d88a650d9028d16fd4b0d6038da8f5f5e47120d004eb privoxy-3.0.31-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/privoxy/privoxy.mk b/buildroot/package/privoxy/privoxy.mk index 3cf1dc975..7f0e5bb3a 100644 --- a/buildroot/package/privoxy/privoxy.mk +++ b/buildroot/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.29 +PRIVOXY_VERSION = 3.0.31 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped @@ -12,5 +12,6 @@ PRIVOXY_AUTORECONF = YES PRIVOXY_DEPENDENCIES = pcre zlib PRIVOXY_LICENSE = GPL-2.0+ PRIVOXY_LICENSE_FILES = LICENSE +PRIVOXY_CPE_ID_VENDOR = privoxy $(eval $(autotools-package)) diff --git a/buildroot/package/proftpd/proftpd.mk b/buildroot/package/proftpd/proftpd.mk index e35e78607..7dc3f267e 100644 --- a/buildroot/package/proftpd/proftpd.mk +++ b/buildroot/package/proftpd/proftpd.mk @@ -8,6 +8,7 @@ PROFTPD_VERSION = 1.3.6e PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING +PROFTPD_CPE_ID_VENDOR = proftpd PROFTPD_CONF_ENV = \ ac_cv_func_setpgrp_void=yes \ diff --git a/buildroot/package/proj/proj.hash b/buildroot/package/proj/proj.hash index 0d59d54e2..27cbc3849 100644 --- a/buildroot/package/proj/proj.hash +++ b/buildroot/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from http://download.osgeo.org/proj/proj-7.1.1.tar.gz.md5 -md5 b7ce84943dcf2b660b11c2ef9657dad5 proj-7.1.1.tar.gz +# Fetched from http://download.osgeo.org/proj/proj-7.2.1.tar.gz.md5 +md5 befbafd25e65ddf0c26a8321d8bcdcd2 proj-7.2.1.tar.gz # Locally calculated -sha256 324e7abb5569fb5f787dadf1d4474766915c485a188cf48cf07153b99156b5f9 proj-7.1.1.tar.gz +sha256 b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14 proj-7.2.1.tar.gz sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING diff --git a/buildroot/package/proj/proj.mk b/buildroot/package/proj/proj.mk index 663db4abc..03ed9c0a2 100644 --- a/buildroot/package/proj/proj.mk +++ b/buildroot/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 7.1.1 +PROJ_VERSION = 7.2.1 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING diff --git a/buildroot/package/protobuf/protobuf.hash b/buildroot/package/protobuf/protobuf.hash index c11f54edc..001b41be9 100644 --- a/buildroot/package/protobuf/protobuf.hash +++ b/buildroot/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 f8a547dfe143a9f61fadafba47fa6573713a33cb80909307c1502e26e1102298 protobuf-cpp-3.13.0.tar.gz +sha256 50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659 protobuf-cpp-3.14.0.tar.gz diff --git a/buildroot/package/protobuf/protobuf.mk b/buildroot/package/protobuf/protobuf.mk index 5f2690603..df708819c 100644 --- a/buildroot/package/protobuf/protobuf.mk +++ b/buildroot/package/protobuf/protobuf.mk @@ -7,11 +7,12 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 3.13.0 +PROTOBUF_VERSION = 3.14.0 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE +PROTOBUF_CPE_ID_VENDOR = google # N.B. Need to use host protoc during cross compilation. PROTOBUF_DEPENDENCIES = host-protobuf @@ -35,5 +36,12 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) PROTOBUF_DEPENDENCIES += zlib endif +define PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES + rm -rf $(TARGET_DIR)/usr/bin/protoc + rm -rf $(TARGET_DIR)/usr/lib/libprotoc.so* +endef + +PROTOBUF_POST_INSTALL_TARGET_HOOKS += PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/psplash/psplash.hash b/buildroot/package/psplash/psplash.hash index 46d5e12ce..87fcdadd6 100644 --- a/buildroot/package/psplash/psplash.hash +++ b/buildroot/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0042192bf94be4f5792d9ff6b7a2ddff77c79e51274745180d14be5815b3a0f4 psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c.tar.gz -sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING +sha256 2c1344dd8414415d80a01484b1cc29e78f99c31d5266189540e5966a7dc6e10e psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c-br1.tar.gz +sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/buildroot/package/pugixml/pugixml.hash b/buildroot/package/pugixml/pugixml.hash index 79ae75e83..5c629ac66 100644 --- a/buildroot/package/pugixml/pugixml.hash +++ b/buildroot/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a pugixml-1.10.tar.gz -sha256 16582559c91ecf831d6289d472a903032e7d7994a86521c5c39513568d6ad208 readme.txt +sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz +sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md diff --git a/buildroot/package/pugixml/pugixml.mk b/buildroot/package/pugixml/pugixml.mk index 800a3836c..5d7fc6301 100644 --- a/buildroot/package/pugixml/pugixml.mk +++ b/buildroot/package/pugixml/pugixml.mk @@ -4,10 +4,10 @@ # ################################################################################ -PUGIXML_VERSION = 1.10 +PUGIXML_VERSION = 1.11.4 PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT -PUGIXML_LICENSE_FILES = readme.txt +PUGIXML_LICENSE_FILES = LICENSE.md PUGIXML_INSTALL_STAGING = YES # Pugixml will automatically enable 'long long' support on C++11 compilers, diff --git a/buildroot/package/pulseaudio/pulseaudio.hash b/buildroot/package/pulseaudio/pulseaudio.hash index 11d9a275c..b3e19fdcc 100644 --- a/buildroot/package/pulseaudio/pulseaudio.hash +++ b/buildroot/package/pulseaudio/pulseaudio.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2019-September/031373.html -sha256 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 pulseaudio-13.0.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2021-January/031990.html +sha256 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1 pulseaudio-14.2.tar.xz # Locally computed -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL -sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL +sha256 a1064b9838b6b4feee61eaeb0925da4b4834c984b77716558860c4294ed6c015 LICENSE diff --git a/buildroot/package/pulseaudio/pulseaudio.mk b/buildroot/package/pulseaudio/pulseaudio.mk index e64aa6f97..ad1710c6f 100644 --- a/buildroot/package/pulseaudio/pulseaudio.mk +++ b/buildroot/package/pulseaudio/pulseaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PULSEAUDIO_VERSION = 13.0 +PULSEAUDIO_VERSION = 14.2 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz -PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases +PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file) PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL diff --git a/buildroot/package/pure-ftpd/pure-ftpd.mk b/buildroot/package/pure-ftpd/pure-ftpd.mk index 7b7c7d963..7e3d18b43 100644 --- a/buildroot/package/pure-ftpd/pure-ftpd.mk +++ b/buildroot/package/pure-ftpd/pure-ftpd.mk @@ -9,6 +9,7 @@ PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING +PURE_FTPD_CPE_ID_VENDOR = pureftpd PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) # 0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index 3563d2ab4..44e2ae463 100644 --- a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 7eb1a9be9e776c94d3bff73330c213d0 aiohttp-jinja2-1.2.0.tar.gz -sha256 2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79 aiohttp-jinja2-1.2.0.tar.gz +md5 d474a6440ac906a9d818a03a540830ba aiohttp-jinja2-1.4.2.tar.gz +sha256 9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0 aiohttp-jinja2-1.4.2.tar.gz # Locally computed sha256 checksums -sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE +sha256 d9d867affaeac220a60381cc544681dcd37c668ed6ea5ddbf9948617f828889a LICENSE diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 94a0c9d75..724acdb60 100644 --- a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.2.0 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.4.2 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/9c/fb/8f1f8941e1e1937247c6de552668d73ab8ef860a1d633072d9f4e3c9b542 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/da/4f/3b1a0c7177fdb0417308a95bfa8340f19cf84b44f8f2d734cd3052f56644 PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 069cdeda1..a9a6cad2d 100644 --- a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 70213413433ece4e2110ae90a070d279 aiohttp_remotes-0.1.2.tar.gz -sha256 43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc aiohttp_remotes-0.1.2.tar.gz +md5 e90fad4b7aa088207f831698fddd9eea aiohttp_remotes-1.0.0.tar.gz +sha256 caec1681de70bac82daa676078d9b125758fb3952fdaa893a6b42bdd995562ef aiohttp_remotes-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 5240758b8a5c34a46c166294eaae7dc7034ec45c727fce889c9abf7ef5afc158 LICENSE +sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index 5b38ae911..f04cecd89 100644 --- a/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/buildroot/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 0.1.2 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.0.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/cd/2f/93e9198a01485f588d12e19c87cd277542dc28d8b31dc8e1c09fa1c75548 +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/40/b6/1178bd1e26e88f9f29b7d1bbfae7b38d39ec9cf787d4685f83ade2e7aa7f PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiohttp/Config.in b/buildroot/package/python-aiohttp/Config.in index d75c44022..9ffea088e 100644 --- a/buildroot/package/python-aiohttp/Config.in +++ b/buildroot/package/python-aiohttp/Config.in @@ -1,13 +1,14 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime select BR2_PACKAGE_PYTHON_CHARDET if !BR2_INSTALL_LIBSTDCPP # runtime select BR2_PACKAGE_PYTHON_MULTIDICT # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_YARL # runtime - select BR2_PACKAGE_PYTHON_AIODNS # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Async http client/server framework (asyncio). diff --git a/buildroot/package/python-aiohttp/python-aiohttp.hash b/buildroot/package/python-aiohttp/python-aiohttp.hash index fd02bc80d..db7dfd6b1 100644 --- a/buildroot/package/python-aiohttp/python-aiohttp.hash +++ b/buildroot/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 ca40144c199a09fc1a141960cf6295f0 aiohttp-3.6.2.tar.gz -sha256 259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 aiohttp-3.6.2.tar.gz +md5 586eb4e4dcb1e41242ede0c5bcfd4014 aiohttp-3.7.4.tar.gz +sha256 5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de aiohttp-3.7.4.tar.gz # Locally computed sha256 checksums -sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt +sha256 96627bed0ad08e9b2efa9f4e04e80837cd0550e7694a0fec33b1dab2550282ab LICENSE.txt diff --git a/buildroot/package/python-aiohttp/python-aiohttp.mk b/buildroot/package/python-aiohttp/python-aiohttp.mk index 5a5964ed5..f1e755c02 100644 --- a/buildroot/package/python-aiohttp/python-aiohttp.mk +++ b/buildroot/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.6.2 +PYTHON_AIOHTTP_VERSION = 3.7.4 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/00/94/f9fa18e8d7124d7850a5715a0b9c0584f7b9375d331d35e157cee50f27cc +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/7a/95/eb60aaad7943e18c9d091de93c9b0b5ed40aa67c7d5e3c5ee9b36f100a38 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.hash b/buildroot/package/python-aiorwlock/python-aiorwlock.hash index 8556f5ebd..2398b1542 100644 --- a/buildroot/package/python-aiorwlock/python-aiorwlock.hash +++ b/buildroot/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 8eccf28315b4f851f6f7e9332edeec52 aiorwlock-0.6.0.tar.gz -sha256 cd310f33a7ea3bf6fd76fcf0c1ba6e4d7eef4d5ded59e95859494425fb7e599d aiorwlock-0.6.0.tar.gz +md5 8d89ed0d80820aad8d9320204779fd62 aiorwlock-1.0.0.tar.gz +sha256 4f773e31d78037e3ec27056a22200af482768b43da66e2cc33dd64aa5ea6518a aiorwlock-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 56fb2baf14d84c59c15abbfbb1fdf30a724017e2ce97894a8236764513d10397 LICENSE +sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.mk b/buildroot/package/python-aiorwlock/python-aiorwlock.mk index 48e74c02f..f6f3c9740 100644 --- a/buildroot/package/python-aiorwlock/python-aiorwlock.mk +++ b/buildroot/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 0.6.0 +PYTHON_AIORWLOCK_VERSION = 1.0.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/cf/2a2584c4fc1096ae959d7d189f205eb9c872ec58aca2cde16009d2d83b9e +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/40/af/e55b3266352f3383c723e0a3304b0df46a59dfc6235b0b1a0a416afd60c1 PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-bleak/Config.in b/buildroot/package/python-bleak/Config.in new file mode 100644 index 000000000..601536189 --- /dev/null +++ b/buildroot/package/python-bleak/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_BLEAK + bool "python-bleak" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TXDBUS # runtime + help + Bluetooth Low Energy platform Agnostic Klient. + + https://github.com/hbldh/bleak diff --git a/buildroot/package/python-bleak/python-bleak.hash b/buildroot/package/python-bleak/python-bleak.hash new file mode 100644 index 000000000..9506822c1 --- /dev/null +++ b/buildroot/package/python-bleak/python-bleak.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bleak/json +md5 e891b33804b69f0247eb770ca27fa0d5 bleak-0.10.0.tar.gz +sha256 5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee bleak-0.10.0.tar.gz +# Locally computed sha256 checksums +sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/buildroot/package/python-bleak/python-bleak.mk b/buildroot/package/python-bleak/python-bleak.mk new file mode 100644 index 000000000..040d64ed4 --- /dev/null +++ b/buildroot/package/python-bleak/python-bleak.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bleak +# +################################################################################ + +PYTHON_BLEAK_VERSION = 0.10.0 +PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/80/37/c8c88709e4f1ca4636bf11c96d1ec046d7426cd02670ae80a3542280558b +PYTHON_BLEAK_SETUP_TYPE = setuptools +PYTHON_BLEAK_LICENSE = MIT +PYTHON_BLEAK_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-bluezero/Config.in b/buildroot/package/python-bluezero/Config.in index ed2277dc3..9ea3686a2 100644 --- a/buildroot/package/python-bluezero/Config.in +++ b/buildroot/package/python-bluezero/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_BLUEZERO bool "python-bluezero" + depends on BR2_PACKAGE_PYTHON3 help Python library for Bluetooth Low Energy (BLE) on Linux. diff --git a/buildroot/package/python-bluezero/python-bluezero.hash b/buildroot/package/python-bluezero/python-bluezero.hash index 738688d7a..d0df83c4c 100644 --- a/buildroot/package/python-bluezero/python-bluezero.hash +++ b/buildroot/package/python-bluezero/python-bluezero.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bluezero/json -md5 eeb444ecaf7c6bd2613d8ff0eb92d0ac bluezero-0.3.0.tar.gz -sha256 7ebe7243169b5c7600941cb6aa31bc3f8b475c22f5ac32a94d2b0200d5faf684 bluezero-0.3.0.tar.gz +md5 4004c165f762029c2139f31c269a7531 bluezero-0.5.0.tar.gz +sha256 d9562a2d107abc918ffdabd4646039c15c54ca1fca0cec91aa45ba6135d2d0b1 bluezero-0.5.0.tar.gz +# Locally computed sha256 checksums +sha256 59319e80b4caa94ace4817c9f84aa16abc9d4d2b5f7866251b5fda92e87ccdef LICENSE diff --git a/buildroot/package/python-bluezero/python-bluezero.mk b/buildroot/package/python-bluezero/python-bluezero.mk index 97b1aeb78..27e11efc1 100644 --- a/buildroot/package/python-bluezero/python-bluezero.mk +++ b/buildroot/package/python-bluezero/python-bluezero.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.3.0 +PYTHON_BLUEZERO_VERSION = 0.5.0 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/e4/d8/c5451133c0773a0378cadb6c014d7f03b5786da1d39af2f9eaa8028e6662 +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/90/63/67c56cebe6f741b190f047531810911cfb528e9c0ec6db8d4c911808ba32 PYTHON_BLUEZERO_SETUP_TYPE = setuptools PYTHON_BLUEZERO_LICENSE = MIT +PYTHON_BLUEZERO_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-boto3/python-boto3.hash b/buildroot/package/python-boto3/python-boto3.hash index 49eb9ae5c..6752a2cca 100644 --- a/buildroot/package/python-boto3/python-boto3.hash +++ b/buildroot/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 02e0d5ea4affd9c64e9166d5d3786766 boto3-1.9.210.tar.gz -sha256 e221f6867282266e06aec2213f0ea5fdbd4eb3facbca4fcbf96886073350bc5e boto3-1.9.210.tar.gz +md5 8cecdbf7ef6702837d7ddabaa3e39a89 boto3-1.16.50.tar.gz +sha256 4d502a842b81fdac4b950d3b88a5b9067ce118213b122b20f4192003cb067986 boto3-1.16.50.tar.gz # Locally computed sha256 checksums -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/python-boto3/python-boto3.mk b/buildroot/package/python-boto3/python-boto3.mk index e00cb84ad..a5c2b6ab3 100644 --- a/buildroot/package/python-boto3/python-boto3.mk +++ b/buildroot/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.9.210 +PYTHON_BOTO3_VERSION = 1.16.50 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/d3/ac/79093e14a5397096d1fe4a17329a8453cebed8629cbc434e2dad5fb75b65 +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/c8/c6/b4d9547a493ac2837f296f4a004dff6e7136cf6750d181769b8a61d63813 PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-botocore/python-botocore.hash b/buildroot/package/python-botocore/python-botocore.hash index 446c67f83..afaac12bd 100644 --- a/buildroot/package/python-botocore/python-botocore.hash +++ b/buildroot/package/python-botocore/python-botocore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 a75ae28d58d64dbf689d18ac3424342a botocore-1.12.210.tar.gz -sha256 7983b7624b3f71648a7101fbcb437e3d599b4f79b754e89220e574482a2f8298 botocore-1.12.210.tar.gz +md5 870be84c9b418430ad9d0cb5640e76ef botocore-1.12.210.tar.gz +sha256 b954c596f8bdf31d5fdf1eff8a2296bde8094e1e22961a79b83bb62ddeba8a49 botocore-1.19.48.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/buildroot/package/python-botocore/python-botocore.mk b/buildroot/package/python-botocore/python-botocore.mk index 378bd9376..76c59d0a2 100644 --- a/buildroot/package/python-botocore/python-botocore.mk +++ b/buildroot/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.12.210 +PYTHON_BOTOCORE_VERSION = 1.19.48 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/39/78/068e7cf5bb9901f34eacbf449cdfbdf32e470333930cbcda890cfc9fb820 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/35/73/c6fe3fafb74cc86a2a9ddf565a2b8956777e668c6248927e6d76b66f61a4 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-bottle/python-bottle.hash b/buildroot/package/python-bottle/python-bottle.hash index 03558c1ab..7dcaac8dc 100644 --- a/buildroot/package/python-bottle/python-bottle.hash +++ b/buildroot/package/python-bottle/python-bottle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bottle/json -md5 c7d8a42dbc6955593e5b9f957e650a60 bottle-0.12.17.tar.gz -sha256 e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c bottle-0.12.17.tar.gz +md5 50075544706b5e662a3fbd9a98e24b07 bottle-0.12.19.tar.gz +sha256 a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c bottle-0.12.19.tar.gz # Locally computed sha256 checksums sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE diff --git a/buildroot/package/python-bottle/python-bottle.mk b/buildroot/package/python-bottle/python-bottle.mk index a8879010e..d19a439f8 100644 --- a/buildroot/package/python-bottle/python-bottle.mk +++ b/buildroot/package/python-bottle/python-bottle.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.17 +PYTHON_BOTTLE_VERSION = 0.12.19 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/c4/a5/6bf41779860e9b526772e1b3b31a65a22bd97535572988d16028c5ab617d +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/ea/80/3d2dca1562ffa1929017c74635b4cb3645a352588de89e90d0bb53af3317 PYTHON_BOTTLE_LICENSE = MIT PYTHON_BOTTLE_LICENSE_FILES = LICENSE +PYTHON_BOTTLE_CPE_ID_VENDOR = bottlepy +PYTHON_BOTTLE_CPE_ID_PRODUCT = bottle PYTHON_BOTTLE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-can/python-can.hash b/buildroot/package/python-can/python-can.hash index ced51d8b7..5330e5899 100644 --- a/buildroot/package/python-can/python-can.hash +++ b/buildroot/package/python-can/python-can.hash @@ -1,4 +1,4 @@ -# sha256 from https://pypi.org/pypi/python-can/json -sha256 ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488 python-can-3.3.3.tar.gz +# sha256 from https://pypi.org/pypi/python-can +sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/buildroot/package/python-can/python-can.mk b/buildroot/package/python-can/python-can.mk index 158e89f20..1ab813e2c 100644 --- a/buildroot/package/python-can/python-can.mk +++ b/buildroot/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.3 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/b0/fa/8c6eb8988130f256db4c3cf84537c44684dbb3d528d2e1a1d2209eac4d90 +PYTHON_CAN_VERSION = 3.3.4 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-cbor2/python-cbor2.hash b/buildroot/package/python-cbor2/python-cbor2.hash index a643cdbe2..073d071a5 100644 --- a/buildroot/package/python-cbor2/python-cbor2.hash +++ b/buildroot/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 693c1bd6635bee8a591a70ea924ad676 cbor2-5.1.2.tar.gz -sha256 91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6 cbor2-5.1.2.tar.gz +md5 0940aa8bfd1a07f06a983bb6dc78f1ca cbor2-5.2.0.tar.gz +sha256 a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf cbor2-5.2.0.tar.gz # Locally computed sha256 checksums -sha256 6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758 LICENSE.txt +sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/buildroot/package/python-cbor2/python-cbor2.mk b/buildroot/package/python-cbor2/python-cbor2.mk index 115eb8d27..17639ccf1 100644 --- a/buildroot/package/python-cbor2/python-cbor2.mk +++ b/buildroot/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.1.2 +PYTHON_CBOR2_VERSION = 5.2.0 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/3f/14/a7cdcab562ee9b599ce409168eb0a5f7c7190a83f23c92c8c310e56d1b58 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/02/15/f4d7fb47753099fcd9d7f7c81920d422a3ab2e710400ec0f4a1b511b51ae PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-certifi/python-certifi.hash b/buildroot/package/python-certifi/python-certifi.hash index 8543393d8..760567251 100644 --- a/buildroot/package/python-certifi/python-certifi.hash +++ b/buildroot/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 89525ece725d674d91b0c43007d2a47e certifi-2020.6.20.tar.gz -sha256 5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 certifi-2020.6.20.tar.gz +md5 522f9abe26e5d603a668d812aa6accca certifi-2020.12.5.tar.gz +sha256 1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c certifi-2020.12.5.tar.gz # Locally computed sha256 checksums sha256 6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131 LICENSE diff --git a/buildroot/package/python-certifi/python-certifi.mk b/buildroot/package/python-certifi/python-certifi.mk index faa0a0a89..4e4cbfdc8 100644 --- a/buildroot/package/python-certifi/python-certifi.mk +++ b/buildroot/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2020.6.20 +PYTHON_CERTIFI_VERSION = 2020.12.5 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/40/a7/ded59fa294b85ca206082306bba75469a38ea1c7d44ea7e1d64f5443d67a +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-chardet/python-chardet.hash b/buildroot/package/python-chardet/python-chardet.hash index a1804603a..fb4260a22 100644 --- a/buildroot/package/python-chardet/python-chardet.hash +++ b/buildroot/package/python-chardet/python-chardet.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/chardet/json -md5 7dd1ba7f9c77e32351b0a0cfacf4055c chardet-3.0.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/chardet/json +md5 bc9a5603d8d0994b2d4cbf255f99e654 chardet-4.0.0.tar.gz +sha256 0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa chardet-4.0.0.tar.gz # Locally computed -sha256 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae chardet-3.0.4.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/buildroot/package/python-chardet/python-chardet.mk b/buildroot/package/python-chardet/python-chardet.mk index 516109894..448877d05 100644 --- a/buildroot/package/python-chardet/python-chardet.mk +++ b/buildroot/package/python-chardet/python-chardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARDET_VERSION = 3.0.4 +PYTHON_CHARDET_VERSION = 4.0.0 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d +PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61 PYTHON_CHARDET_SETUP_TYPE = setuptools PYTHON_CHARDET_LICENSE = LGPL-2.1+ PYTHON_CHARDET_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-colorama/python-colorama.hash b/buildroot/package/python-colorama/python-colorama.hash index 312b9e1f7..e975a6636 100644 --- a/buildroot/package/python-colorama/python-colorama.hash +++ b/buildroot/package/python-colorama/python-colorama.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/colorama/json -sha256 e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1 colorama-0.4.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/colorama/json +md5 57b22f2597f63df051b69906fbf310cc colorama-0.4.4.tar.gz +sha256 5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b colorama-0.4.4.tar.gz # Locally computed sha256 checksums -sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt +sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/buildroot/package/python-colorama/python-colorama.mk b/buildroot/package/python-colorama/python-colorama.mk index 6117b853a..d3d29a63e 100644 --- a/buildroot/package/python-colorama/python-colorama.mk +++ b/buildroot/package/python-colorama/python-colorama.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORAMA_VERSION = 0.4.3 +PYTHON_COLORAMA_VERSION = 0.4.4 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz -PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/82/75/f2a4c0c94c85e2693c229142eb448840fba0f9230111faa889d1f541d12d +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe PYTHON_COLORAMA_SETUP_TYPE = setuptools PYTHON_COLORAMA_LICENSE = BSD-3-Clause PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-defusedxml/Config.in b/buildroot/package/python-defusedxml/Config.in new file mode 100644 index 000000000..85285da5e --- /dev/null +++ b/buildroot/package/python-defusedxml/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_DEFUSEDXML + bool "python-defusedxml" + help + XML bomb protection for Python stdlib modules + + https://pypi.org/project/defusedxml/ diff --git a/buildroot/package/python-defusedxml/python-defusedxml.hash b/buildroot/package/python-defusedxml/python-defusedxml.hash new file mode 100644 index 000000000..c782a97bb --- /dev/null +++ b/buildroot/package/python-defusedxml/python-defusedxml.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/defusedxml/json +md5 a59741f675c4cba649de40a99f732897 defusedxml-0.6.0.tar.gz +sha256 f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5 defusedxml-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 b80ce9da8c42a1f91079627fbbe2bf27210ae108a0ffe5f077d5b08e076c24c8 LICENSE diff --git a/buildroot/package/python-defusedxml/python-defusedxml.mk b/buildroot/package/python-defusedxml/python-defusedxml.mk new file mode 100644 index 000000000..6d2a9aff4 --- /dev/null +++ b/buildroot/package/python-defusedxml/python-defusedxml.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-defusedxml +# +################################################################################ + +PYTHON_DEFUSEDXML_VERSION = 0.6.0 +PYTHON_DEFUSEDXML_SOURCE = defusedxml-$(PYTHON_DEFUSEDXML_VERSION).tar.gz +PYTHON_DEFUSEDXML_SITE = https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77 +PYTHON_DEFUSEDXML_SETUP_TYPE = setuptools +PYTHON_DEFUSEDXML_LICENSE = Python-2.0 +PYTHON_DEFUSEDXML_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash index 8aebe6216..f40cfa8f3 100644 --- a/buildroot/package/python-django/python-django.hash +++ b/buildroot/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 deec48e8713727e443a7cee6b54baaeb Django-3.0.10.tar.gz -sha256 2d14be521c3ae24960e5e83d4575e156a8c479a75c935224b671b1c6e66eddaf Django-3.0.10.tar.gz +md5 7020810fb65b17e82d22001883b63a12 Django-3.0.13.tar.gz +sha256 6f13c3e8109236129c49d65a42fbf30c928e66b05ca6862246061b9343ecbaf2 Django-3.0.13.tar.gz # Locally computed sha256 checksums -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk index 97bf75320..593b0c604 100644 --- a/buildroot/package/python-django/python-django.mk +++ b/buildroot/package/python-django/python-django.mk @@ -4,12 +4,14 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.0.10 +PYTHON_DJANGO_VERSION = 3.0.13 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/f4/09/d7c995b128bec61233cfea0e5fa40e442cae54c127b4b2b0881e1fdd0023 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/3b/fe/11ec9b4cbae447e7b90d551be035d55c1293973592b491540334452f1f1f PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE +PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject +PYTHON_DJANGO_CPE_ID_PRODUCT = django PYTHON_DJANGO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-esptool/Config.in b/buildroot/package/python-esptool/Config.in index 08b84e3e0..570f9aa42 100644 --- a/buildroot/package/python-esptool/Config.in +++ b/buildroot/package/python-esptool/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_ECDSA # runtime select BR2_PACKAGE_PYTHON_PYAES # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 help A serial utility to communicate & flash code to Espressif ESP8266 & ESP32 chips. diff --git a/buildroot/package/python-esptool/python-esptool.hash b/buildroot/package/python-esptool/python-esptool.hash index b4dac7ed5..3b030ec75 100644 --- a/buildroot/package/python-esptool/python-esptool.hash +++ b/buildroot/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 d17b9293910773045b9de0d5caa0597d esptool-2.8.tar.gz -sha256 1e4288d9f00e55ba36809cc79c493643c623bfa036d7b019a0ebe396284bc317 esptool-2.8.tar.gz +md5 ccd2855e14c298712aeb37ac063baad5 esptool-3.0.tar.gz +sha256 87953d235fed2c9adb1292b3769df0149686c9afdb1896dd963f730453cbc934 esptool-3.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/python-esptool/python-esptool.mk b/buildroot/package/python-esptool/python-esptool.mk index 0cdc98ce1..e9e3eb6b5 100644 --- a/buildroot/package/python-esptool/python-esptool.mk +++ b/buildroot/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 2.8 +PYTHON_ESPTOOL_VERSION = 3.0 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/68/91/08c182f66fa3f12a96e754ae8ec7762abb2d778429834638f5746f81977a +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/dd/3d/d1d4c004927e6e6807c441ce70330ed969c725d2906053fbd2ff994b4439 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-fire/python-fire.hash b/buildroot/package/python-fire/python-fire.hash index a6a2df8c0..d86376c52 100644 --- a/buildroot/package/python-fire/python-fire.hash +++ b/buildroot/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 af6da611394a2332fbd5bd9f1227254e fire-0.3.1.tar.gz -sha256 9736a16227c3d469e5d2d296bce5b4d8fa8d7851e953bda327a455fc2994307f fire-0.3.1.tar.gz +md5 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz +sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/buildroot/package/python-fire/python-fire.mk b/buildroot/package/python-fire/python-fire.mk index f6a2e073f..7ba971abc 100644 --- a/buildroot/package/python-fire/python-fire.mk +++ b/buildroot/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.3.1 +PYTHON_FIRE_VERSION = 0.4.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/34/a7/0e22e70778aca01a52b9c899d9c145c6396d7b613719cd63db97ffa13f2f +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-cors/python-flask-cors.hash b/buildroot/package/python-flask-cors/python-flask-cors.hash index 15b7d41a3..94ec262db 100644 --- a/buildroot/package/python-flask-cors/python-flask-cors.hash +++ b/buildroot/package/python-flask-cors/python-flask-cors.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/flask-cors/json -sha256 6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8 Flask-Cors-3.0.9.tar.gz +# md5, sha256 from https://pypi.org/pypi/flask-cors/json +md5 647ff0632b960ba063a077fb4063077e Flask-Cors-3.0.10.tar.gz +sha256 b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de Flask-Cors-3.0.10.tar.gz # Locally computed sha256 checksums sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE diff --git a/buildroot/package/python-flask-cors/python-flask-cors.mk b/buildroot/package/python-flask-cors/python-flask-cors.mk index d71210900..d60015726 100644 --- a/buildroot/package/python-flask-cors/python-flask-cors.mk +++ b/buildroot/package/python-flask-cors/python-flask-cors.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_FLASK_CORS_VERSION = 3.0.9 +PYTHON_FLASK_CORS_VERSION = 3.0.10 PYTHON_FLASK_CORS_SOURCE = Flask-Cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz -PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/99/fc/cd117ea122e28037a5ec60356a7ffae8b77af527713f7b5e4eb63089f669 +PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/cf/25/e3b2553d22ed542be807739556c69621ad2ab276ae8d5d2560f4ed20f652 PYTHON_FLASK_CORS_SETUP_TYPE = setuptools PYTHON_FLASK_CORS_LICENSE = MIT PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE +PYTHON_FLASK_CORS_CPE_ID_VENDOR = flask-cors_project +PYTHON_FLASK_CORS_CPE_ID_PRODUCT = flask-cors $(eval $(python-package)) diff --git a/buildroot/package/python-iniconfig/python-iniconfig.hash b/buildroot/package/python-iniconfig/python-iniconfig.hash index 708c0553a..b2469db99 100644 --- a/buildroot/package/python-iniconfig/python-iniconfig.hash +++ b/buildroot/package/python-iniconfig/python-iniconfig.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iniconfig/json -md5 464179a74789d033b170101f6aa38c2a iniconfig-1.0.1.tar.gz -sha256 e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69 iniconfig-1.0.1.tar.gz +md5 0b7f3be87481211c183eae095bcea6f1 iniconfig-1.1.1.tar.gz +sha256 bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 iniconfig-1.1.1.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/buildroot/package/python-iniconfig/python-iniconfig.mk b/buildroot/package/python-iniconfig/python-iniconfig.mk index 57f31c419..5c31c6995 100644 --- a/buildroot/package/python-iniconfig/python-iniconfig.mk +++ b/buildroot/package/python-iniconfig/python-iniconfig.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 1.0.1 +PYTHON_INICONFIG_VERSION = 1.1.1 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/aa/6e/60dafce419de21f2f3f29319114808cac9f49b6c15117a419737a4ce3813 +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2 PYTHON_INICONFIG_SETUP_TYPE = setuptools PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-iso8601/Config.in b/buildroot/package/python-iso8601/Config.in index 9e4610cf6..9d61b1d42 100644 --- a/buildroot/package/python-iso8601/Config.in +++ b/buildroot/package/python-iso8601/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_ISO8601 help Simple module to parse ISO 8601 dates. - https://bitbucket.org/micktwomey/pyiso8601 + https://github.com/micktwomey/pyiso8601 diff --git a/buildroot/package/python-iso8601/python-iso8601.hash b/buildroot/package/python-iso8601/python-iso8601.hash index 57604cc97..18cf3958d 100644 --- a/buildroot/package/python-iso8601/python-iso8601.hash +++ b/buildroot/package/python-iso8601/python-iso8601.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/iso8601/json, sha256 locally computed -md5 4de940f691c5ea759fb254384c8ddcf6 iso8601-0.1.12.tar.gz -sha256 49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82 iso8601-0.1.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/iso8601/json +md5 df6e924305fd799d90be63336b2ab8b3 iso8601-0.1.13.tar.gz +sha256 f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1 iso8601-0.1.13.tar.gz +# Locally computed sha256 checksums sha256 116d368d14a8cf0061027c944c60ee20b476ce42814818a7d627396906761f16 LICENSE diff --git a/buildroot/package/python-iso8601/python-iso8601.mk b/buildroot/package/python-iso8601/python-iso8601.mk index 7fc171d60..3620255db 100644 --- a/buildroot/package/python-iso8601/python-iso8601.mk +++ b/buildroot/package/python-iso8601/python-iso8601.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ISO8601_VERSION = 0.1.12 +PYTHON_ISO8601_VERSION = 0.1.13 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz -PYTHON_ISO8601_SITE = https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0 +PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/05/90/2d9927dc2d33192f58fe39d2d216313a8380625cd4b062efb93f1afd7a29 PYTHON_ISO8601_SETUP_TYPE = setuptools PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-janus/python-janus.hash b/buildroot/package/python-janus/python-janus.hash index 9108db632..7d914389d 100644 --- a/buildroot/package/python-janus/python-janus.hash +++ b/buildroot/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 577c3c8939ef945c5dc00319bd59484f janus-0.5.0.tar.gz -sha256 0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c janus-0.5.0.tar.gz +md5 dad6a03e7664cb800ce45ef8bcf12439 janus-0.6.1.tar.gz +sha256 4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c janus-0.6.1.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/buildroot/package/python-janus/python-janus.mk b/buildroot/package/python-janus/python-janus.mk index b5fa44f72..2b08733c1 100644 --- a/buildroot/package/python-janus/python-janus.mk +++ b/buildroot/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.5.0 +PYTHON_JANUS_VERSION = 0.6.1 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/9a/76/fbb89aa5d3cb5f3fec6ce74d34cf980ccd475b015d1a59cb5a14fe4cd2c5 +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/7c/1b/8769c2dca84dd8ca92e48b14750c7106ff4313df4fee651dbc3cd9e345a9 PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-jinja2/python-jinja2.mk b/buildroot/package/python-jinja2/python-jinja2.mk index 5f6492915..51b484d03 100644 --- a/buildroot/package/python-jinja2/python-jinja2.mk +++ b/buildroot/package/python-jinja2/python-jinja2.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-jinja2/python3-jinja2.mk PYTHON_JINJA2_VERSION = 2.11.2 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/64/a7/45e11eebf2f15bf987c3bc11d37dcc838d9dc81250e67e4c5968f6008b6c diff --git a/buildroot/package/python-jmespath/python-jmespath.hash b/buildroot/package/python-jmespath/python-jmespath.hash index 4d1ccb5bb..986db2e00 100644 --- a/buildroot/package/python-jmespath/python-jmespath.hash +++ b/buildroot/package/python-jmespath/python-jmespath.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jmespath/json -md5 5c3380a84c565d7438e4766fd4b7a775 jmespath-0.9.4.tar.gz -sha256 bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c jmespath-0.9.4.tar.gz +md5 65bdcb5fa5bcf1cc710ffa508e78e408 jmespath-0.10.0.tar.gz +sha256 b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9 jmespath-0.10.0.tar.gz # Locally computed sha256 checksums sha256 66b313cce80ed0623fc7db3f24863a0c80fd83eb341a46b57864158ae74faa56 LICENSE.txt diff --git a/buildroot/package/python-jmespath/python-jmespath.mk b/buildroot/package/python-jmespath/python-jmespath.mk index 4afd06fd4..cf11dedb6 100644 --- a/buildroot/package/python-jmespath/python-jmespath.mk +++ b/buildroot/package/python-jmespath/python-jmespath.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JMESPATH_VERSION = 0.9.4 +PYTHON_JMESPATH_VERSION = 0.10.0 PYTHON_JMESPATH_SOURCE = jmespath-$(PYTHON_JMESPATH_VERSION).tar.gz -PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/2c/30/f0162d3d83e398c7a3b70c91eef61d409dea205fb4dc2b47d335f429de32 +PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/3c/56/3f325b1eef9791759784aa5046a8f6a1aff8f7c898a2e34506771d3b99d8 PYTHON_JMESPATH_SETUP_TYPE = setuptools PYTHON_JMESPATH_LICENSE = MIT PYTHON_JMESPATH_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-libusb1/Config.in b/buildroot/package/python-libusb1/Config.in index 1c4a72eda..e464a0394 100644 --- a/buildroot/package/python-libusb1/Config.in +++ b/buildroot/package/python-libusb1/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_PYTHON_LIBUSB1 bool "python-libusb1" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Pure-python wrapper for libusb-1.0. http://github.com/vpelletier/python-libusb1 -comment "python-libusb1 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-libusb1 needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk index a8874737e..fe99f8247 100644 --- a/buildroot/package/python-lxml/python-lxml.mk +++ b/buildroot/package/python-lxml/python-lxml.mk @@ -15,6 +15,8 @@ PYTHON_LXML_LICENSE_FILES = \ doc/licenses/BSD.txt \ doc/licenses/elementtree.txt \ src/lxml/isoschematron/resources/rng/iso-schematron.rng +PYTHON_LXML_CPE_ID_VENDOR = lxml +PYTHON_LXML_CPE_ID_PRODUCT = lxml # python-lxml can use either setuptools, or distutils as a fallback. # So, we use setuptools. diff --git a/buildroot/package/python-mako/python-mako.hash b/buildroot/package/python-mako/python-mako.hash index 19b122179..353799923 100644 --- a/buildroot/package/python-mako/python-mako.hash +++ b/buildroot/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 e1939facb40f38f15e8cc74cb5887c4c Mako-1.1.2.tar.gz -sha256 3139c5d64aa5d175dbafb95027057128b5fbd05a40c53999f3905ceb53366d9d Mako-1.1.2.tar.gz +md5 184bb2ba4b937127e7c557b93db89377 Mako-1.1.3.tar.gz +sha256 8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27 Mako-1.1.3.tar.gz # Locally computed sha256 checksums sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE diff --git a/buildroot/package/python-mako/python-mako.mk b/buildroot/package/python-mako/python-mako.mk index ce34321cb..d5d49f252 100644 --- a/buildroot/package/python-mako/python-mako.mk +++ b/buildroot/package/python-mako/python-mako.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python3-mako/python3-mako.mk -PYTHON_MAKO_VERSION = 1.1.2 +PYTHON_MAKO_VERSION = 1.1.3 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/42/64/fc7c506d14d8b6ed363e7798ffec2dfe4ba21e14dda4cfab99f4430cba3a +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/72/89/402d2b4589e120ca76a6aed8fee906a0f5ae204b50e455edd36eda6e778d PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-markupsafe/python-markupsafe.mk b/buildroot/package/python-markupsafe/python-markupsafe.mk index b52770609..f067d94f3 100644 --- a/buildroot/package/python-markupsafe/python-markupsafe.mk +++ b/buildroot/package/python-markupsafe/python-markupsafe.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk PYTHON_MARKUPSAFE_VERSION = 1.1.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 diff --git a/buildroot/package/python-modbus-tk/python-modbus-tk.hash b/buildroot/package/python-modbus-tk/python-modbus-tk.hash index c4fde683c..c486e4971 100644 --- a/buildroot/package/python-modbus-tk/python-modbus-tk.hash +++ b/buildroot/package/python-modbus-tk/python-modbus-tk.hash @@ -1,6 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/modbus-tk/json -md5 e52d5de22cc9d97f2c1086d9b11f0f1e modbus_tk-1.1.1.tar.gz -sha256 c6dd004bc6bbff6d9fa93e61654c30a26c817c6632036c656383c9ecadca6639 modbus_tk-1.1.1.tar.gz +# sha256 from https://pypi.org/pypi/modbus-tk/json +sha256 893514bbd8c92118d20a19979e0239e7cb2a63f8f1795a0271e57def09d11770 modbus_tk-1.1.2.tar.gz # Locally computed sha256 checksums sha256 3b6a7f9c478ac1982e86cdadb45eb4788241b95839500eb26839d5053b74a24a license.txt sha256 aa7ca42152a13db6a27b31944f99851efc3b9ee813912ff21d7d6ceadca62e6f copying.txt diff --git a/buildroot/package/python-modbus-tk/python-modbus-tk.mk b/buildroot/package/python-modbus-tk/python-modbus-tk.mk index 37927575a..30056bb20 100644 --- a/buildroot/package/python-modbus-tk/python-modbus-tk.mk +++ b/buildroot/package/python-modbus-tk/python-modbus-tk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MODBUS_TK_VERSION = 1.1.1 +PYTHON_MODBUS_TK_VERSION = 1.1.2 PYTHON_MODBUS_TK_SOURCE = modbus_tk-$(PYTHON_MODBUS_TK_VERSION).tar.gz -PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/63/2e/991c8965fd45db4c38fefe1fa70356825e847e1bbb1f14e127aa2b4d37aa +PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/ce/e9/30d86eb912bf868b8c97698b5747f10cf72dc26c674fd030249bc3275484 PYTHON_MODBUS_TK_SETUP_TYPE = setuptools PYTHON_MODBUS_TK_LICENSE = LGPL-2.1+ PYTHON_MODBUS_TK_LICENSE_FILES = license.txt copying.txt diff --git a/buildroot/package/python-multidict/python-multidict.hash b/buildroot/package/python-multidict/python-multidict.hash index a08a14a8a..6b7830120 100644 --- a/buildroot/package/python-multidict/python-multidict.hash +++ b/buildroot/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 c2c3311e25636a6f213e998cd1e80d72 multidict-5.0.0.tar.gz -sha256 1b324444299c3a49b601b1bf621fc21704e29066f6ac2b7d7e4034a4a18662a1 multidict-5.0.0.tar.gz +md5 b1dab3349efe90934ae3612f1202b733 multidict-5.0.2.tar.gz +sha256 e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c multidict-5.0.2.tar.gz # Locally computed sha256 checksums sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE diff --git a/buildroot/package/python-multidict/python-multidict.mk b/buildroot/package/python-multidict/python-multidict.mk index 1084fe0f6..a7043643c 100644 --- a/buildroot/package/python-multidict/python-multidict.mk +++ b/buildroot/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 5.0.0 +PYTHON_MULTIDICT_VERSION = 5.0.2 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/d2/5a/e95b0f9ebacd42e094e229a9a0a9e44d02876abf64969d0cb07dadcf3c4a +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/da/e6/50c7f52781f45c2b37c77e962c30a3944a9e79a46ea92956e826c24d3432 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-mwclient/Config.in b/buildroot/package/python-mwclient/Config.in index 76bf79489..dc93e6c0d 100644 --- a/buildroot/package/python-mwclient/Config.in +++ b/buildroot/package/python-mwclient/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_PYTHON_MWCLIENT select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help - MediaWiki API client. + Python client library to interface with the MediaWiki API - https://github.com/btongminh/mwclient + https://github.com/mwclient/mwclient diff --git a/buildroot/package/python-mwclient/python-mwclient.hash b/buildroot/package/python-mwclient/python-mwclient.hash index a61dfd696..354bd685e 100644 --- a/buildroot/package/python-mwclient/python-mwclient.hash +++ b/buildroot/package/python-mwclient/python-mwclient.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mwclient/json -md5 c1b9f69d0eb71a031c1254b1ed16f678 mwclient-0.10.0.tar.gz -sha256 c3f1598a5f75fb80e9b8373f6574042208358aed81470fc2178a8ae7474069af mwclient-0.10.0.tar.gz +md5 148bd36bfaaf591bd9c0076cbf1ed888 mwclient-0.10.1.tar.gz +sha256 79363dd8d12f5e3b91b92b63152bf9dfef27da786c076a244e1f148c8dd67139 mwclient-0.10.1.tar.gz # Locally computed -sha256 0e713ce8e3e490bdc15ac1e59feba3009daef3fff10dd80d8baa6e5f9a294f32 LICENSE.md +sha256 67689d1fd48a5adba31272eed653c12160dd3abbfe92ab056ac42a155e12e523 LICENSE.md diff --git a/buildroot/package/python-mwclient/python-mwclient.mk b/buildroot/package/python-mwclient/python-mwclient.mk index de66a4274..07aa877ed 100644 --- a/buildroot/package/python-mwclient/python-mwclient.mk +++ b/buildroot/package/python-mwclient/python-mwclient.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MWCLIENT_VERSION = 0.10.0 +PYTHON_MWCLIENT_VERSION = 0.10.1 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/c1/ec/6206a7b3834572b3c1082f58dc960f4e49543395aa55955b598c29c9f8ad +PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/97/b4/5fc70ad3286a8d8ec4b9ac01acad0f6b00c5a48d4a16b9d3be6519b7eb21 PYTHON_MWCLIENT_LICENSE = MIT PYTHON_MWCLIENT_LICENSE_FILES = LICENSE.md PYTHON_MWCLIENT_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-mwscrape/Config.in b/buildroot/package/python-mwscrape/Config.in index 273ce9a4a..cb1e30506 100644 --- a/buildroot/package/python-mwscrape/Config.in +++ b/buildroot/package/python-mwscrape/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE bool "python-mwscrape" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime - select BR2_PACKAGE_PYTHON_FUTURES # runtime select BR2_PACKAGE_PYTHON_MWCLIENT # runtime select BR2_PACKAGE_PYTHON_PYLRU # runtime help diff --git a/buildroot/package/python-mwscrape/python-mwscrape.hash b/buildroot/package/python-mwscrape/python-mwscrape.hash index e6bdf396c..0f64a9e19 100644 --- a/buildroot/package/python-mwscrape/python-mwscrape.hash +++ b/buildroot/package/python-mwscrape/python-mwscrape.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz +sha256 2d0e6c747f6a866dedbc759f78830b3f496e8d03401a3c727d0b48735341c5b6 python-mwscrape-568ccbe6e12dd6391277df02adf724ba0e5f9197.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE.txt diff --git a/buildroot/package/python-mwscrape/python-mwscrape.mk b/buildroot/package/python-mwscrape/python-mwscrape.mk index 47b943f45..3ffe9d688 100644 --- a/buildroot/package/python-mwscrape/python-mwscrape.mk +++ b/buildroot/package/python-mwscrape/python-mwscrape.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 +PYTHON_MWSCRAPE_VERSION = 568ccbe6e12dd6391277df02adf724ba0e5f9197 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) PYTHON_MWSCRAPE_LICENSE = MPL-2.0 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash index f1f5e4f16..51b625856 100644 --- a/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash +++ b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 367ffc3203f7eb2cc26211f58c0693526652d9a238af48c88f936920e804faf7 python-mwscrape2slob-0f9124ed62009dff6a230947d80340f5a61a6f49.tar.gz +sha256 f1c1c79526fb3e0dac1c2c43e57a38b8641672e7008c5530d4b75e864eff232a python-mwscrape2slob-e01d3e92f0a372ebd0f57390e437a28f9d3c0438.tar.gz diff --git a/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk index 519f5e5ed..cd8ae3523 100644 --- a/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk +++ b/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49 +PYTHON_MWSCRAPE2SLOB_VERSION = e01d3e92f0a372ebd0f57390e437a28f9d3c0438 PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils diff --git a/buildroot/package/python-nfc/Config.in b/buildroot/package/python-nfc/Config.in index 9a8102c23..7008723f6 100644 --- a/buildroot/package/python-nfc/Config.in +++ b/buildroot/package/python-nfc/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_NFC bool "python-nfc" depends on BR2_PACKAGE_PYTHON depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help @@ -9,6 +10,7 @@ config BR2_PACKAGE_PYTHON_NFC https://launchpad.net/nfcpy -comment "python-nfc needs a toolchain w/ threads" +comment "python-nfc needs a toolchain w/ threads, gcc >= 4.9" depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-pillow/Config.in b/buildroot/package/python-pillow/Config.in index f98a4a9e5..ae6d8c834 100644 --- a/buildroot/package/python-pillow/Config.in +++ b/buildroot/package/python-pillow/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/buildroot/package/python-pillow/python-pillow.hash b/buildroot/package/python-pillow/python-pillow.hash index f80b79fe5..0849577f6 100644 --- a/buildroot/package/python-pillow/python-pillow.hash +++ b/buildroot/package/python-pillow/python-pillow.hash @@ -1,5 +1,4 @@ # md5, sha256 from https://pypi.org/project/Pillow/ -md5 f1f7592c51260e5080d3cd71781ea675 Pillow-7.1.2.tar.gz -sha256 97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626 Pillow-7.2.0.tar.gz +sha256 11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e Pillow-8.0.1.tar.gz # Locally computed sha256 checksums sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE diff --git a/buildroot/package/python-pillow/python-pillow.mk b/buildroot/package/python-pillow/python-pillow.mk index 931dce53d..60a0bb3e1 100644 --- a/buildroot/package/python-pillow/python-pillow.mk +++ b/buildroot/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 7.2.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a +PYTHON_PILLOW_VERSION = 8.0.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE @@ -47,15 +47,9 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -PYTHON_PILLOW_DEPENDENCIES += zlib -PYTHON_PILLOW_BUILD_OPTS += --enable-zlib -else -PYTHON_PILLOW_BUILD_OPTS += --disable-zlib -endif - define PYTHON_PILLOW_BUILD_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) @@ -63,6 +57,7 @@ endef define PYTHON_PILLOW_INSTALL_TARGET_CMDS cd $(PYTHON_PILLOW_BUILDDIR); \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ $(PYTHON_PILLOW_BUILD_OPTS) install \ diff --git a/buildroot/package/python-ply/python-ply.mk b/buildroot/package/python-ply/python-ply.mk index 5dc7964d5..50a3e32bc 100644 --- a/buildroot/package/python-ply/python-ply.mk +++ b/buildroot/package/python-ply/python-ply.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Please keep in sync with package/python3-ply/python3-ply.mk PYTHON_PLY_VERSION = 3.11 PYTHON_PLY_SOURCE = ply-$(PYTHON_PLY_VERSION).tar.gz PYTHON_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da diff --git a/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch b/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch deleted file mode 100644 index 1646f0808..000000000 --- a/buildroot/package/python-protobuf/0001-python-setup.py-remove-unneeded-wheel-dependency.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9f8a6ed7fda9abf474ce886dddf3ab5abc0ead0b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 20 Sep 2020 10:52:32 +0200 -Subject: [PATCH] python/setup.py: remove unneeded wheel dependency - -wheel is required since version 3.13.0 and -https://github.com/protocolbuffers/protobuf/commit/ff92cee10bcae7533b573368f448e782fbd43f39 - -This will result in the following build failure when cross-compiling: - -Download error on https://pypi.org/simple/wheel/: unknown url type: https -- Some packages may not be found! -Couldn't find index page for 'wheel' (maybe misspelled?) -Download error on https://pypi.org/simple/: unknown url type: https -- Some packages may not be found! -No local packages or working download links found for wheel - -Remove wheel requirement from setup.py as it is only needed by -release.sh, not by setup.py - -Fixes: - - http://autobuild.buildroot.org/results/371c686a10d6870933011b46d36b1879d29046b9 - -Signed-off-by: Fabrice Fontaine ---- - python/setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/python/setup.py b/python/setup.py -index b44e88b2f..39eb18d4b 100755 ---- a/python/setup.py -+++ b/python/setup.py -@@ -293,7 +293,6 @@ if __name__ == '__main__': - 'build_py': build_py, - 'test_conformance': test_conformance, - }, -- setup_requires = ['wheel'], - install_requires=install_requires, - ext_modules=ext_module_list, - ) --- -2.28.0 - diff --git a/buildroot/package/python-protobuf/python-protobuf.hash b/buildroot/package/python-protobuf/python-protobuf.hash index 4098d087a..c8762b541 100644 --- a/buildroot/package/python-protobuf/python-protobuf.hash +++ b/buildroot/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9c4d2ad449d27da5ac1db1ad5ecc4a642dedd6bbe59219d61d7b655b6b12be89 protobuf-python-3.13.0.tar.gz +sha256 969019c5fd9c1345f0b34afa06ab2664c1441d159d5ae87ded5fa01d79f028c1 protobuf-python-3.14.0.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/buildroot/package/python-pybind/python-pybind.hash b/buildroot/package/python-pybind/python-pybind.hash index 751b0bdf6..a68ac846e 100644 --- a/buildroot/package/python-pybind/python-pybind.hash +++ b/buildroot/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 97504db65640570f32d3fdf701c25a340c8643037c3b69aec469c10c93dc8504 python-pybind-2.5.0.tar.gz +sha256 cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a python-pybind-2.6.1.tar.gz # License files, locally calculated -sha256 9a37ea54aa3cf12c7f3292799f20822ffd4b9b7142b36a7a9997b28c39264dc9 LICENSE +sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/buildroot/package/python-pybind/python-pybind.mk b/buildroot/package/python-pybind/python-pybind.mk index 634e869e4..a6a1bdb97 100644 --- a/buildroot/package/python-pybind/python-pybind.mk +++ b/buildroot/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.5.0 +PYTHON_PYBIND_VERSION = 2.6.1 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash index df8d2a2f8..1016672af 100644 --- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 4cede80c602d8814bbfb24a1cdc50dc8 pycryptodomex-3.9.8.tar.gz -sha256 48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9 pycryptodomex-3.9.8.tar.gz +md5 08bc8fbbcd6060c06f1f10e2dc18b834 pycryptodomex-3.9.9.tar.gz +sha256 7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51 pycryptodomex-3.9.9.tar.gz # Locally computed sha256 checksums sha256 d1af3fab2ef8cc53b6c7f48bdeb178ac874b04faf4ba0159a96b6109f1d393e2 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk index 5123acb8e..341d1fa0f 100644 --- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-pycryptodomex/python3-pycryptodomex.mk -PYTHON_PYCRYPTODOMEX_VERSION = 3.9.8 +PYTHON_PYCRYPTODOMEX_VERSION = 3.9.9 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f5/79/9d9206688385d1e7a5ff925e7aab1d685636256e34a409037aa7adbbe611 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/90/f4a934bffae029e16fb33f3bd87014a0a18b4bec591249c4fc01a18d3ab6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/buildroot/package/python-pycups/Config.in b/buildroot/package/python-pycups/Config.in new file mode 100644 index 000000000..61c2ba21d --- /dev/null +++ b/buildroot/package/python-pycups/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYCUPS + bool "python-pycups" + depends on BR2_PACKAGE_CUPS + depends on BR2_PACKAGE_PYTHON3 + help + Python bindings for libcups. + + https://github.com/zdohnal/pycups diff --git a/buildroot/package/python-pycups/python-pycups.hash b/buildroot/package/python-pycups/python-pycups.hash new file mode 100644 index 000000000..d1498b61c --- /dev/null +++ b/buildroot/package/python-pycups/python-pycups.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pycups/json +md5 41eef188b86d01ccfdbaaa05cf0f6ca4 pycups-2.0.1.tar.gz +sha256 57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90 pycups-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/python-pycups/python-pycups.mk b/buildroot/package/python-pycups/python-pycups.mk new file mode 100644 index 000000000..41da3641a --- /dev/null +++ b/buildroot/package/python-pycups/python-pycups.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pycups +# +################################################################################ + +PYTHON_PYCUPS_VERSION = 2.0.1 +PYTHON_PYCUPS_SOURCE = pycups-$(PYTHON_PYCUPS_VERSION).tar.gz +PYTHON_PYCUPS_SITE = https://files.pythonhosted.org/packages/0c/bb/82546806a86dc16f5eeb76f62ffdc42cce3d43aacd4e25a8b5300eec0263 +PYTHON_PYCUPS_SETUP_TYPE = distutils +PYTHON_PYCUPS_LICENSE = GPL-2.0+ +PYTHON_PYCUPS_LICENSE_FILES = COPYING +PYTHON_PYCUPS_DEPENDENCIES = cups + +$(eval $(python-package)) diff --git a/buildroot/package/python-pydal/python-pydal.hash b/buildroot/package/python-pydal/python-pydal.hash index 161395ac5..224f32856 100644 --- a/buildroot/package/python-pydal/python-pydal.hash +++ b/buildroot/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ -# sha256 from https://pypi.org/project/pyDAL/#files -sha256 65bc77933eb9ac84874702629fcb167c18dc242a00cf7cc191899796761349e4 python-pydal-20200714.1.tar.gz +# sha256 locally computed +sha256 df54be164bcdab8ffc8db88cb72333cc4b27997ce58c302dd8ade36462d799ea python-pydal-20200910.1.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/buildroot/package/python-pydal/python-pydal.mk b/buildroot/package/python-pydal/python-pydal.mk index 2ea3790a3..2cac839a9 100644 --- a/buildroot/package/python-pydal/python-pydal.mk +++ b/buildroot/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20200714.1 +PYTHON_PYDAL_VERSION = 20200910.1 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pyjwt/Config.in b/buildroot/package/python-pyjwt/Config.in index 510875ce2..f8d4f8a9b 100644 --- a/buildroot/package/python-pyjwt/Config.in +++ b/buildroot/package/python-pyjwt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYJWT bool "python-pyjwt" + depends on BR2_PACKAGE_PYTHON3 help JSON Web Token implementation in Python. diff --git a/buildroot/package/python-pyjwt/python-pyjwt.hash b/buildroot/package/python-pyjwt/python-pyjwt.hash index 62ec3559a..10875510f 100644 --- a/buildroot/package/python-pyjwt/python-pyjwt.hash +++ b/buildroot/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz -sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz +md5 7a1b1c8bfeb67c31ee4fdadefe5ff4b8 PyJWT-2.0.0.tar.gz +sha256 7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779 PyJWT-2.0.0.tar.gz # Locally computed sha256 checksums -sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE +sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE diff --git a/buildroot/package/python-pyjwt/python-pyjwt.mk b/buildroot/package/python-pyjwt/python-pyjwt.mk index dfc66e565..921591138 100644 --- a/buildroot/package/python-pyjwt/python-pyjwt.mk +++ b/buildroot/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 1.7.1 +PYTHON_PYJWT_VERSION = 2.0.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/14/6d/096dc269d105ba374d6bfd3ecb22b516795ca0572499820dadc8178d9ae1 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pylibftdi/Config.in b/buildroot/package/python-pylibftdi/Config.in index d34097465..ce815a55f 100644 --- a/buildroot/package/python-pylibftdi/Config.in +++ b/buildroot/package/python-pylibftdi/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_PYTHON_PYLIBFTDI bool "python-pylibftdi" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi -> libusb select BR2_PACKAGE_LIBFTDI help This package contains the python language binding libftdi. https://pypi.python.org/pypi/pylibftdi -comment "python-pylibftdi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-pylibftdi needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-pyparsing/python-pyparsing.hash b/buildroot/package/python-pyparsing/python-pyparsing.hash index d1161e4f8..2c52ff084 100644 --- a/buildroot/package/python-pyparsing/python-pyparsing.hash +++ b/buildroot/package/python-pyparsing/python-pyparsing.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed -md5 46d02cbe0461fe0571d51649e6006ef5 pyparsing-2.4.2.tar.gz -sha256 6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80 pyparsing-2.4.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyparsing/json +md5 f0953e47a0112f7a65aec2305ffdf7b4 pyparsing-2.4.7.tar.gz +sha256 c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 pyparsing-2.4.7.tar.gz # Locally computed sha256 checksums -sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE +sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/buildroot/package/python-pyparsing/python-pyparsing.mk b/buildroot/package/python-pyparsing/python-pyparsing.mk index f419e00d4..0dacf2371 100644 --- a/buildroot/package/python-pyparsing/python-pyparsing.mk +++ b/buildroot/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.4.2 +PYTHON_PYPARSING_VERSION = 2.4.7 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/7e/24/eaa8d7003aee23eda270099eeec754d7bf4399f75c6a011ef948304f66a2 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pytest-asyncio/Config.in b/buildroot/package/python-pytest-asyncio/Config.in new file mode 100644 index 000000000..3fa90e4e1 --- /dev/null +++ b/buildroot/package/python-pytest-asyncio/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO + bool "python-pytest-asyncio" + depends on BR2_PACKAGE_PYTHON3 # pytest + select BR2_PACKAGE_PYTHON_PYTEST # runtime + help + Pytest support for asyncio. + + https://github.com/pytest-dev/pytest-asyncio diff --git a/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.hash b/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.hash new file mode 100644 index 000000000..40541f54b --- /dev/null +++ b/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json +md5 b63593bc08f445f6e3f14c34128a68ed pytest-asyncio-0.14.0.tar.gz +sha256 9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700 pytest-asyncio-0.14.0.tar.gz +# Locally computed sha256 checksums +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.mk b/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.mk new file mode 100644 index 000000000..0645db3eb --- /dev/null +++ b/buildroot/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pytest-asyncio +# +################################################################################ + +PYTHON_PYTEST_ASYNCIO_VERSION = 0.14.0 +PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/65/09/9472d4db0625cf56d40f4e405f955faf6469be00858a273b71332f3fcd1f +PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools +PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 +PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-pytest/Config.in b/buildroot/package/python-pytest/Config.in index ad57547a1..ebbaeeea5 100644 --- a/buildroot/package/python-pytest/Config.in +++ b/buildroot/package/python-pytest/Config.in @@ -3,11 +3,11 @@ config BR2_PACKAGE_PYTHON_PYTEST depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_INICONFIG # runtime - select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime select BR2_PACKAGE_PYTHON_TOML # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable tests easy. Tests are expressive and readable—no boilerplate diff --git a/buildroot/package/python-pytest/python-pytest.hash b/buildroot/package/python-pytest/python-pytest.hash index 6f3532a59..8c2a85c92 100644 --- a/buildroot/package/python-pytest/python-pytest.hash +++ b/buildroot/package/python-pytest/python-pytest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest/json -md5 c3e7c811b2b74c60bb5fb951229ebce9 pytest-6.0.1.tar.gz -sha256 85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4 pytest-6.0.1.tar.gz +md5 91a421ffffe3310096b4273b2fa13819 pytest-6.1.2.tar.gz +sha256 c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e pytest-6.1.2.tar.gz # Locally computer sha256 sha256 7898b9b164d4f93fd9a562fd0f592935518b48c4745303964110eb7f7fe64faf LICENSE diff --git a/buildroot/package/python-pytest/python-pytest.mk b/buildroot/package/python-pytest/python-pytest.mk index c17d579f8..d47ec0f43 100644 --- a/buildroot/package/python-pytest/python-pytest.mk +++ b/buildroot/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 6.0.1 +PYTHON_PYTEST_VERSION = 6.1.2 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/20/4c/d7b19b8661be78461fff0392e33943784340424921578fe1bf300ef59831 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/d4/df/bd7c25c4fe809a17315b3fc9878edf48d31dde7b431b6836848b063c0428 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pyusb/Config.in b/buildroot/package/python-pyusb/Config.in index 1f97979c7..bba3480a1 100644 --- a/buildroot/package/python-pyusb/Config.in +++ b/buildroot/package/python-pyusb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help The PyUSB module provides easy access to the Universal @@ -8,5 +9,6 @@ config BR2_PACKAGE_PYTHON_PYUSB http://sourceforge.net/apps/trac/pyusb/ -comment "python-pyusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "python-pyusb needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-remi/Config.in b/buildroot/package/python-remi/Config.in index 553c89c34..e0c5e9bfe 100644 --- a/buildroot/package/python-remi/Config.in +++ b/buildroot/package/python-remi/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PYTHON_REMI bool "python-remi" + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Remi is a GUI library for Python applications which transpiles an application's interface into HTML to be rendered in a web diff --git a/buildroot/package/python-remi/python-remi.hash b/buildroot/package/python-remi/python-remi.hash index 5788d7d92..832bf915a 100644 --- a/buildroot/package/python-remi/python-remi.hash +++ b/buildroot/package/python-remi/python-remi.hash @@ -1,2 +1,2 @@ # sha256 from https://pypi.org/pypi/remi/json -sha256 2a1953747fd01bfda25381624f6b84d83586d247f6b47282dbafff348fd05d88 remi-2020.8.6.tar.gz +sha256 2a32658146b63d33a88aff7362679873c9df9e42a9e651c9e6642da834b3cca1 remi-2020.11.20.tar.gz diff --git a/buildroot/package/python-remi/python-remi.mk b/buildroot/package/python-remi/python-remi.mk index 04f2e1abe..566673398 100644 --- a/buildroot/package/python-remi/python-remi.mk +++ b/buildroot/package/python-remi/python-remi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REMI_VERSION = 2020.8.6 +PYTHON_REMI_VERSION = 2020.11.20 PYTHON_REMI_SOURCE = remi-$(PYTHON_REMI_VERSION).tar.gz -PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/d1/74/e2a1f5df4e57170369b221017c954ce9002901b9cc136365de0cf300e72a +PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/47/45/3110334859199be84d9b230fd31e2333b4c69832e15facc0868bed2aa3f3 PYTHON_REMI_LICENSE = Apache-2.0 PYTHON_REMI_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash index 784ad8e69..d33cabfef 100644 --- a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash +++ b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-oauthlib/json -md5 c32a54ce04123480132960a290d50792 requests-oauthlib-1.2.0.tar.gz -sha256 bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57 requests-oauthlib-1.2.0.tar.gz +md5 1ebcd55f1b1b9281940b4bc33010e2ba requests-oauthlib-1.3.0.tar.gz +sha256 b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a requests-oauthlib-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE +sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk index 41dca1abd..9fe5b186b 100644 --- a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk +++ b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.2.0 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.0 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/de/a2/f55312dfe2f7a344d0d4044fdfae12ac8a24169dc668bd55f72b27090c32 +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/23/eb/68fc8fa86e0f5789832f275c8289257d8dc44dbe93fce7ff819112b9df8f PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-requests/python-requests.hash b/buildroot/package/python-requests/python-requests.hash index 84bf2a1aa..e07c7bf5c 100644 --- a/buildroot/package/python-requests/python-requests.hash +++ b/buildroot/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 b54bff26a389e5932e8b1c4983a99ce7 requests-2.24.0.tar.gz -sha256 b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b requests-2.24.0.tar.gz +md5 514d6f7eba77ada0b8c98ec7818828db requests-2.25.1.tar.gz +sha256 27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 requests-2.25.1.tar.gz # Locally computed sha256 checksums -sha256 8837a2f33a61bcee175c028ff16d1c160aba48a3aebe1495ace709be4e62636b LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/buildroot/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk index eb3997f10..2b543c0f9 100644 --- a/buildroot/package/python-requests/python-requests.mk +++ b/buildroot/package/python-requests/python-requests.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python3-requests/python3-requests.mk -PYTHON_REQUESTS_VERSION = 2.24.0 +PYTHON_REQUESTS_VERSION = 2.25.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/da/67/672b422d9daf07365259958912ba533a0ecab839d4084c487a5fe9a5405f +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-s3transfer/python-s3transfer.hash b/buildroot/package/python-s3transfer/python-s3transfer.hash index 6b554607d..496acc045 100644 --- a/buildroot/package/python-s3transfer/python-s3transfer.hash +++ b/buildroot/package/python-s3transfer/python-s3transfer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/s3transfer/json -md5 8ca74015d9dc58af26c68276a8867eca s3transfer-0.2.1.tar.gz -sha256 6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d s3transfer-0.2.1.tar.gz +md5 e351d246498fca53e2ca2bf75c550d60 s3transfer-0.3.3.tar.gz +sha256 921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db s3transfer-0.3.3.tar.gz # Locally computed sha256 checksums -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac LICENSE.txt +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac LICENSE.txt diff --git a/buildroot/package/python-s3transfer/python-s3transfer.mk b/buildroot/package/python-s3transfer/python-s3transfer.mk index 86bdc19ea..946be261a 100644 --- a/buildroot/package/python-s3transfer/python-s3transfer.mk +++ b/buildroot/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.2.1 +PYTHON_S3TRANSFER_VERSION = 0.3.3 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/39/12/150cd55c606ebca6725683642a8e7068cd6af10f837ce5419a9f16b7fb55 +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/50/de/2b688c062107942486c81a739383b1432a72717d9a85a6a1a692f003c70c PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-serial-asyncio/python-serial-asyncio.hash b/buildroot/package/python-serial-asyncio/python-serial-asyncio.hash index 268c7d83f..f5d1d9e48 100644 --- a/buildroot/package/python-serial-asyncio/python-serial-asyncio.hash +++ b/buildroot/package/python-serial-asyncio/python-serial-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyserial-asyncio/json -md5 67244fdc11cc31cf0ebf675c271c71d8 pyserial-asyncio-0.4.tar.gz -sha256 c40677a8874d8c24d4423a97498746de776f6dbcd0efbb8fa43dcf011a589aee pyserial-asyncio-0.4.tar.gz +md5 64d15bfb20982b2129b02070321f49f3 pyserial-asyncio-0.5.tar.gz +sha256 1641e5433a866eeaf6464b3ab88b741e7a89dd8cd0f851b3343b15f425138d33 pyserial-asyncio-0.5.tar.gz # Locally computed sha256 checksums -sha256 f8ded3a7460d3b2850b0cf673e986c70e9d997fd0732d8ab3f3c84f1f191087d LICENSE.txt +sha256 ebc84abdbdec7f9fa6962612c110123897db47b79529d5ae41191ef584b88f2c LICENSE.txt diff --git a/buildroot/package/python-serial-asyncio/python-serial-asyncio.mk b/buildroot/package/python-serial-asyncio/python-serial-asyncio.mk index 39c3476d9..bc95f2c44 100644 --- a/buildroot/package/python-serial-asyncio/python-serial-asyncio.mk +++ b/buildroot/package/python-serial-asyncio/python-serial-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERIAL_ASYNCIO_VERSION = 0.4 +PYTHON_SERIAL_ASYNCIO_VERSION = 0.5 PYTHON_SERIAL_ASYNCIO_SOURCE = pyserial-asyncio-$(PYTHON_SERIAL_ASYNCIO_VERSION).tar.gz -PYTHON_SERIAL_ASYNCIO_SITE = https://files.pythonhosted.org/packages/41/3f/e26f71269cbc0890a527a736d9afc5c0d5838a2c188be680558d635b7dc2 +PYTHON_SERIAL_ASYNCIO_SITE = https://files.pythonhosted.org/packages/e1/97/8dd1bf656796668ed4bd86058c815b130303a00a7b70cf79758e4918814a PYTHON_SERIAL_ASYNCIO_LICENSE = BSD-3-Clause PYTHON_SERIAL_ASYNCIO_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_ASYNCIO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-serial/python-serial.hash b/buildroot/package/python-serial/python-serial.hash index 96209a996..d885d3c0c 100644 --- a/buildroot/package/python-serial/python-serial.hash +++ b/buildroot/package/python-serial/python-serial.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyserial/json -md5 ed6183b15519a0ae96675e9c3330c69b pyserial-3.4.tar.gz -sha256 6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 pyserial-3.4.tar.gz +md5 1cf25a76da59b530dbfc2cf99392dc83 pyserial-3.5.tar.gz +sha256 3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb pyserial-3.5.tar.gz # Locally computed sha256 checksums -sha256 a89d951d157e2c199fbbe7ecf8d41bc3bc93de166db524aa6b9b610dbccc832d LICENSE.txt +sha256 f91cb9813de6a5b142b8f7f2dede630b5134160aedaeaf55f4d6a7e2593ca3f3 LICENSE.txt diff --git a/buildroot/package/python-serial/python-serial.mk b/buildroot/package/python-serial/python-serial.mk index d583ac65a..249ea9d5a 100644 --- a/buildroot/package/python-serial/python-serial.mk +++ b/buildroot/package/python-serial/python-serial.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERIAL_VERSION = 3.4 +PYTHON_SERIAL_VERSION = 3.5 PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz -PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/cc/74/11b04703ec416717b247d789103277269d567db575d2fd88f25d9767fe3d +PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/1e/7d/ae3f0a63f41e4d2f6cb66a5b57197850f919f59e558159a4dd3a818f5082 PYTHON_SERIAL_LICENSE = BSD-3-Clause PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-setuptools/python-setuptools.mk b/buildroot/package/python-setuptools/python-setuptools.mk index 2cb575ae2..08a180ce0 100644 --- a/buildroot/package/python-setuptools/python-setuptools.mk +++ b/buildroot/package/python-setuptools/python-setuptools.mk @@ -11,6 +11,8 @@ PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE +PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python +PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 diff --git a/buildroot/package/python-sockjs/python-sockjs.hash b/buildroot/package/python-sockjs/python-sockjs.hash index 55ea9dc64..137b54a89 100644 --- a/buildroot/package/python-sockjs/python-sockjs.hash +++ b/buildroot/package/python-sockjs/python-sockjs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sockjs/json -md5 369417bd103f841f236a8623ea29353c sockjs-0.10.0.tar.gz -sha256 005a820387bb4611b59341eac091b05d4204050dd42e4ea6cfb83607e23e2f06 sockjs-0.10.0.tar.gz +md5 e28c1a82aa84c3994817905090abb169 sockjs-0.11.0.tar.gz +sha256 0347d404ed9ef3196506787ed8018f87ee4e2d0baea49d420cdd53a969bec229 sockjs-0.11.0.tar.gz # Locally computed sha256 checksums -sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt +sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt diff --git a/buildroot/package/python-sockjs/python-sockjs.mk b/buildroot/package/python-sockjs/python-sockjs.mk index e0f58e2b6..0aea63f93 100644 --- a/buildroot/package/python-sockjs/python-sockjs.mk +++ b/buildroot/package/python-sockjs/python-sockjs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SOCKJS_VERSION = 0.10.0 +PYTHON_SOCKJS_VERSION = 0.11.0 PYTHON_SOCKJS_SOURCE = sockjs-$(PYTHON_SOCKJS_VERSION).tar.gz -PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/35/0e/6aa4f3283b064b04a0c7f3859c8c2c0b736c05cfb07853b6d94073c1bf63 +PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/88/e9/af7b321f70325fd2af3941aa147efd097156150da635e09efc7ccf70e54d PYTHON_SOCKJS_SETUP_TYPE = setuptools PYTHON_SOCKJS_LICENSE = Apache-2.0 PYTHON_SOCKJS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-thrift/Config.in b/buildroot/package/python-thrift/Config.in index 1ecfda357..71fef5be8 100644 --- a/buildroot/package/python-thrift/Config.in +++ b/buildroot/package/python-thrift/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_THRIFT bool "python-thrift" select BR2_PACKAGE_PYTHON_SIX # runtime help - python-thrift is a Python bindings for the Apache Thrift RPC - system. + Python bindings for the Apache Thrift RPC system. - http://thrift.apache.org/ + https://thrift.apache.org diff --git a/buildroot/package/python-thrift/python-thrift.hash b/buildroot/package/python-thrift/python-thrift.hash index 56d99f2a5..1d1d62890 100644 --- a/buildroot/package/python-thrift/python-thrift.hash +++ b/buildroot/package/python-thrift/python-thrift.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/thrift/json -md5 36165d5c80e6b101dbe9fcf7ef524d51 thrift-0.11.0.tar.gz -sha256 7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b thrift-0.11.0.tar.gz +md5 c3bc8d9a910d2c9ce26f2ad1f7c96762 thrift-0.13.0.tar.gz +sha256 9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89 thrift-0.13.0.tar.gz # Locally computed sha256 checksums -sha256 6a62a493bd7c741378619ff61c56282d64f3ad033dc8154b67c808311960bb02 setup.py +sha256 c13578ae9d0529d0252e1c7375b917bacf58723dce1fcd40c7ed59183401b468 LICENSE diff --git a/buildroot/package/python-thrift/python-thrift.mk b/buildroot/package/python-thrift/python-thrift.mk index 21f2355f6..3a908ca91 100644 --- a/buildroot/package/python-thrift/python-thrift.mk +++ b/buildroot/package/python-thrift/python-thrift.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.11.0 +PYTHON_THRIFT_VERSION = 0.13.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/c6/b4/510617906f8e0c5660e7d96fbc5585113f83ad547a3989b80297ac72a74c -PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = setup.py +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/97/1e/3284d19d7be99305eda145b8aa46b0c33244e4a496ec66440dac19f8274d PYTHON_THRIFT_SETUP_TYPE = setuptools +PYTHON_THRIFT_LICENSE = Apache-2.0 +PYTHON_THRIFT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-txdbus/python-txdbus.hash b/buildroot/package/python-txdbus/python-txdbus.hash index 60740e29d..5d386272b 100644 --- a/buildroot/package/python-txdbus/python-txdbus.hash +++ b/buildroot/package/python-txdbus/python-txdbus.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/txdbus/json -sha256 eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217 txdbus-1.1.1.tar.gz -md5 ce8a0e0a17cdbada725e3159802ae75f txdbus-1.1.1.tar.gz +md5 d397357dee78750385f92ca9c6c1f063 txdbus-1.1.2.tar.gz +sha256 8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97 txdbus-1.1.2.tar.gz diff --git a/buildroot/package/python-txdbus/python-txdbus.mk b/buildroot/package/python-txdbus/python-txdbus.mk index d8e7a7bee..4e4ddf03c 100644 --- a/buildroot/package/python-txdbus/python-txdbus.mk +++ b/buildroot/package/python-txdbus/python-txdbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXDBUS_VERSION = 1.1.1 +PYTHON_TXDBUS_VERSION = 1.1.2 PYTHON_TXDBUS_SOURCE = txdbus-$(PYTHON_TXDBUS_VERSION).tar.gz -PYTHON_TXDBUS_SITE = https://files.pythonhosted.org/packages/4a/68/dfd06f3f349999cbbb31eade239fe76fbff2d6a905eb7d20449666d1b2ce +PYTHON_TXDBUS_SITE = https://files.pythonhosted.org/packages/d6/ef/43377e975b8d37862fd1166a4998f908651f5e205ddc9bbd7a57c6e5b4b6 PYTHON_TXDBUS_SETUP_TYPE = setuptools PYTHON_TXDBUS_LICENSE = MIT diff --git a/buildroot/package/python-typing-extensions/Config.in b/buildroot/package/python-typing-extensions/Config.in new file mode 100644 index 000000000..0c7c74c5f --- /dev/null +++ b/buildroot/package/python-typing-extensions/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS + bool "python-typing-extensions" + select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + help + Backported and Experimental Type Hints for Python 3.5+. + + https://github.com/python/typing/blob/master/typing_extensions/README.rst diff --git a/buildroot/package/python-typing-extensions/python-typing-extensions.hash b/buildroot/package/python-typing-extensions/python-typing-extensions.hash new file mode 100644 index 000000000..4c76caba4 --- /dev/null +++ b/buildroot/package/python-typing-extensions/python-typing-extensions.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/typing_extensions/json +md5 5fcbfcb22e6f8c9bf23fb9f8e020f6ee typing_extensions-3.7.4.3.tar.gz +sha256 99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c typing_extensions-3.7.4.3.tar.gz +# Locally computed sha256 checksums +sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/buildroot/package/python-typing-extensions/python-typing-extensions.mk b/buildroot/package/python-typing-extensions/python-typing-extensions.mk new file mode 100644 index 000000000..2bcf1342a --- /dev/null +++ b/buildroot/package/python-typing-extensions/python-typing-extensions.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-typing-extensions +# +################################################################################ + +PYTHON_TYPING_EXTENSIONS_VERSION = 3.7.4.3 +PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/16/06/0f7367eafb692f73158e5c5cbca1aec798cdf78be5167f6415dd4205fa32 +PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = setuptools +PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 +PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-typing/python-typing.hash b/buildroot/package/python-typing/python-typing.hash index 8796a4c2e..438ecb072 100644 --- a/buildroot/package/python-typing/python-typing.hash +++ b/buildroot/package/python-typing/python-typing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing/json -md5 0a1ebd4af65b4769e33459004eb20345 typing-3.7.4.1.tar.gz -sha256 91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 typing-3.7.4.1.tar.gz +md5 276296e7b6b617d4f8b5e8874f240bd4 typing-3.7.4.3.tar.gz +sha256 1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 typing-3.7.4.3.tar.gz # Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE +sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/buildroot/package/python-typing/python-typing.mk b/buildroot/package/python-typing/python-typing.mk index 689448124..efb219628 100644 --- a/buildroot/package/python-typing/python-typing.mk +++ b/buildroot/package/python-typing/python-typing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_VERSION = 3.7.4.1 +PYTHON_TYPING_VERSION = 3.7.4.3 PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/67/b0/b2ea2bd67bfb80ea5d12a5baa1d12bda002cab3b6c9b48f7708cd40c34bf +PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/05/d9/6eebe19d46bd05360c9a9aae822e67a80f9242aabbfc58b641b957546607 PYTHON_TYPING_SETUP_TYPE = setuptools PYTHON_TYPING_LICENSE = Python-2.0, others PYTHON_TYPING_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash index e29966672..dbc85c911 100644 --- a/buildroot/package/python-urllib3/python-urllib3.hash +++ b/buildroot/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 d47dd21a6e66a03c3633cac468ffd010 urllib3-1.25.11.tar.gz -sha256 8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 urllib3-1.25.11.tar.gz +md5 2233256ccfe140a915f68703f8c2cc1f urllib3-1.26.2.tar.gz +sha256 19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08 urllib3-1.26.2.tar.gz # Locally computed sha256 checksums -sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt +sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index 88e8d2097..1f212ec69 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.25.11 +PYTHON_URLLIB3_VERSION = 1.26.2 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/76/d9/bbbafc76b18da706451fa91bc2ebe21c0daf8868ef3c30b869ac7cb7f01d +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/29/e6/d1a1d78c439cad688757b70f26c50a53332167c364edb0134cadd280e234 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-yarl/python-yarl.hash b/buildroot/package/python-yarl/python-yarl.hash index 95ee7ef88..783702c74 100644 --- a/buildroot/package/python-yarl/python-yarl.hash +++ b/buildroot/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 a9b20bf0b8a6962e1101b28908a67bf8 yarl-1.5.1.tar.gz -sha256 c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6 yarl-1.5.1.tar.gz +md5 3b6f2da3db8c645a9440375fd6a414eb yarl-1.6.3.tar.gz +sha256 8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10 yarl-1.6.3.tar.gz # Locally computed sha256 checksums sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE diff --git a/buildroot/package/python-yarl/python-yarl.mk b/buildroot/package/python-yarl/python-yarl.mk index 0b92e6281..32ec47706 100644 --- a/buildroot/package/python-yarl/python-yarl.mk +++ b/buildroot/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.5.1 +PYTHON_YARL_VERSION = 1.6.3 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/ac/dd/59768bb3fa08e8b23e91575bca3ff8d2edbfbceebec8c59eaa24c4215791 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/97/e7/af7219a0fe240e8ef6bb555341a63c43045c21ab0392b4435e754b716fa1 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-yatl/python-yatl.hash b/buildroot/package/python-yatl/python-yatl.hash index 9238e71b2..534d74b65 100644 --- a/buildroot/package/python-yatl/python-yatl.hash +++ b/buildroot/package/python-yatl/python-yatl.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/yatl/json -md5 930be78b3d6e33f3f920619d673c345a yatl-20200430.1.tar.gz -sha256 5220390b27f010046642c00aded9ffc694e383a3d7a47985c8809d8482c8478a yatl-20200430.1.tar.gz +md5 3368146e56b35ba5569ff64054c2a3fd yatl-20200711.1.tar.gz +sha256 d37b90e7679d2d2873ac634e66adfcd0cd7e4c34438e76a3192cf984faba2595 yatl-20200711.1.tar.gz diff --git a/buildroot/package/python-yatl/python-yatl.mk b/buildroot/package/python-yatl/python-yatl.mk index fca39bb5e..6df5fcd83 100644 --- a/buildroot/package/python-yatl/python-yatl.mk +++ b/buildroot/package/python-yatl/python-yatl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YATL_VERSION = 20200430.1 +PYTHON_YATL_VERSION = 20200711.1 PYTHON_YATL_SOURCE = yatl-$(PYTHON_YATL_VERSION).tar.gz -PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/7f/bd/aa36c1a1d876757e3fa365e6c455097ebd3f2e8e7ded23e75901ff9c9ecf +PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/b4/f5/b6020f8ccb3e156fbe0ed7e4a35fbdce4d6a7ef6a9ab0c54cb8880fb7c04 PYTHON_YATL_SETUP_TYPE = setuptools PYTHON_YATL_LICENSE = BSD-3-Clause diff --git a/buildroot/package/python/Config.in b/buildroot/package/python/Config.in index bded00c9e..ab6950cae 100644 --- a/buildroot/package/python/Config.in +++ b/buildroot/package/python/Config.in @@ -3,7 +3,7 @@ comment "python needs a toolchain w/ wchar, threads, dynamic library" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_PYTHON - bool "python" + bool "python2.7 (deprecated)" depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk index 10718f435..f4f9f8563 100644 --- a/buildroot/package/python/python.mk +++ b/buildroot/package/python/python.mk @@ -10,6 +10,7 @@ PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python-2.0, others PYTHON_LICENSE_FILES = LICENSE +PYTHON_CPE_ID_VENDOR = python PYTHON_LIBTOOL_PATCH = NO # Python needs itself to be built, so in order to cross-compile diff --git a/buildroot/package/python3-jinja2/python3-jinja2.hash b/buildroot/package/python3-jinja2/python3-jinja2.hash new file mode 120000 index 000000000..543e981aa --- /dev/null +++ b/buildroot/package/python3-jinja2/python3-jinja2.hash @@ -0,0 +1 @@ +../python-jinja2/python-jinja2.hash \ No newline at end of file diff --git a/buildroot/package/python3-jinja2/python3-jinja2.mk b/buildroot/package/python3-jinja2/python3-jinja2.mk new file mode 100644 index 000000000..cc8b1ff86 --- /dev/null +++ b/buildroot/package/python3-jinja2/python3-jinja2.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python3-jinja2 +# +################################################################################ + +PYTHON3_JINJA2_VERSION = 2.11.2 +PYTHON3_JINJA2_SOURCE = Jinja2-$(PYTHON3_JINJA2_VERSION).tar.gz +PYTHON3_JINJA2_SITE = https://files.pythonhosted.org/packages/64/a7/45e11eebf2f15bf987c3bc11d37dcc838d9dc81250e67e4c5968f6008b6c +PYTHON3_JINJA2_SETUP_TYPE = setuptools +PYTHON3_JINJA2_LICENSE = BSD-3-Clause +PYTHON3_JINJA2_LICENSE_FILES = LICENSE.rst + +HOST_PYTHON3_JINJA2_NEEDS_HOST_PYTHON = python3 +# In host build, setup.py tries to download markupsafe if it is not installed +HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python3-markupsafe + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-mako/python3-mako.mk b/buildroot/package/python3-mako/python3-mako.mk index 0296c68fc..fd6b2ed49 100644 --- a/buildroot/package/python3-mako/python3-mako.mk +++ b/buildroot/package/python3-mako/python3-mako.mk @@ -6,7 +6,7 @@ # Please keep in sync with # package/python-mako/python-mako.mk -PYTHON3_MAKO_VERSION = 1.1.2 +PYTHON3_MAKO_VERSION = 1.1.3 PYTHON3_MAKO_SOURCE = Mako-$(PYTHON3_MAKO_VERSION).tar.gz PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/42/64/fc7c506d14d8b6ed363e7798ffec2dfe4ba21e14dda4cfab99f4430cba3a PYTHON3_MAKO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python3-markupsafe/python3-markupsafe.hash b/buildroot/package/python3-markupsafe/python3-markupsafe.hash new file mode 120000 index 000000000..947cfa12d --- /dev/null +++ b/buildroot/package/python3-markupsafe/python3-markupsafe.hash @@ -0,0 +1 @@ +../python-markupsafe/python-markupsafe.hash \ No newline at end of file diff --git a/buildroot/package/python3-markupsafe/python3-markupsafe.mk b/buildroot/package/python3-markupsafe/python3-markupsafe.mk new file mode 100644 index 000000000..58f6e67b6 --- /dev/null +++ b/buildroot/package/python3-markupsafe/python3-markupsafe.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python3-markupsafe +# +################################################################################ + +PYTHON3_MARKUPSAFE_VERSION = 1.1.1 +PYTHON3_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON3_MARKUPSAFE_VERSION).tar.gz +PYTHON3_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 +PYTHON3_MARKUPSAFE_SETUP_TYPE = setuptools +PYTHON3_MARKUPSAFE_LICENSE = BSD-3-Clause +PYTHON3_MARKUPSAFE_LICENSE_FILES = LICENSE.rst + +HOST_PYTHON3_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-ply/python3-ply.hash b/buildroot/package/python3-ply/python3-ply.hash new file mode 120000 index 000000000..5e07165c9 --- /dev/null +++ b/buildroot/package/python3-ply/python3-ply.hash @@ -0,0 +1 @@ +../python-ply/python-ply.hash \ No newline at end of file diff --git a/buildroot/package/python3-ply/python3-ply.mk b/buildroot/package/python3-ply/python3-ply.mk new file mode 100644 index 000000000..15f66a49d --- /dev/null +++ b/buildroot/package/python3-ply/python3-ply.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python3-ply +# +################################################################################ + +PYTHON3_PLY_VERSION = 3.11 +PYTHON3_PLY_SOURCE = ply-$(PYTHON3_PLY_VERSION).tar.gz +PYTHON3_PLY_SITE = https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da +PYTHON3_PLY_SETUP_TYPE = setuptools +PYTHON3_PLY_LICENSE = BSD-3-Clause +PYTHON3_PLY_LICENSE_FILES = README.md + +HOST_PYTHON3_PLY_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk index 92ac248d5..bd7602c9d 100644 --- a/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk +++ b/buildroot/package/python3-pycryptodomex/python3-pycryptodomex.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-pycryptodomex/python-pycryptodomex.mk -PYTHON3_PYCRYPTODOMEX_VERSION = 3.9.8 +PYTHON3_PYCRYPTODOMEX_VERSION = 3.9.9 PYTHON3_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON3_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/f5/79/9d9206688385d1e7a5ff925e7aab1d685636256e34a409037aa7adbbe611 +PYTHON3_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/90/f4a934bffae029e16fb33f3bd87014a0a18b4bec591249c4fc01a18d3ab6 PYTHON3_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON3_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/buildroot/package/python3-requests/python3-requests.mk b/buildroot/package/python3-requests/python3-requests.mk index cd6a7e126..b67d71a18 100644 --- a/buildroot/package/python3-requests/python3-requests.mk +++ b/buildroot/package/python3-requests/python3-requests.mk @@ -5,9 +5,9 @@ ################################################################################ # Please keep in sync with package/python-requests/python-requests.mk -PYTHON3_REQUESTS_VERSION = 2.24.0 +PYTHON3_REQUESTS_VERSION = 2.25.1 PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz -PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/f5/4f/280162d4bd4d8aad241a21aecff7a6e46891b905a4341e7ab549ebaf7915 +PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b PYTHON3_REQUESTS_SETUP_TYPE = setuptools PYTHON3_REQUESTS_LICENSE = Apache-2.0 PYTHON3_REQUESTS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python3/Config.in b/buildroot/package/python3/Config.in index 0c5018f0b..3a9dd4b2f 100644 --- a/buildroot/package/python3/Config.in +++ b/buildroot/package/python3/Config.in @@ -41,6 +41,11 @@ menu "core python3 modules" comment "The following modules are unusual or require extra libraries" +config BR2_PACKAGE_PYTHON3_2TO3 + bool "2to3 module" + help + code translation from python 2 to 3 + config BR2_PACKAGE_PYTHON3_BZIP2 bool "bz2 module" select BR2_PACKAGE_BZIP2 diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash index 2165daffc..753973721 100644 --- a/buildroot/package/python3/python3.hash +++ b/buildroot/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-391/ -md5 61981498e75ac8f00adcb908281fadb6 Python-3.9.1.tar.xz +# From https://www.python.org/downloads/release/python-392/ +md5 f0dc9000312abeb16de4eccce9a870ab Python-3.9.2.tar.xz # Locally computed -sha256 991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff Python-3.9.1.tar.xz -sha256 1dceef1677a39befa8bf0285ab2db441ba117520bb2de839547ace006a17750d LICENSE +sha256 3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d Python-3.9.2.tar.xz +sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index f2516dee9..63d6c3f53 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -49,6 +49,12 @@ endif PYTHON3_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PYTHON3_2TO3),y) +PYTHON3_CONF_OPTS += --enable-lib2to3 +else +PYTHON3_CONF_OPTS += --disable-lib2to3 +endif + ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) PYTHON3_DEPENDENCIES += readline else @@ -156,7 +162,6 @@ PYTHON3_CONF_OPTS += \ --with-system-ffi \ --disable-pydoc \ --disable-test-modules \ - --disable-lib2to3 \ --disable-tk \ --disable-nis \ --disable-idle3 \ diff --git a/buildroot/package/qcom-db410c-firmware/Config.in b/buildroot/package/qcom-db410c-firmware/Config.in new file mode 100644 index 000000000..9f6885749 --- /dev/null +++ b/buildroot/package/qcom-db410c-firmware/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_QCOM_DB410C_FIRMWARE + bool "qcom-db410c-firmware" + select BR2_PACKAGE_HOST_MTOOLS + help + Wifi/BT firmware for Qualcomm Dragonboard 410c SBC. + + https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/ diff --git a/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.hash b/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.hash new file mode 100644 index 000000000..e8ac31eb3 --- /dev/null +++ b/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 46953b974c5c58c7ca66db414437c0268b033ac9d28127e98d9c4e1a49359da5 linux-board-support-package-r1034.2.1.zip +sha256 11e60ad6f83c2a86e40dca374c24230b53650dd3e0adf2e72c15f8cafedc2e5a LICENSE diff --git a/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.mk new file mode 100644 index 000000000..9ef32cc9d --- /dev/null +++ b/buildroot/package/qcom-db410c-firmware/qcom-db410c-firmware.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# qcom-db410c-firmware +# +################################################################################ + +QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1 +QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION) +QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip +QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware +QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license +QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE +QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools + +define QCOM_DB410C_FIRMWARE_EXTRACT_CMDS + $(UNZIP) -d $(@D) \ + $(QCOM_DB410C_FIRMWARE_DL_DIR)/$(QCOM_DB410C_FIRMWARE_SOURCE) + mv $(@D)/$(QCOM_DB410C_FIRMWARE_BASE)/* $(@D) + rmdir $(@D)/$(QCOM_DB410C_FIRMWARE_BASE) +endef + +# Install the Wifi/Bt firmware blobs to target. These commands are +# based on firmware-qcom-dragonboard410c_*.bb in the OpenEmbedded +# meta-qcom layer, see https://github.com/ndechesne/meta-qcom +define QCOM_DB410C_FIRMWARE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 \ + $(@D)/efs-seed/fs_image_linux.tar.gz.mbn.img \ + $(TARGET_DIR)/boot/modem_fsg + + $(INSTALL) -d $(TARGET_DIR)/lib/firmware + cp -r $(@D)/proprietary-linux/wlan \ + $(TARGET_DIR)/lib/firmware/ + + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/qcom/msm8916 + MTOOLS_SKIP_CHECK=1 $(HOST_DIR)/bin/mcopy -n -i \ + $(@D)/bootloaders-linux/NON-HLOS.bin \ + ::image/modem.* ::image/mba.mbn ::image/wcnss.* \ + $(TARGET_DIR)/lib/firmware/qcom/msm8916 +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/qdecoder/qdecoder.hash b/buildroot/package/qdecoder/qdecoder.hash index 0c95d2c27..e3fb83759 100644 --- a/buildroot/package/qdecoder/qdecoder.hash +++ b/buildroot/package/qdecoder/qdecoder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 01d4852b9343757abe98bbdb9d4bf0dc142ccb602ec921906ddde32c16164376 qdecoder-12.0.7.tar.gz -sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING +sha256 3911576ad8766697a9c8c767458edc953ae686eb53cd31d21e38edd7831ed9aa qdecoder-12.0.8.tar.gz +sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING diff --git a/buildroot/package/qdecoder/qdecoder.mk b/buildroot/package/qdecoder/qdecoder.mk index ab95885c3..12784fc45 100644 --- a/buildroot/package/qdecoder/qdecoder.mk +++ b/buildroot/package/qdecoder/qdecoder.mk @@ -4,7 +4,7 @@ # ################################################################################ -QDECODER_VERSION = 12.0.7 +QDECODER_VERSION = 12.0.8 QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2 QDECODER_LICENSE_FILES = COPYING diff --git a/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index 548ec3e76..841708995 100644 --- a/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -18,10 +18,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4be78eb9b3..0a690bec55 100644 +index 4ebe25461a..0496674fbd 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c -@@ -508,7 +508,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +@@ -536,7 +536,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; diff --git a/buildroot/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch b/buildroot/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch new file mode 100644 index 000000000..2510dc9cd --- /dev/null +++ b/buildroot/package/qemu/0003-hw-usb-host-libusb.c-fix-build-with-kernel-5.0.patch @@ -0,0 +1,43 @@ +From ecd615dfe328e3ab551cea3ba243d908936ed382 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Dec 2020 21:27:31 +0100 +Subject: [PATCH] hw/usb/host-libusb.c: fix build with kernel < 5.0 + +USBDEVFS_GET_SPEED is used since version 5.2.0 and +https://gitlab.com/qemu-project/qemu/-/commit/202d69a715a4b1824dcd7ec1683d027ed2bae6d3 +resulting in the following build failure with kernel < 5.0: + +../hw/usb/host-libusb.c: In function 'usb_host_open': +../hw/usb/host-libusb.c:953:32: error: 'USBDEVFS_GET_SPEED' undeclared (first use in this function); did you mean 'USBDEVFS_GETDRIVER'? + int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL); + ^~~~~~~~~~~~~~~~~~ + USBDEVFS_GETDRIVER + +A tentative was made to fix this build failure with +https://gitlab.com/qemu-project/qemu/-/commit/4969e697c15ac536d5c0700381d5d026ef7f0588 + +However, the assumtion that distros with old kernels also have old +libusb is just wrong so also add a check for defined(USBDEVFS_GET_SPEED) + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to qemu-devel@nongnu.org] +--- + hw/usb/host-libusb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c +index b950501d10..0343300d3e 100644 +--- a/hw/usb/host-libusb.c ++++ b/hw/usb/host-libusb.c +@@ -941,7 +941,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) + usb_host_ep_update(s); + + libusb_speed = libusb_get_device_speed(dev); +-#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) ++#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) && defined(USBDEVFS_GET_SPEED) + if (hostfd && libusb_speed == 0) { + /* + * Workaround libusb bug: libusb_get_device_speed() does not +-- +2.29.2 + diff --git a/buildroot/package/qemu/0004-meson-add-tests-option.patch b/buildroot/package/qemu/0004-meson-add-tests-option.patch new file mode 100644 index 000000000..aff8a0f9f --- /dev/null +++ b/buildroot/package/qemu/0004-meson-add-tests-option.patch @@ -0,0 +1,92 @@ +From c24f6cc8f847a4f90cd8fe0f94604862c5ac4a5e Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 21 Dec 2020 22:12:14 +0100 +Subject: [PATCH] meson: add tests option + +tests/fp/fp-bench.c use fenv.h that is not always provided +by the libc (uClibc). + +To workaround this issue, add an new meson option to +disable tests while building Qemu. + +Fixes: +http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log + +Signed-off-by: Romain Naour +--- + configure | 7 +++++++ + meson.build | 5 ++++- + meson_options.txt | 2 ++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 18c26e0389..7cceae4418 100755 +--- a/configure ++++ b/configure +@@ -449,6 +449,7 @@ meson="" + ninja="" + skip_meson=no + gettext="" ++tests="auto" + + bogus_os="no" + malloc_trim="auto" +@@ -1525,6 +1526,10 @@ for opt do + ;; + --disable-libdaxctl) libdaxctl=no + ;; ++ --disable-tests) tests="disabled" ++ ;; ++ --enable-tests) tests="enabled" ++ ;; + *) + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" +@@ -1850,6 +1855,7 @@ disabled with --disable-FEATURE, default is enabled if available: + xkbcommon xkbcommon support + rng-none dummy RNG, avoid using /dev/(u)random and getrandom() + libdaxctl libdaxctl support ++ tests build tests + + NOTE: The object files are built at the place where configure is launched + EOF +@@ -7014,6 +7020,7 @@ NINJA=$ninja $meson setup \ + -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ + -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ + -Dvhost_user_blk_server=$vhost_user_blk_server \ ++ -Dtests=$tests \ + $cross_arg \ + "$PWD" "$source_path" + +diff --git a/meson.build b/meson.build +index e3386196ba..7f4efdc347 100644 +--- a/meson.build ++++ b/meson.build +@@ -1944,7 +1944,10 @@ subdir('scripts') + subdir('tools') + subdir('pc-bios') + subdir('docs') +-subdir('tests') ++if get_option('tests').enabled() ++ subdir('tests') ++endif ++ + if 'CONFIG_GTK' in config_host + subdir('po') + endif +diff --git a/meson_options.txt b/meson_options.txt +index f6f64785fe..81bffbfe87 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -66,6 +66,8 @@ option('virtiofsd', type: 'feature', value: 'auto', + description: 'build virtiofs daemon (virtiofsd)') + option('vhost_user_blk_server', type: 'feature', value: 'auto', + description: 'build vhost-user-blk server') ++option('tests', type : 'feature', value : 'auto', ++ description: 'Tests build support') + + option('capstone', type: 'combo', value: 'auto', + choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], +-- +2.29.2 + diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host index a7c0f7bf5..316379706 100644 --- a/buildroot/package/qemu/Config.in.host +++ b/buildroot/package/qemu/Config.in.host @@ -88,7 +88,11 @@ config BR2_PACKAGE_HOST_QEMU_VIRTFS config BR2_PACKAGE_HOST_QEMU_USB bool "USB passthrough support" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help Enables USB passthrough support from guest to host. +comment "USB passthrough support needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 + endif diff --git a/buildroot/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash index 317c0b1a4..7d9936adb 100644 --- a/buildroot/package/qemu/qemu.hash +++ b/buildroot/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5 qemu-5.1.0.tar.xz -sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc qemu-5.2.0.tar.xz +sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk index 2bac96bd6..b552ea139 100644 --- a/buildroot/package/qemu/qemu.mk +++ b/buildroot/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 5.1.0 +QEMU_VERSION = 5.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -12,10 +12,15 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; # the non-(L)GPL license texts are specified in the affected # individual source files. +QEMU_CPE_ID_VENDOR = qemu #------------------------------------------------------------- + +# The build system is now partly based on Meson. +# However, building is still done with configure and make as in previous versions of QEMU. + # Target-qemu -QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -163,7 +168,8 @@ define QEMU_CONFIGURE_CMDS --prefix=/usr \ --cross-prefix=$(TARGET_CROSS) \ --audio-drv-list= \ - --python=$(HOST_DIR)/bin/python3 \ + --meson=$(HOST_DIR)/bin/meson \ + --ninja=$(HOST_DIR)/bin/ninja \ --enable-kvm \ --enable-attr \ --enable-vhost-net \ @@ -194,6 +200,9 @@ define QEMU_CONFIGURE_CMDS --disable-capstone \ --disable-git-update \ --disable-opengl \ + --disable-vhost-user-blk-server \ + --disable-virtiofsd \ + --disable-tests \ $(QEMU_OPTS) endef @@ -212,7 +221,7 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 # BR ARCH qemu # ------- ---- @@ -327,16 +336,20 @@ define HOST_QEMU_CONFIGURE_CMDS --host-cc="$(HOSTCC)" \ --extra-cflags="$(HOST_QEMU_CFLAGS)" \ --extra-ldflags="$(HOST_LDFLAGS)" \ - --python=$(HOST_DIR)/bin/python3 \ + --meson=$(HOST_DIR)/bin/meson \ + --ninja=$(HOST_DIR)/bin/ninja \ --disable-bzip2 \ --disable-containers \ --disable-curl \ --disable-libssh \ --disable-linux-io-uring \ --disable-sdl \ + --disable-vhost-user-blk-server \ + --disable-virtiofsd \ --disable-vnc-jpeg \ --disable-vnc-png \ --disable-vnc-sasl \ + --disable-tests \ $(HOST_QEMU_OPTS) endef diff --git a/buildroot/package/rcw/Config.in.host b/buildroot/package/qoriq-rcw/Config.in.host similarity index 86% rename from buildroot/package/rcw/Config.in.host rename to buildroot/package/qoriq-rcw/Config.in.host index a9253958d..1f69c0389 100644 --- a/buildroot/package/rcw/Config.in.host +++ b/buildroot/package/qoriq-rcw/Config.in.host @@ -1,5 +1,5 @@ -config BR2_PACKAGE_HOST_RCW - bool "host rcw" +config BR2_PACKAGE_HOST_QORIQ_RCW + bool "host qoriq-rcw" help This package provides an reset configuration word(RCW) compiler to build NXP QoriQ/LS PBL/RCW binary(s). @@ -11,9 +11,9 @@ config BR2_PACKAGE_HOST_RCW https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ -if BR2_PACKAGE_HOST_RCW +if BR2_PACKAGE_HOST_QORIQ_RCW -config BR2_PACKAGE_HOST_RCW_CUSTOM_PATH +config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH string "RCW Source file paths" help Space-separated list of .rcw and .rcwi files, that will be diff --git a/buildroot/package/qoriq-rcw/qoriq-rcw.hash b/buildroot/package/qoriq-rcw/qoriq-rcw.hash new file mode 100644 index 000000000..5848799a0 --- /dev/null +++ b/buildroot/package/qoriq-rcw/qoriq-rcw.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 bbb595f0b68beb114620f7aeaff073b90938329e10cd6b36daa9f2087f3119a0 qoriq-rcw-LSDK-20.12-br1.tar.gz +sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/buildroot/package/qoriq-rcw/qoriq-rcw.mk b/buildroot/package/qoriq-rcw/qoriq-rcw.mk new file mode 100644 index 000000000..ecc5ce5eb --- /dev/null +++ b/buildroot/package/qoriq-rcw/qoriq-rcw.mk @@ -0,0 +1,67 @@ +################################################################################ +# +# qoriq-rcw +# +################################################################################ + +QORIQ_RCW_VERSION = LSDK-20.12 +QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw +QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_LICENSE = BSD-3-Clause +QORIQ_RCW_LICENSE_FILES = LICENSE + +HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) + +QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH)) + +ifneq ($(QORIQ_RCW_FILES),) +QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES)) +# Get the name of the custom rcw file from the custom list +QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES))) + +# Error if there are no or more than one .rcw file +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(QORIQ_RCW_PROJECT)),1) +$(error BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH must have exactly one .rcw file) +endif +endif + +ifneq ($(QORIQ_RCW_INCLUDES),) +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES + mkdir -p $(@D)/custom_board + cp -f $(QORIQ_RCW_INCLUDES) $(@D)/custom_board +endef +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES +endif + +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES + mkdir -p $(@D)/custom_board/rcw + cp -f $(filter %.rcw,$(QORIQ_RCW_FILES)) $(@D)/custom_board/rcw +endef +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES + +# rcw.py is a python3-only script, and we can be using either the +# system-provided python3, or our own built with host-python3. +# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will +# easily find it from PATH. +define HOST_QORIQ_RCW_BUILD_CMDS + PATH=$(BR_PATH) \ + $(@D)/rcw.py \ + -i $(@D)/custom_board/rcw/$(QORIQ_RCW_PROJECT) \ + -I $(@D)/custom_board -o $(@D)/PBL.bin +endef + +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE + $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin +endef +endif + +# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer +# could use a post image or SDK to build/install PBL files. +define HOST_QORIQ_RCW_INSTALL_CMDS + mkdir -p $(HOST_DIR)/share/rcw + cp -a $(@D)/* $(HOST_DIR)/share/rcw + $(HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE) +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/qpid-proton/qpid-proton.mk b/buildroot/package/qpid-proton/qpid-proton.mk index c501e48c8..ff7d74823 100644 --- a/buildroot/package/qpid-proton/qpid-proton.mk +++ b/buildroot/package/qpid-proton/qpid-proton.mk @@ -9,6 +9,8 @@ QPID_PROTON_SITE = http://apache.panu.it/qpid/proton/$(QPID_PROTON_VERSION) QPID_PROTON_STRIP_COMPONENTS = 2 QPID_PROTON_LICENSE = Apache-2.0 QPID_PROTON_LICENSE_FILES = LICENSE +QPID_PROTON_CPE_ID_VENDOR = apache +QPID_PROTON_CPE_ID_PRODUCT = qpid_proton QPID_PROTON_INSTALL_STAGING = YES QPID_PROTON_DEPENDENCIES = \ host-python \ diff --git a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash index 1e56b4eba..8e983f8e2 100644 --- a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash +++ b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz +sha256 5c3992cc35260d165f9a16094bd224529f012f799e0bc21317a39480cedb1fd2 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127-br1.tar.gz sha256 de59ec6c939f4c4def79c0a996b3bd5626895fcbd1ae108e7bddb1dac8218381 doc/lgpl.html diff --git a/buildroot/package/qt5/Config.in b/buildroot/package/qt5/Config.in index fc0e68e8b..6714c6271 100644 --- a/buildroot/package/qt5/Config.in +++ b/buildroot/package/qt5/Config.in @@ -40,13 +40,16 @@ if BR2_PACKAGE_QT5 source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" source "package/qt5/qt5charts/Config.in" +source "package/qt5/qt5coap/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" +source "package/qt5/qt5knx/Config.in" source "package/qt5/qt5location/Config.in" source "package/qt5/qt5lottie/Config.in" +source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" diff --git a/buildroot/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk index 0a961e612..db6ccd2b4 100644 --- a/buildroot/package/qt5/qt5.mk +++ b/buildroot/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules diff --git a/buildroot/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash index 0d66fa4db..43b2132cc 100644 --- a/buildroot/package/qt5/qt53d/qt53d.hash +++ b/buildroot/package/qt5/qt53d/qt53d.hash @@ -1,7 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qt3d-everywhere-src-5.15.1.tar.xz.sha256 -sha256 29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411 qt3d-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 +sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPLv3 +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5base/Config.in b/buildroot/package/qt5/qt5base/Config.in index ce7230c72..ee7c757c6 100644 --- a/buildroot/package/qt5/qt5base/Config.in +++ b/buildroot/package/qt5/qt5base/Config.in @@ -263,6 +263,11 @@ config BR2_PACKAGE_QT5BASE_PNG endif +config BR2_PACKAGE_QT5BASE_SYSLOG + bool "syslog support" + help + Logs to the standard UNIX logging mechanism. + config BR2_PACKAGE_QT5BASE_DBUS bool "DBus module" depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/qt5/qt5base/qt5base.hash b/buildroot/package/qt5/qt5base/qt5base.hash index 91b9f1999..a824890e3 100644 --- a/buildroot/package/qt5/qt5base/qt5base.hash +++ b/buildroot/package/qt5/qt5base/qt5base.hash @@ -1,11 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz.sha256 -sha256 33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c qtbase-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 +sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/buildroot/package/qt5/qt5base/qt5base.mk b/buildroot/package/qt5/qt5base/qt5base.mk index ed308c1fa..84e9fa4ed 100644 --- a/buildroot/package/qt5/qt5base/qt5base.mk +++ b/buildroot/package/qt5/qt5base/qt5base.mk @@ -76,9 +76,9 @@ QT5BASE_DEPENDENCIES += mesa3d else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += gcnano-binaries -else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +else ifeq ($(BR2_PACKAGE_TI_SGX_UM),y) QT5BASE_CONFIGURE_OPTS += -gbm -QT5BASE_DEPENDENCIES += ti-sgx-libgbm +QT5BASE_DEPENDENCIES += ti-sgx-um else ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += imx-gpu-viv @@ -97,7 +97,6 @@ QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5BASE_LICENSE += , BSD-3-Clause (examples) -QT5BASE_LICENSE_FILES += header.BSD endif QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE)) @@ -254,6 +253,12 @@ else QT5BASE_CONFIGURE_OPTS += -no-journald endif +ifeq ($(BR2_PACKAGE_QT5BASE_SYSLOG),y) +QT5BASE_CONFIGURE_OPTS += -syslog +else +QT5BASE_CONFIGURE_OPTS += -no-syslog +endif + ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv diff --git a/buildroot/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash index 5d81af78e..b52be714b 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.hash +++ b/buildroot/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtcharts-everywhere-src-5.15.1.tar.xz.sha256 -sha256 a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b qtcharts-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 +sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5coap/Config.in b/buildroot/package/qt5/qt5coap/Config.in new file mode 100644 index 000000000..b5bed342a --- /dev/null +++ b/buildroot/package/qt5/qt5coap/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5COAP + bool "qt5coap" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + CoAP is a protocol for IoT devices, and machine to machine + communication. The Qt CoAP module implements the client side + of CoAP defined by RFC 7252. + + https://doc.qt.io/QtCoAP/qtcoap-index.html diff --git a/buildroot/package/qt5/qt5coap/qt5coap.hash b/buildroot/package/qt5/qt5coap/qt5coap.hash new file mode 100644 index 000000000..9c0258f45 --- /dev/null +++ b/buildroot/package/qt5/qt5coap/qt5coap.hash @@ -0,0 +1,6 @@ +# Hash locally calculated +sha256 0ad05a2305437b9b96a4322bfadaa26f043ba16845d5303e53c00c82b37b243f qt5coap-5.15.2-br1.tar.gz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5coap/qt5coap.mk b/buildroot/package/qt5/qt5coap/qt5coap.mk new file mode 100644 index 000000000..24de86912 --- /dev/null +++ b/buildroot/package/qt5/qt5coap/qt5coap.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# qt5coap +# +################################################################################ + +QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git +QT5COAP_SITE_METHOD = git +QT5COAP_INSTALL_STAGING = YES +QT5COAP_LICENSE = GPL-3.0, GFDL-1.3 +QT5COAP_LICENSE_FILES = LICENSE.GPL3 LICENSE.FDL +QT5COAP_SYNC_QT_HEADERS = YES + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash index 59c948320..3edc2d666 100644 --- a/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtconnectivity-everywhere-src-5.15.1.tar.xz.sha256 -sha256 53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016 qtconnectivity-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 +sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash index 9033f6a6b..ab83b7181 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.hash +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz.sha256 -sha256 7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 qtdeclarative-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5enginio/qt5enginio.hash b/buildroot/package/qt5/qt5enginio/qt5enginio.hash index 424c4776e..884962090 100644 --- a/buildroot/package/qt5/qt5enginio/qt5enginio.hash +++ b/buildroot/package/qt5/qt5enginio/qt5enginio.hash @@ -2,8 +2,8 @@ sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-opensource-src-1.6.3.tar.xz # Hashes for license files: -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 +sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index d2ea24d74..9d7a837b8 100644 --- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtgraphicaleffects-everywhere-src-5.15.1.tar.xz.sha256 -sha256 f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1 qtgraphicaleffects-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 +sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash index 3808787cb..b4281e712 100644 --- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtimageformats-everywhere-src-5.15.1.tar.xz.sha256 -sha256 75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568 qtimageformats-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 +sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5knx/Config.in b/buildroot/package/qt5/qt5knx/Config.in new file mode 100644 index 000000000..991e93c8c --- /dev/null +++ b/buildroot/package/qt5/qt5knx/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5KNX + bool "qt5knx" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt KNX module implements the client side of a connection + between a client and a KNXnet/IP server. This connection + can be used to send messages to the KNX bus and to control + the functionalities of the KNX devices. + + https://doc.qt.io/QtKNX/index.html diff --git a/buildroot/package/qt5/qt5knx/qt5knx.hash b/buildroot/package/qt5/qt5knx/qt5knx.hash new file mode 100644 index 000000000..031fad5e9 --- /dev/null +++ b/buildroot/package/qt5/qt5knx/qt5knx.hash @@ -0,0 +1,6 @@ +# Hash locally calculated +sha256 932ea512aa8ceb514ac40ce1fcbebe86c306caff1a0b11320d9a36fd84bae10c qt5knx-5.15.2-br1.tar.gz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5knx/qt5knx.mk b/buildroot/package/qt5/qt5knx/qt5knx.mk new file mode 100644 index 000000000..9fc121111 --- /dev/null +++ b/buildroot/package/qt5/qt5knx/qt5knx.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# qt5knx +# +################################################################################ + +QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git +QT5KNX_SITE_METHOD = git +QT5KNX_INSTALL_STAGING = YES +QT5KNX_LICENSE = GPL-3.0 with exception +QT5KNX_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT +QT5KNX_SYNC_QT_HEADERS = YES + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash index 051b36ecd..0bb293305 100644 --- a/buildroot/package/qt5/qt5location/qt5location.hash +++ b/buildroot/package/qt5/qt5location/qt5location.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlocation-everywhere-src-5.15.1.tar.xz.sha256 -sha256 093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c qtlocation-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 +sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5lottie/qt5lottie.hash b/buildroot/package/qt5/qt5lottie/qt5lottie.hash index 3af1c6de3..740f9072f 100644 --- a/buildroot/package/qt5/qt5lottie/qt5lottie.hash +++ b/buildroot/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlottie-everywhere-src-5.15.1.tar.xz.sha256 -sha256 845987860c7990035a7cd9a0e7581d210f786e551882df8b5be69f08987f2ba0 qtlottie-everywhere-src-5.15.1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 +sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5mqtt/Config.in b/buildroot/package/qt5/qt5mqtt/Config.in new file mode 100644 index 000000000..d81575ee4 --- /dev/null +++ b/buildroot/package/qt5/qt5mqtt/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_QT5MQTT + bool "qt5mqtt" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt MQTT module provides a standard compliant + implementation of the MQTT protocol specification. It + enables applications to act as telemetry displays and + devices to publish telemetry data. The supported versions + are MQTT 3.1, MQTT 3.1.1, and MQTT 5.0. + + https://doc.qt.io/QtMQTT/index.html diff --git a/buildroot/package/qt5/qt5mqtt/qt5mqtt.hash b/buildroot/package/qt5/qt5mqtt/qt5mqtt.hash new file mode 100644 index 000000000..f4ea6b701 --- /dev/null +++ b/buildroot/package/qt5/qt5mqtt/qt5mqtt.hash @@ -0,0 +1,6 @@ +# Hash locally calculated +sha256 38f2bc1bcbdf76d30d78c86426c85f62a6c2091c997cad4b087039f795b2b406 qt5mqtt-5.15.2-br1.tar.gz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/buildroot/package/qt5/qt5mqtt/qt5mqtt.mk b/buildroot/package/qt5/qt5mqtt/qt5mqtt.mk new file mode 100644 index 000000000..54cc1de63 --- /dev/null +++ b/buildroot/package/qt5/qt5mqtt/qt5mqtt.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# qt5mqtt +# +################################################################################ + +QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git +QT5MQTT_SITE_METHOD = git +QT5MQTT_INSTALL_STAGING = YES +QT5MQTT_LICENSE = GPL-3.0 with exception +QT5MQTT_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT +QT5MQTT_SYNC_QT_HEADERS = YES + +$(eval $(qmake-package)) diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash index 2fab59d0d..b70a4ecf5 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,10 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz.sha256 -sha256 ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99 qtmultimedia-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 +sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 36ec675d5..1fa0d6430 100644 --- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols-everywhere-src-5.15.1.tar.xz.sha256 -sha256 0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e qtquickcontrols-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index ffce270c1..f66a1186e 100644 --- a/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,7 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols2-everywhere-src-5.15.1.tar.xz.sha256 -sha256 e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af qtquickcontrols2-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 +sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index 8318044bd..ac97fc319 100644 --- a/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/buildroot/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquicktimeline-everywhere-src-5.15.1.tar.xz.sha256 -sha256 15665d489a6a29ff406a5fe2b4ac14ab102fb6e43864e115432be065da073cca qtquicktimeline-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 +sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 6575a47c3..30c5bfc51 100644 --- a/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/buildroot/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtremoteobjects-everywhere-src-5.15.1.tar.xz.sha256 -sha256 71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e qtremoteobjects-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 +sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/buildroot/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash index 972099ce9..783598047 100644 --- a/buildroot/package/qt5/qt5script/qt5script.hash +++ b/buildroot/package/qt5/qt5script/qt5script.hash @@ -1,10 +1,10 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscript-everywhere-src-5.15.1.tar.xz.sha256 -sha256 0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca qtscript-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 +sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB -sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB +sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash index 494cd525b..6f816548e 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.hash +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.hash @@ -1,8 +1,7 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscxml-everywhere-src-5.15.1.tar.xz.sha256 -sha256 2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b qtscxml-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 +sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz # Hashes for license files: - -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash index 9f3001d42..179c9833e 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.hash +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsensors-everywhere-src-5.15.1.tar.xz.sha256 -sha256 8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00 qtsensors-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 +sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash index 19a9c6774..4f05049b9 100644 --- a/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialbus-everywhere-src-5.15.1.tar.xz.sha256 -sha256 9ee220826032ae1f8e68d9ec7dddc10ddc4c2e0a771d34009ae307b07eeca751 qtserialbus-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 +sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialport/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/qt5serialport.hash index 66e1a6b0b..37bc8401f 100644 --- a/buildroot/package/qt5/qt5serialport/qt5serialport.hash +++ b/buildroot/package/qt5/qt5serialport/qt5serialport.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialport-everywhere-src-5.15.1.tar.xz.sha256 -sha256 3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9 qtserialport-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 +sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash index ba64d4bf3..7773a940b 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.hash +++ b/buildroot/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsvg-everywhere-src-5.15.1.tar.xz.sha256 -sha256 308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a qtsvg-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 +sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch b/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch index f90952254..cf2cd94c2 100644 --- a/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch +++ b/buildroot/package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch @@ -1,4 +1,4 @@ -From 34894c12122b2026aa595b42fe84a4648a6b7992 Mon Sep 17 00:00:00 2001 +From 22d7a9050b04b021e33430d0f7e3c5ee80c24caa Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 17 Dec 2019 11:01:59 +0100 Subject: [PATCH] Disable designer tool (fixes configure error). @@ -13,6 +13,8 @@ Signed-off-by: Peter Seiderer Signed-off-by: Peter Seiderer [Rebased for Qt5.15.1] Signed-off-by: Peter Seiderer +[Rebased for Qt5.15.2] +Signed-off-by: Peter Seiderer --- src/linguist/linguist/linguist.pro | 2 +- src/src.pro | 5 +---- @@ -29,7 +31,7 @@ index d083896..7d74cfc 100644 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII diff --git a/src/src.pro b/src/src.pro -index 8ed567b..d784808 100644 +index f2675c7..360de50 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,12 +6,9 @@ qtHaveModule(widgets) { @@ -40,12 +42,12 @@ index 8ed567b..d784808 100644 - pixeltool + SUBDIRS = pixeltool - !static|contains(QT_PLUGINS, qtsqlite): SUBDIRS += assistant + !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant - - linguist.depends = designer } qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator } -- -2.28.0 +2.29.2 diff --git a/buildroot/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash index 0aa7bd9cf..e52d8e6df 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.hash +++ b/buildroot/package/qt5/qt5tools/qt5tools.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz.sha256 -sha256 c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 qttools-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 5043b8052..82f132378 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz.sha256 -sha256 8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 +sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt -sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE -sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE -sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash index 271ef2583..b17dbdd10 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.hash +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwayland-everywhere-src-5.15.1.tar.xz.sha256 -sha256 e2ff47b874f283a952efd6a8aaf5e8cdc462b5216dda1051b60fc6e80ac657b6 qtwayland-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 +sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash index ec3c79b87..47c7da336 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebchannel-everywhere-src-5.15.1.tar.xz.sha256 -sha256 7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc qtwebchannel-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 +sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5webengine/chromium-latest.inc b/buildroot/package/qt5/qt5webengine/chromium-latest.inc index a10e71f12..a5fdfdc1f 100644 --- a/buildroot/package/qt5/qt5webengine/chromium-latest.inc +++ b/buildroot/package/qt5/qt5webengine/chromium-latest.inc @@ -15,7 +15,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ - src/3rdparty/chromium/build/fuchsia/fidlgen_js/third_party/enum34/LICENSE \ src/3rdparty/chromium/buildtools/LICENSE \ src/3rdparty/chromium/LICENSE \ src/3rdparty/chromium/LICENSE.chromium_os \ @@ -31,6 +30,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md \ src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt \ @@ -40,7 +40,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ - src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE \ src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ @@ -111,14 +110,17 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/dawn/LICENSE \ src/3rdparty/chromium/third_party/decklink/LICENSE \ src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits_worker/lighthouse/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ @@ -128,9 +130,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license \ @@ -142,6 +144,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ @@ -185,13 +188,13 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE \ @@ -240,6 +243,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ @@ -262,10 +266,12 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ @@ -289,7 +295,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ @@ -298,6 +304,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ @@ -310,14 +317,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ @@ -352,7 +359,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE \ @@ -364,6 +371,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE \ @@ -371,6 +379,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD \ @@ -402,11 +411,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ @@ -420,6 +432,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ @@ -438,7 +451,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ @@ -469,8 +482,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE \ @@ -479,7 +493,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ @@ -491,7 +505,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ @@ -510,6 +524,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ @@ -519,10 +534,12 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ @@ -534,6 +551,8 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE \ @@ -541,9 +560,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE \ @@ -560,10 +579,10 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ @@ -593,13 +612,13 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ @@ -616,6 +635,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE \ @@ -623,10 +643,22 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ @@ -691,6 +723,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE \ src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ + src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE \ src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE \ src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE \ src/3rdparty/chromium/third_party/espresso/LICENSE \ @@ -715,8 +748,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE \ - src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ - src/3rdparty/chromium/third_party/gestures/LICENSE \ src/3rdparty/chromium/third_party/gif_player/LICENSE \ src/3rdparty/chromium/third_party/glfw/src/LICENSE.md \ src/3rdparty/chromium/third_party/glslang/LICENSE \ @@ -726,12 +757,12 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/LICENSE \ src/3rdparty/chromium/third_party/google-truth/LICENSE \ - src/3rdparty/chromium/third_party/gson/LICENSE \ src/3rdparty/chromium/third_party/guava/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ src/3rdparty/chromium/third_party/hamcrest/LICENSE \ src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ @@ -744,10 +775,10 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/ijar/LICENSE \ src/3rdparty/chromium/third_party/ink/LICENSE \ src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/intellij/LICENSE \ src/3rdparty/chromium/third_party/isimpledom/LICENSE \ src/3rdparty/chromium/third_party/jacoco/LICENSE \ src/3rdparty/chromium/third_party/javalang/LICENSE \ + src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE \ src/3rdparty/chromium/third_party/jinja2/LICENSE \ src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE \ @@ -764,11 +795,10 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE \ - src/3rdparty/chromium/third_party/libevdev/LICENSE \ + src/3rdparty/chromium/third_party/libgav1/src/LICENSE \ src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md \ src/3rdparty/chromium/third_party/libipp/LICENSE \ src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ src/3rdparty/chromium/third_party/libovr/LICENSE \ src/3rdparty/chromium/third_party/libpng/LICENSE \ @@ -817,6 +847,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/one_euro_filter/LICENSE \ src/3rdparty/chromium/third_party/openh264/src/LICENSE \ src/3rdparty/chromium/third_party/openscreen/src/LICENSE \ + src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/third_party/openvr/src/LICENSE \ src/3rdparty/chromium/third_party/opus/src/COPYING \ src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ @@ -847,7 +878,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ src/3rdparty/chromium/third_party/pystache/LICENSE \ src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE \ src/3rdparty/chromium/third_party/qcms/src/COPYING \ src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ @@ -863,13 +894,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/schema_org/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/six/LICENSE \ + src/3rdparty/chromium/third_party/six/src/LICENSE \ src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE \ src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE \ src/3rdparty/chromium/third_party/skia/LICENSE \ @@ -891,14 +923,16 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md \ + src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE \ src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ src/3rdparty/chromium/third_party/test_fonts/LICENSE \ src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/turbine/LICENSE \ src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ src/3rdparty/chromium/third_party/unrar/LICENSE \ src/3rdparty/chromium/third_party/unrar/src/license.txt \ @@ -912,6 +946,8 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ src/3rdparty/chromium/third_party/webdriver/COPYING \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt \ src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE \ src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ @@ -930,6 +966,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + src/3rdparty/chromium/third_party/weston/LICENSE \ + src/3rdparty/chromium/third_party/weston/src/COPYING \ + src/3rdparty/chromium/third_party/weston/src/data/COPYING \ src/3rdparty/chromium/third_party/widevine/LICENSE \ src/3rdparty/chromium/third_party/woff2/LICENSE \ src/3rdparty/chromium/third_party/wuffs/LICENSE \ @@ -941,7 +980,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/tools/grit/third_party/six/LICENSE \ src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ src/3rdparty/chromium/v8/LICENSE \ diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/qt5webengine.hash index faabac39d..6a631c0fe 100644 --- a/buildroot/package/qt5/qt5webengine/qt5webengine.hash +++ b/buildroot/package/qt5/qt5webengine/qt5webengine.hash @@ -1,969 +1,1007 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz.sha256 -sha256 f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2 qtwebengine-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 +sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz # Locally calculated -sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 +sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 # Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/build/fuchsia/fidlgen_js/third_party/enum34/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits/lighthouse/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/audits_worker/lighthouse/LICENSE -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/LICENSE -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/LICENSE -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/LICENSE -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/LICENSE -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/LICENSE -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/LICENSE -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/LICENSE -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/LICENSE -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/LICENSE -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/LICENSE -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/LICENSE -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 076cab8e06ec34890bac1747d2ab00de603a4892d30ae6c2d99e50f7c2400825 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE -sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 1b32b6e2fea50440c128c5ba482f7691367c46fd0cd573b80fc863bf07964cea src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt -sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE +sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE +sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt +sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE +sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE +sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING +sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md +sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE +sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown +sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE +sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE +sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE +sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE +sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE +sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license +sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE +sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE +sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE +sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE +sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE +sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE +sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license +sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE +sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE +sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE +sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD +sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map +sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE +sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE +sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license +sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license +sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE +sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE +sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE +sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md +sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE +sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE +sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE +sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt +sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE +sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE +sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE +sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE +sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash index 736dbef5e..ea64f6f14 100644 --- a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -1,7 +1,7 @@ # Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz -# Locally computed +# Hashes for license files: sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5webkit/qt5webkit.hash b/buildroot/package/qt5/qt5webkit/qt5webkit.hash index 3068ad920..312d58272 100644 --- a/buildroot/package/qt5/qt5webkit/qt5webkit.hash +++ b/buildroot/package/qt5/qt5webkit/qt5webkit.hash @@ -2,6 +2,6 @@ sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz # Hashes for license files: -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 -sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 +sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash index 820950dfe..29a9ebe43 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.hash +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebsockets-everywhere-src-5.15.1.tar.xz.sha256 -sha256 5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e qtwebsockets-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 +sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 diff --git a/buildroot/package/qt5/qt5webview/qt5webview.hash b/buildroot/package/qt5/qt5webview/qt5webview.hash index 2e23ddb0a..c1cee9cf8 100644 --- a/buildroot/package/qt5/qt5webview/qt5webview.hash +++ b/buildroot/package/qt5/qt5webview/qt5webview.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebview-everywhere-src-5.15.1.tar.xz.sha256 -sha256 426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260 qtwebview-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 +sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash index e5680f55f..08e6753f2 100644 --- a/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtx11extras-everywhere-src-5.15.1.tar.xz.sha256 -sha256 f7cd7c475a41840209808bf8b1de1c6587c3c74e5ae3b0969760b9ed35159e59 qtx11extras-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 +sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 011444a27..682e114a7 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,9 +1,9 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtxmlpatterns-everywhere-src-5.15.1.tar.xz.sha256 -sha256 6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745 qtxmlpatterns-everywhere-src-5.15.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 +sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz # Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/quagga/quagga.mk b/buildroot/package/quagga/quagga.mk index 0b352aa36..adf808505 100644 --- a/buildroot/package/quagga/quagga.mk +++ b/buildroot/package/quagga/quagga.mk @@ -10,6 +10,7 @@ QUAGGA_INSTALL_STAGING = YES QUAGGA_DEPENDENCIES = host-gawk host-pkgconf QUAGGA_LICENSE = GPL-2.0+ QUAGGA_LICENSE_FILES = COPYING +QUAGGA_CPE_ID_VENDOR = quagga # We need to override the sysconf and localstate directories so that # quagga can create files as the quagga user without extra diff --git a/buildroot/package/quickjs/0001-Makefile-add-optional-link-with-libatomic.patch b/buildroot/package/quickjs/0001-Makefile-add-optional-link-with-libatomic.patch new file mode 100644 index 000000000..76634a51a --- /dev/null +++ b/buildroot/package/quickjs/0001-Makefile-add-optional-link-with-libatomic.patch @@ -0,0 +1,37 @@ +From 2cf2aa34d5d55a4eedb1aedd4d56d89d24870230 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 3 Jan 2021 21:11:44 +0100 +Subject: [PATCH] Makefile: allow linking with extra libraries + +With some toolchains, it is neede to link with extra libraries, for +example with -latomic, to fix: + + .../build/quickjs-2020-11-08/quickjs.c:12229: undefined reference to `__atomic_fetch_xor_1' + +Fixes: + http://autobuild.buildroot.net/results/e0766eef95a2559d51e58d1a81a9c40df84ae509 + +Signed-off-by: Peter Seiderer +[yann.morin.1998@free.fr: + - make it a generic variable, not tied to -latomic +] +Signed-off-by: Yann E. MORIN +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e6ae827..22ad496 100644 +--- a/Makefile ++++ b/Makefile +@@ -179,6 +179,7 @@ endif + ifndef CONFIG_WIN32 + LIBS+=-ldl -lpthread + endif ++LIBS+=$(EXTRA_LIBS) + + $(OBJDIR): + mkdir -p $(OBJDIR) $(OBJDIR)/examples $(OBJDIR)/tests +-- +2.29.2 + diff --git a/buildroot/package/quickjs/Config.in b/buildroot/package/quickjs/Config.in new file mode 100644 index 000000000..5c3b068c3 --- /dev/null +++ b/buildroot/package/quickjs/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_QUICKJS + bool "quickjs" + depends on !BR2_STATIC_LIBS + # No way to check for fenv support. + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_USE_MMU # fork() + help + QuickJS is a small and embeddable Javascript engine. + It supports the ES2020 specification including modules, + asynchronous generators, proxies and BigInt. + + https://bellard.org/quickjs/ + +comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/quickjs/quickjs.hash b/buildroot/package/quickjs/quickjs.hash new file mode 100644 index 000000000..5dbd4575f --- /dev/null +++ b/buildroot/package/quickjs/quickjs.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b quickjs-2020-11-08.tar.xz diff --git a/buildroot/package/quickjs/quickjs.mk b/buildroot/package/quickjs/quickjs.mk new file mode 100644 index 000000000..b85c255f2 --- /dev/null +++ b/buildroot/package/quickjs/quickjs.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# quickjs +# +################################################################################ + +QUICKJS_VERSION = 2020-11-08 +QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz +QUICKJS_SITE = https://bellard.org/quickjs +QUICKJS_LICENSE = MIT +QUICKJS_INSTALL_STAGING = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +QUICKJS_EXTRA_LIBS += -latomic +endif + +define QUICKJS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + CROSS_PREFIX="$(TARGET_CROSS)" \ + EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ + all +endef + +define QUICKJS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + CROSS_PREFIX="$(TARGET_CROSS)" \ + EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ + DESTDIR=$(STAGING_DIR) \ + STRIP=/bin/true \ + prefix=/usr \ + install +endef + +define QUICKJS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + CROSS_PREFIX="$(TARGET_CROSS)" \ + EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ + DESTDIR=$(TARGET_DIR) \ + STRIP=/bin/true \ + prefix=/usr \ + install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch b/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch deleted file mode 100644 index c3b57fea6..000000000 --- a/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From cb20e19028a8996de9305502ba5e5da3bd1181bf Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Apr 2019 09:19:36 +0200 -Subject: [PATCH] configure.ac: add --disable-pie option - -PIE is not necessarily supported on all architectures, so add an option -to allow the user to disable the PIE. - -This fixes the build on the m68k architecture: - - http://autobuild.buildroot.org/results/25985bbc160e3d62b23c4c613b2a81f3711621e3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: merged] ---- - Makefile.am | 2 +- - configure.ac | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 638198d..332bd67 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - ACLOCAL_AMFLAGS = -I m4 --AM_LDFLAGS = -pie -+AM_LDFLAGS = @PIE_LDFLAGS@ - - doc_DATA = \ - README.mailserver \ -diff --git a/configure.ac b/configure.ac -index 095ff86..5af4235 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,18 @@ AS_IF([test "x${prefix}" = "xNONE"], [ - AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale", [Locale-specific data directory]) - ]) - -+# ================ -+# Check for ldflags -+# ================ -+AC_ARG_ENABLE([pie], -+ [AS_HELP_STRING([--disable-pie], [Disable Position Independent Executable])], -+ [enable_pie="$enableval"], -+ [enable_pie=yes] -+) -+AS_IF([test x"$enable_pie" != "xno"], [ -+ PIE_LDFLAGS="-pie" -+]) -+AC_SUBST([PIE_LDFLAGS]) - - # ================ - # Check for cflags --- -2.14.1 - diff --git a/buildroot/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch b/buildroot/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch new file mode 100644 index 000000000..093d7cc82 --- /dev/null +++ b/buildroot/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch @@ -0,0 +1,34 @@ +From 02b222a335527f1031cc9495d8c5ebc1bc5b1d4e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 11 Nov 2020 15:00:47 +0100 +Subject: [PATCH] quota: Use realloc(3) instead of reallocarray(3) + +reallocarray(3) has been added to glibc relatively recently (version +2.26, from 2017) and apparently not all users run new enough glibc. Just +use realloc(3) for now since in this case there's no real risk of +overflow. + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Jan Kara +[Retrieved from: +https://sourceforge.net/p/linuxquota/code/ci/02b222a335527f1031cc9495d8c5ebc1bc5b1d4e] +--- + quota.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quota.c b/quota.c +index a6ed61f..a60de12 100644 +--- a/quota.c ++++ b/quota.c +@@ -385,7 +385,7 @@ int main(int argc, char **argv) + break; + case 259: + fscount++; +- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); ++ fsnames = realloc(fsnames, fscount * sizeof(char *)); + if (!fsnames) + die(1, _("Not enough memory for filesystem names")); + fsnames[fscount - 1] = optarg; +-- +2.28.0 + diff --git a/buildroot/package/quota/quota.hash b/buildroot/package/quota/quota.hash index d9f42e51c..354a3e2de 100644 --- a/buildroot/package/quota/quota.hash +++ b/buildroot/package/quota/quota.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.05/ (click on info button) -md5 1c1dbd2cd3d680ccac661239b067e147 quota-4.05.tar.gz -sha1 d23711f3b204e0a86b8378c32545c95fb149168d quota-4.05.tar.gz +# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.06/ (click on info button) +md5 aef94648438832b684978d46fdf75110 quota-4.06.tar.gz +sha1 98288699cc14da42f762301c2b6731ec7c777681 quota-4.06.tar.gz # Locally calculated -sha256 ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9 quota-4.05.tar.gz -sha256 35b2d9797b83bce16076da9c3273f264f50b8d02f492ee32cd4c51ba6897bceb COPYING +sha256 2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d quota-4.06.tar.gz +sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/buildroot/package/quota/quota.mk b/buildroot/package/quota/quota.mk index f4bf9e5c5..12d12b129 100644 --- a/buildroot/package/quota/quota.mk +++ b/buildroot/package/quota/quota.mk @@ -4,14 +4,13 @@ # ################################################################################ -QUOTA_VERSION = 4.05 +QUOTA_VERSION = 4.06 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE_FILES = COPYING -# We're patching configure.ac -QUOTA_AUTORECONF = YES -QUOTA_GETTEXTIZE = YES +QUOTA_CPE_ID_VENDOR = jan_kara +QUOTA_CPE_ID_PRODUCT = linux_diskquota QUOTA_CONF_ENV = LIBS="$(TARGET_NLS_LIBS)" QUOTA_CONF_OPTS = --disable-pie diff --git a/buildroot/package/rabbitmq-c/rabbitmq-c.mk b/buildroot/package/rabbitmq-c/rabbitmq-c.mk index e059ff706..d25673b59 100644 --- a/buildroot/package/rabbitmq-c/rabbitmq-c.mk +++ b/buildroot/package/rabbitmq-c/rabbitmq-c.mk @@ -13,11 +13,6 @@ RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ -DBUILD_TOOLS_DOCS=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_SHARED_STATIC_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch b/buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch deleted file mode 100644 index 44768086c..000000000 --- a/buildroot/package/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 324e1ebc7b86f68f49fb4f1c34a4de60d18dd3c1 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 23 Nov 2014 12:17:11 +0100 -Subject: [PATCH 2/3] Don't force -fstack-protector, the toolchain might lack - support for it - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 80633e7..8b5a2e4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,7 +43,6 @@ DISABLE_WARNINGS = \ - - AM_CFLAGS = \ - -fno-strict-aliasing \ -- -fstack-protector \ - $(ENABLE_WARNINGS) \ - $(DISABLE_WARNINGS) - --- -2.1.0 - diff --git a/buildroot/package/radvd/radvd.hash b/buildroot/package/radvd/radvd.hash index 9ade027d2..a624db24b 100644 --- a/buildroot/package/radvd/radvd.hash +++ b/buildroot/package/radvd/radvd.hash @@ -1,3 +1,3 @@ -# From http://www.litech.org/radvd/dist/radvd-2.18.tar.gz.sha256 -sha256 4f573e36b96ba92d03b5abbbd5f059b9c8994967812c77852f44049ac5a448fd radvd-2.18.tar.gz -sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT +# From http://www.litech.org/radvd/dist/radvd-2.19.tar.gz.sha512 +sha512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233 radvd-2.19.tar.gz +sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT diff --git a/buildroot/package/radvd/radvd.mk b/buildroot/package/radvd/radvd.mk index ba0c78bd1..bed636784 100644 --- a/buildroot/package/radvd/radvd.mk +++ b/buildroot/package/radvd/radvd.mk @@ -4,7 +4,7 @@ # ################################################################################ -RADVD_VERSION = 2.18 +RADVD_VERSION = 2.19 RADVD_SITE = http://www.litech.org/radvd/dist RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf # We need to ignore , because radvd already includes @@ -12,11 +12,15 @@ RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf RADVD_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ ac_cv_header_linux_if_arp_h=no -# For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch -RADVD_AUTORECONF = YES RADVD_LICENSE = BSD-4-Clause-like RADVD_LICENSE_FILES = COPYRIGHT +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) +RADVD_CONF_OPTS += --with-stack-protector +else +RADVD_CONF_OPTS += --without-stack-protector +endif + # We don't provide /etc/radvd.conf, so disable the service by default. define RADVD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/radvd/50-radvd.preset \ diff --git a/buildroot/package/rapidjson/rapidjson.mk b/buildroot/package/rapidjson/rapidjson.mk index 9f1c82ce4..d3bcef7df 100644 --- a/buildroot/package/rapidjson/rapidjson.mk +++ b/buildroot/package/rapidjson/rapidjson.mk @@ -8,6 +8,7 @@ RAPIDJSON_VERSION = 1.1.0 RAPIDJSON_SITE = $(call github,miloyip,rapidjson,v$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt +RAPIDJSON_CPE_ID_VENDOR = tencent # rapidjson is a header-only C++ library RAPIDJSON_INSTALL_TARGET = NO diff --git a/buildroot/package/raptor/raptor.mk b/buildroot/package/raptor/raptor.mk index d674627f9..6d21fad58 100644 --- a/buildroot/package/raptor/raptor.mk +++ b/buildroot/package/raptor/raptor.mk @@ -10,6 +10,8 @@ RAPTOR_SITE = http://download.librdf.org/source RAPTOR_DEPENDENCIES = libxml2 libxslt RAPTOR_LICENSE = GPL-2.0+ or LGPL-2.1+ or Apache-2.0+ RAPTOR_LICENSE_FILES = LICENSE.txt +RAPTOR_CPE_ID_VENDOR = librdf +RAPTOR_CPE_ID_PRODUCT = raptor_rdf_syntax_library RAPTOR_INSTALL_STAGING = YES # Flag is added to make sure the patch is applied for the configure.ac of raptor. diff --git a/buildroot/package/raspberrypi-usbboot/Config.in.host b/buildroot/package/raspberrypi-usbboot/Config.in.host index dce2fccd5..b1a434f36 100644 --- a/buildroot/package/raspberrypi-usbboot/Config.in.host +++ b/buildroot/package/raspberrypi-usbboot/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT bool "host raspberrypi-usbboot" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This package builds and install the "rpiboot" tool for the host machine. This tool allows to boot the Broadcom BCM @@ -10,3 +11,7 @@ config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT built into the Compute module). https://github.com/raspberrypi/usbboot + +comment "host raspberrypi-usbboot needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch b/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch deleted file mode 100644 index 9604e8878..000000000 --- a/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f73eefdbc0577b125f7d36f54a27d8e95af831dd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 22 Dec 2020 11:52:31 +0100 -Subject: [PATCH] src/mount.c: fix build with kernel < 4.14 - -Build with kernel headers < 4.14 fails since version 1.5.0 and -https://github.com/rauc/rauc/commit/527bf2f7f746e0253f7843542e19cb0fa0c7c869: - -src/mount.c: In function 'r_setup_loop': -src/mount.c:201:25: error: 'LOOP_SET_BLOCK_SIZE' undeclared (first use in this function) - looprc = ioctl(loopfd, LOOP_SET_BLOCK_SIZE, 4096); - ^ - -Indeed, LOOP_SET_BLOCK_SIZE is only defined since -https://github.com/torvalds/linux/commit/89e4fdecb51cf5535867026274bc97de9480ade5 - -Fixes: - - http://autobuild.buildroot.org/results/829ae7ed66686c11a941ac99bd08a06f754affb4 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rauc/rauc/pull/673] ---- - src/mount.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/mount.c b/src/mount.c -index 2e593ca..75acf49 100644 ---- a/src/mount.c -+++ b/src/mount.c -@@ -11,6 +11,10 @@ - #include "mount.h" - #include "utils.h" - -+#ifndef LOOP_SET_BLOCK_SIZE -+#define LOOP_SET_BLOCK_SIZE 0x4C09 -+#endif -+ - gboolean r_mount_bundle(const gchar *source, const gchar *mountpoint, GError **error) - { - const unsigned long flags = MS_NODEV | MS_NOSUID | MS_RDONLY; --- -2.29.2 - diff --git a/buildroot/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash index 73c1add99..a02525784 100644 --- a/buildroot/package/rauc/rauc.hash +++ b/buildroot/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.5/rauc-1.5.tar.xz.asc -sha256 5dfbc46e808240c5014d318cfe64f0431307c37aa79cb2b013caa12daaf96d9d rauc-1.5.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.5.1/rauc-1.5.1.tar.xz.asc +sha256 d4ea009ce702bcb083d942398ccfedec959c6bbb7adc0fd77ae9314ce11d9d91 rauc-1.5.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/rauc/rauc.mk b/buildroot/package/rauc/rauc.mk index fd39f000a..4fb3ddde3 100644 --- a/buildroot/package/rauc/rauc.mk +++ b/buildroot/package/rauc/rauc.mk @@ -4,11 +4,12 @@ # ################################################################################ -RAUC_VERSION = 1.5 +RAUC_VERSION = 1.5.1 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 RAUC_LICENSE_FILES = COPYING +RAUC_CPE_ID_VENDOR = pengutronix RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) diff --git a/buildroot/package/rcw-smarc-sal28/Config.in b/buildroot/package/rcw-smarc-sal28/Config.in new file mode 100644 index 000000000..2a46c9f84 --- /dev/null +++ b/buildroot/package/rcw-smarc-sal28/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_RCW_SMARC_SAL28 + bool "rcw-smarc-sal28" + help + The reset configuration word for the SMARC-sAL28 board. All + available RCWs are copied into the images output directory. + Additionally, you have to choose one default RCW which is + used for booting the board. + +if BR2_PACKAGE_RCW_SMARC_SAL28 +config BR2_PACKAGE_RCW_SMARC_SAL28_BUILD_UPDATE_SCRIPT + bool "Build RCW u-boot update script" + select BR2_PACKAGE_HOST_UBOOT_TOOLS + help + Build the RCW updater script which can be used in the + bootloader to change the installed RCW during runtime. The + update script is called update-rcw.img and will be copied + to the output directory. + +config BR2_PACKAGE_RCW_SMARC_SAL28_BOOT_VARIANT + string "RCW variant for booting" + default "3-11_q" + help + The suffix of the RCW filename without the ".bin" part. + E.g. setting this to "3-11_q" will use "sl28-3-11_q.bin". +endif diff --git a/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.hash b/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.hash new file mode 100644 index 000000000..1f9b42c0b --- /dev/null +++ b/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 8e53dfceeb7f15d9e890dd4f69db505727276185f7438a5034616d392ff8f223 rcw-smarc-sal28-10.tar.gz +sha256 803c65088eed36a6697ca9f03f4379bbad24e276dc8da7fef5eb4dc4008415a1 COPYING diff --git a/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.mk b/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.mk new file mode 100644 index 000000000..0dce54381 --- /dev/null +++ b/buildroot/package/rcw-smarc-sal28/rcw-smarc-sal28.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# rcw-smarc-sal28 +# +################################################################################ + +RCW_SMARC_SAL28_VERSION = 10 +RCW_SMARC_SAL28_SITE = $(call github,kontron,rcw-smarc-sal28,v$(RCW_SMARC_SAL28_VERSION)) +RCW_SMARC_SAL28_LICENSE = BSD-2-Clause +RCW_SMARC_SAL28_LICENSE_FILES = COPYING +RCW_SMARC_SAL28_INSTALL_TARGET = NO +RCW_SMARC_SAL28_INSTALL_IMAGES = YES + +RCW_SMARC_SAL28_BOOT_VARIANT = $(call qstrip,$(BR2_PACKAGE_RCW_SMARC_SAL28_BOOT_VARIANT)) + +ifeq ($(BR2_PACKAGE_RCW_SMARC_SAL28_BUILD_UPDATE_SCRIPT),y) +RCW_SMARC_SAL28_DEPENDENCIES = host-uboot-tools +define RCW_SMARC_SAL28_UPDATE_SCRIPT_BUILD_CMDS + MKIMAGE=$(HOST_DIR)/bin/mkimage $(MAKE) -C $(@D)/contrib all +endef +define RCW_SMARC_SAL28_UPDATE_SCRIPT_INSTALL_CMDS + $(INSTALL) -D -m 0644 $(@D)/contrib/update-rcw.img $(BINARIES_DIR)/ +endef +endif + +define RCW_SMARC_SAL28_BUILD_CMDS + $(RCW_SMARC_SAL28_UPDATE_SCRIPT_BUILD_CMDS) +endef + +define RCW_SMARC_SAL28_INSTALL_IMAGES_CMDS + $(INSTALL) -d $(BINARIES_DIR)/rcw + $(INSTALL) -D -m 0644 $(@D)/sl28-*.bin $(BINARIES_DIR)/rcw/ + ln -sf rcw/sl28-$(RCW_SMARC_SAL28_BOOT_VARIANT).bin $(BINARIES_DIR)/rcw.bin + $(RCW_SMARC_SAL28_UPDATE_SCRIPT_INSTALL_CMDS) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/rcw/rcw.hash b/buildroot/package/rcw/rcw.hash deleted file mode 100644 index 76b637394..000000000 --- a/buildroot/package/rcw/rcw.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 b69a6a8b187ba794e0af716a509ced2bbac83da0f6e94b5c7331a34619db21b1 rcw-LSDK-19.09.tar.gz -sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE diff --git a/buildroot/package/rcw/rcw.mk b/buildroot/package/rcw/rcw.mk deleted file mode 100644 index 22e3be4f1..000000000 --- a/buildroot/package/rcw/rcw.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# rcw -# -################################################################################ - -RCW_VERSION = LSDK-19.09 -RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -RCW_SITE_METHOD = git -RCW_LICENSE = BSD-3-Clause -RCW_LICENSE_FILES = LICENSE - -HOST_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) - -RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH)) - -ifneq ($(RCW_FILES),) -RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES)) -# Get the name of the custom rcw file from the custom list -RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES))) - -# Error if there are no or more than one .rcw file -ifeq ($(BR_BUILDING),y) -ifneq ($(words $(RCW_PROJECT)),1) -$(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file) -endif -endif - -ifneq ($(RCW_INCLUDES),) -define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES - mkdir -p $(@D)/custom_board - cp -f $(RCW_INCLUDES) $(@D)/custom_board -endef -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES -endif - -define HOST_RCW_ADD_CUSTOM_RCW_FILES - mkdir -p $(@D)/custom_board/rcw - cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw -endef -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES - -# rcw.py is a python3-only script, and we can be using either the -# system-provided python3, or our own built with host-python3. -# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will -# easily find it from PATH. -define HOST_RCW_BUILD_CMDS - PATH=$(BR_PATH) \ - $(@D)/rcw.py \ - -i $(@D)/custom_board/rcw/$(RCW_PROJECT) \ - -I $(@D)/custom_board -o $(@D)/PBL.bin -endef - -define HOST_RCW_INSTALL_DELIVERY_FILE - $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin -endef -endif - -# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer -# could use a post image or SDK to build/install PBL files. -define HOST_RCW_INSTALL_CMDS - mkdir -p $(HOST_DIR)/share/rcw - cp -a $(@D)/* $(HOST_DIR)/share/rcw - $(HOST_RCW_INSTALL_DELIVERY_FILE) -endef - -$(eval $(host-generic-package)) diff --git a/buildroot/package/readline/Config.in b/buildroot/package/readline/Config.in index 702147262..fd21cfeaf 100644 --- a/buildroot/package/readline/Config.in +++ b/buildroot/package/readline/Config.in @@ -7,3 +7,21 @@ config BR2_PACKAGE_READLINE as they are typed in. https://tiswww.case.edu/php/chet/readline/rltop.html + +config BR2_PACKAGE_READLINE_BRACKETED_PASTE + bool "Enable bracketed paste" + depends on BR2_PACKAGE_READLINE + help + Enable the "bracketed paste" feature in libreadline. + + Bracketed paste is helpful for interactive sessions when + one wants to prevent pasted text from being interpreted + as typed-in commands. However, it also causes control + characters to show up in the raw output of a (telnet) + session. This can cause issues and throw off pattern + matching if the session output is being captured for + automated processing. + + For further information on this feature and whether you + may want it, see: + https://cirw.in/blog/bracketed-paste diff --git a/buildroot/package/readline/readline.hash b/buildroot/package/readline/readline.hash index 560154c2f..63172f112 100644 --- a/buildroot/package/readline/readline.hash +++ b/buildroot/package/readline/readline.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 readline-8.0.tar.gz +sha256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 readline-8.1.tar.gz # Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/readline/readline.mk b/buildroot/package/readline/readline.mk index f5d7d5bf9..06a96b67a 100644 --- a/buildroot/package/readline/readline.mk +++ b/buildroot/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.0 +READLINE_VERSION = 8.1 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf @@ -14,6 +14,13 @@ READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ READLINE_CONF_OPTS = --disable-install-examples READLINE_LICENSE = GPL-3.0+ READLINE_LICENSE_FILES = COPYING +READLINE_CPE_ID_VENDOR = gnu + +ifeq ($(BR2_PACKAGE_READLINE_BRACKETED_PASTE),y) +READLINE_CONF_OPTS += --enable-bracketed-paste-default +else +READLINE_CONF_OPTS += --disable-bracketed-paste-default +endif define READLINE_INSTALL_INPUTRC $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index 0a6f7045c..96132ae96 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -8,6 +8,7 @@ REDIS_VERSION = 6.0.10 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING +REDIS_CPE_ID_VENDOR = redislabs define REDIS_USERS redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server diff --git a/buildroot/package/refpolicy/refpolicy.hash b/buildroot/package/refpolicy/refpolicy.hash index 8605d07c0..7e258c4e0 100644 --- a/buildroot/package/refpolicy/refpolicy.hash +++ b/buildroot/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 dec854512ed00cd057408f330c2cea4de7a4405f7a147458f59c994bf578e4b0 refpolicy-2.20200229.tar.bz2 +sha256 1488f9b94060de28addbcb29fb8437ee0d75cba15e11280dd9dfa3e09986f57b refpolicy-2.20200818.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk index 0e94b7282..0194708b3 100644 --- a/buildroot/package/refpolicy/refpolicy.mk +++ b/buildroot/package/refpolicy/refpolicy.mk @@ -6,6 +6,7 @@ REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING +REFPOLICY_CPE_ID_VENDOR = tresys REFPOLICY_INSTALL_STAGING = YES REFPOLICY_DEPENDENCIES = \ host-m4 \ @@ -21,9 +22,9 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20200229 +REFPOLICY_VERSION = 2.20200818 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 -REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200229 +REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818 endif # Cannot use multiple threads to build the reference policy diff --git a/buildroot/package/resiprocate/resiprocate.mk b/buildroot/package/resiprocate/resiprocate.mk index e4915eec5..b31712b41 100644 --- a/buildroot/package/resiprocate/resiprocate.mk +++ b/buildroot/package/resiprocate/resiprocate.mk @@ -9,6 +9,7 @@ RESIPROCATE_SITE = https://www.resiprocate.org/files/pub/reSIProcate/releases # For complete details see https://www.resiprocate.org/License RESIPROCATE_LICENSE = VSL-1.0, BSD-3-Clause RESIPROCATE_LICENSE_FILES = COPYING +RESIPROCATE_CPE_ID_VENDOR = resiprocate RESIPROCATE_INSTALL_STAGING = YES # Utilize c-ares from buildroot instead built in ARES library diff --git a/buildroot/package/rhash/0001-configure-allow-cross-compilation.patch b/buildroot/package/rhash/0001-configure-allow-cross-compilation.patch new file mode 100644 index 000000000..6a8f40f18 --- /dev/null +++ b/buildroot/package/rhash/0001-configure-allow-cross-compilation.patch @@ -0,0 +1,57 @@ +From a3d0ef352529217c9c32ce1a1b1db1420798cbe5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Oct 2020 11:07:39 +0200 +Subject: [PATCH] configure: allow cross-compilation + +Some compilers are in fact a wrapper (e.g. to speed compilation with +ccache or distcc, or as a cross-compiler wrapper). Those wrappers may +not properly recognise the -v option, or may internally enforce some +flags that conflict with -v. + +Use --version as a fall-back. + +With --version. the compiler will report its executable's basename, e.g. +arm-linux-gcc not gcc. Catter for that by grepping for the compiler +family name. + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: + - retain "$CC -v" as default, fallback to "$CC --version" +] +Signed-off-by: Yann E. MORIN +--- + configure | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 9d72895..46491f7 100755 +--- a/configure ++++ b/configure +@@ -513,9 +513,14 @@ else + CC_TMP="$CC" + test -n "$OPT_CC" && OTHER_CC= || OTHER_CC="gcc cc" + for CC in "$CC_TMP" $OTHER_CC; do ++ cc_name_tmp= + if run_cmd "$CC -v"; then + cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) +- if test "$cc_name_tmp" = "gcc"; then ++ elif run_cmd "$CC --version"; then ++ cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1) ++ fi ++ if test "${cc_name_tmp}"; then ++ if echo "$cc_name_tmp" | grep -q "gcc"; then + cc_name=$cc_name_tmp + start_check "$CC version" + cc_vendor=gnu +@@ -539,7 +544,7 @@ else + finish_check "$cc_name $cc_version" + break + fi +- if $CC -v 2>&1 | grep -q "clang"; then ++ if echo "$cc_name_tmp" | grep -q "clang"; then + start_check "$CC version" + cc_vendor=clang + cc_version=$($CC -dumpversion 2>&1) +-- +2.25.1 + diff --git a/buildroot/package/rhash/0002-configure-add-uclinux-target.patch b/buildroot/package/rhash/0002-configure-add-uclinux-target.patch new file mode 100644 index 000000000..ca4a55644 --- /dev/null +++ b/buildroot/package/rhash/0002-configure-add-uclinux-target.patch @@ -0,0 +1,36 @@ +From 683f6875313cab9643402bb1710ebabb76e7c018 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 14 Jan 2021 08:37:06 +0100 +Subject: [PATCH] configure: add uclinux target + +Fix the following build failure with +--target=arm-buildroot-uclinux-uclibcgnueabi: + +Checking for target OS ... UNKNOWN + +Error: Unknown target OS, please specify the --target option + +Fixes: + - http://autobuild.buildroot.org/results/598ca65cf0c7ecf9ceaecb75868b656570ae00d2 + +Signed-off-by: Fabrice Fontaine +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index c8e1ea7..aae4dce 100755 +--- a/configure ++++ b/configure +@@ -426,7 +426,7 @@ else + component=$1 + part=$(echo $BUILD_TARGET | cut -d '-' -f $component) + case "$(echo $part | tr '[A-Z]' '[a-z]')" in +- linux) TARGET_OS=Linux ;; ++ linux|uclinux) TARGET_OS=Linux ;; + freebsd*) TARGET_OS=FreeBSD ;; + gnu/kfreebsd) TARGET_OS=FreeBSD ;; + netbsd) TARGET_OS=NetBSD ;; +-- +2.29.2 + diff --git a/buildroot/package/rhash/rhash.hash b/buildroot/package/rhash/rhash.hash index 9a29b988a..ba7bbb8ab 100644 --- a/buildroot/package/rhash/rhash.hash +++ b/buildroot/package/rhash/rhash.hash @@ -1,6 +1,5 @@ -# From https://sourceforge.net/projects/rhash/files/rhash/1.3.5/ -md5 f586644019c10c83c6b6835de4b99e74 rhash-1.3.5-src.tar.gz -sha1 990c9a0135afe48dee4ce1dbf83578e44735f302 rhash-1.3.5-src.tar.gz +# From https://sourceforge.net/projects/rhash/files/rhash/1.4.1/ +sha1 e1f559d060fd07bfca854c8ae3384798bd2ef266 rhash-1.4.1-src.tar.gz # Locally calculated -sha256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e rhash-1.3.5-src.tar.gz -sha256 8cf876d3406a2eed6c17ae804c8958bd78d3a0f63c30d6e2e789ab575e9fde40 COPYING +sha256 430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a297 rhash-1.4.1-src.tar.gz +sha256 953e55838353335148c90b5a38a4894292680b1d4c37228ffddddbf18ce54bf5 COPYING diff --git a/buildroot/package/rhash/rhash.mk b/buildroot/package/rhash/rhash.mk index 28fffe452..4438112f3 100644 --- a/buildroot/package/rhash/rhash.mk +++ b/buildroot/package/rhash/rhash.mk @@ -4,26 +4,37 @@ # ################################################################################ -RHASH_VERSION = 1.3.5 +RHASH_VERSION = 1.4.1 RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) -RHASH_LICENSE = MIT +RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING +RHASH_CPE_ID_VALID = YES RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) -RHASH_ADDCFLAGS = $(if $(BR2_SYSTEM_ENABLE_NLS),-DUSE_GETTEXT) -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) -RHASH_DEPENDENCIES += openssl -RHASH_ADDCFLAGS += -DOPENSSL_RUNTIME -rdynamic -RHASH_ADDLDFLAGS += -ldl +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +RHASH_CONF_OPTS += --disable-gettext +else +RHASH_CONF_OPTS += --enable-gettext endif -RHASH_MAKE_OPTS = \ - ADDCFLAGS="$(RHASH_ADDCFLAGS)" \ - ADDLDFLAGS="$(RHASH_ADDLDFLAGS)" \ - PREFIX="/usr" +ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +RHASH_CONF_OPTS += --enable-openssl +RHASH_DEPENDENCIES += openssl +else +RHASH_CONF_OPTS += --disable-openssl +endif + +define RHASH_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \ + --prefix=/usr \ + --cc=$(TARGET_CC) \ + --target=$(GNU_TARGET_NAME) \ + $(RHASH_CONF_OPTS) \ + ) +endef ifeq ($(BR2_SHARED_LIBS),y) RHASH_BUILD_TARGETS = lib-shared build-shared @@ -44,13 +55,13 @@ endef define RHASH_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \ DESTDIR="$(STAGING_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS) \ - install-headers + install-lib-headers endef ifeq ($(BR2_PACKAGE_RHASH_BIN),y) define RHASH_INSTALL_TARGET_RHASH_BIN $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) install-shared + DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) build-install-binary endef endif diff --git a/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch b/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch deleted file mode 100644 index 586a44e21..000000000 --- a/buildroot/package/rng-tools/0001-configure.ac-fix-with-rtlsdr-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 45a8c51a20a518ed78c5ea1829a307c045f737be Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Mar 2020 22:19:42 +0100 -Subject: [PATCH] configure.ac: fix --with-rtlsdr option - -Add missing ',' to allow the user to explicitly disable or enable rtlsdr - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nhorman/rng-tools/pull/88] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ba796f8..1f55052 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,7 +43,7 @@ AC_ARG_WITH([pkcs11], - - AC_ARG_WITH([rtlsdr], - AS_HELP_STRING([--without-rtlsdr], -- [Disable rtlsdr support. ]) -+ [Disable rtlsdr support. ]), - [], - [with_rtlsdr=no] - ) --- -2.25.1 - diff --git a/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch deleted file mode 100644 index 99997ce86..000000000 --- a/buildroot/package/rng-tools/0002-rngd_jitter-disambiguate-call-to-encrypt.patch +++ /dev/null @@ -1,53 +0,0 @@ -From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 30 Mar 2020 00:10:46 +0200 -Subject: [PATCH] rngd_jitter: disambiguate call to encrypt - -Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to -encrypt in rngd_rdrand.c but did not update rngd_jitter.c. - -This raise the following build failure: - -rngd_jitter.c:75:12: error: conflicting types for 'encrypt' - static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - ^~~~~~~ -In file included from rngd_jitter.c:27: -/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here - extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); - ^~~~~~~ -Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed - -Fixes: - - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/nhorman/rng-tools/pull/89] ---- - rngd_jitter.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index c1b1aca..49a3825 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -72,7 +72,7 @@ unsigned char *aes_buf; - char key[AES_BLOCK]; - static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128))); - --static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, -+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, - unsigned char *iv, unsigned char *ciphertext) - { - EVP_CIPHER_CTX *ctx; -@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) - unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; - - /* Encrypt the plaintext */ -- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, -+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, - ciphertext); - if (!ciphertext_len) - return -1; --- -2.25.1 - diff --git a/buildroot/package/rng-tools/Config.in b/buildroot/package/rng-tools/Config.in index 25b41f40d..67e3d4185 100644 --- a/buildroot/package/rng-tools/Config.in +++ b/buildroot/package/rng-tools/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_RNG_TOOLS # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_JITTERENTROPY_LIBRARY select BR2_PACKAGE_LIBSYSFS select BR2_PACKAGE_OPENSSL help @@ -13,6 +12,17 @@ config BR2_PACKAGE_RNG_TOOLS if BR2_PACKAGE_RNG_TOOLS +config BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY + bool "Jitterentropy Library support" + default y + select BR2_PACKAGE_JITTERENTROPY_LIBRARY + help + Enable Jitterentropy Library support. + + The Jitter RNG provides a noise source using the CPU + execution timing jitter. It does not depend on any + system resource other than a high-resolution time stamp. + config BR2_PACKAGE_RNG_TOOLS_NISTBEACON bool "NIST Entropy Beacon support" select BR2_PACKAGE_JANSSON diff --git a/buildroot/package/rng-tools/rng-tools.hash b/buildroot/package/rng-tools/rng-tools.hash index 3202a88d6..de1f72617 100644 --- a/buildroot/package/rng-tools/rng-tools.hash +++ b/buildroot/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef rng-tools-6.10.tar.gz +sha256 644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41 rng-tools-6.11.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/rng-tools/rng-tools.mk b/buildroot/package/rng-tools/rng-tools.mk index 3baddb98e..ae20d9636 100644 --- a/buildroot/package/rng-tools/rng-tools.mk +++ b/buildroot/package/rng-tools/rng-tools.mk @@ -4,11 +4,11 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.10 -RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) +RNG_TOOLS_VERSION = 6.11 +RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),V$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf openssl +RNG_TOOLS_DEPENDENCIES = libsysfs host-pkgconf openssl # From git RNG_TOOLS_AUTORECONF = YES @@ -28,6 +28,13 @@ else RNG_TOOLS_CONF_OPTS += --without-rtlsdr endif +ifeq ($(BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY),y) +RNG_TOOLS_DEPENDENCIES += jitterentropy-library +RNG_TOOLS_CONF_OPTS += --enable-jitterentropy +else +RNG_TOOLS_CONF_OPTS += --disable-jitterentropy +endif + ifeq ($(BR2_PACKAGE_RNG_TOOLS_NISTBEACON),y) RNG_TOOLS_DEPENDENCIES += jansson libcurl libxml2 RNG_TOOLS_CONF_OPTS += --with-nistbeacon diff --git a/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch b/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch index 05f6bbde7..77ac9f90a 100644 --- a/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch +++ b/buildroot/package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch @@ -16,13 +16,22 @@ EOF Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/facebook/rocksdb/pull/6479] --- - build_tools/build_detect_platform | 58 +++++++++++++++---------------- - 1 file changed, 29 insertions(+), 29 deletions(-) + build_tools/build_detect_platform | 66 +++++++++++++++---------------- + 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform index 2535d8124..64a0ae76c 100755 --- a/build_tools/build_detect_platform +++ b/build_tools/build_detect_platform +@@ -172,7 +172,7 @@ case "$TARGET_OS" in + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lpthread -lrt -ldl" + if test $ROCKSDB_USE_IO_URING; then + # check for liburing +- $CXX $CFLAGS -x c++ - -luring -o /dev/null 2>/dev/null </dev/null < + int main() { + struct io_uring ring; @@ -245,7 +245,7 @@ if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then else if ! test $ROCKSDB_DISABLE_FALLOCATE; then @@ -45,17 +54,26 @@ index 2535d8124..64a0ae76c 100755 # Test whether gflags library is installed # http://gflags.github.io/gflags/ # check if the namespace is gflags -- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF -+ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF +- if $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ if $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF #include + using namespace GFLAGS_NAMESPACE; int main() {} - EOF +@@ -323,7 +323,7 @@ EOF + COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1" + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" + # check if namespace is gflags +- elif $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ elif $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + #include + using namespace gflags; + int main() {} @@ -285,7 +285,7 @@ EOF - PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" - else - # check if namespace is google -- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF -+ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1 -DGFLAGS_NAMESPACE=gflags" + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" + # check if namespace is google +- elif $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ elif $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF #include using namespace google; int main() {} @@ -142,6 +160,15 @@ index 2535d8124..64a0ae76c 100755 size_t res = malloc_usable_size(0); @@ -424,7 +424,7 @@ EOF + if ! test $ROCKSDB_DISABLE_MEMKIND; then + # Test whether memkind library is installed +- $CXX $CFLAGS $COMMON_FLAGS -lmemkind -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + memkind_malloc(MEMKIND_DAX_KMEM, 1024); +@@ -486,7 +486,7 @@ EOF + if ! test $ROCKSDB_DISABLE_PTHREAD_MUTEX_ADAPTIVE_NP; then # Test whether PTHREAD_MUTEX_ADAPTIVE_NP mutex type is available - $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null <&2 fi +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_BMI -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main(int argc, char *argv[]) { +@@ -739,7 +739,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use BMI intrinsics, disabling" >&2 + fi + +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_LZCNT -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main(int argc, char *argv[]) { +@@ -753,7 +753,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use LZCNT intrinsics, disabling" >&2 + fi + -$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < diff --git a/buildroot/package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch b/buildroot/package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch new file mode 100644 index 000000000..bb7a2bed5 --- /dev/null +++ b/buildroot/package/rocksdb/0002-POWER7-8-compatiblity-fix-CRC32-C-implementation.patch @@ -0,0 +1,3787 @@ +From 7eab5c3bf8449673de7bf0d3446a669694f71f1a Mon Sep 17 00:00:00 2001 +From: Daniel Black +Date: Thu, 16 Apr 2020 12:23:02 +1000 +Subject: [PATCH] POWER7/8 compatiblity fix + CRC32 C implementation + +When running on a POWER7/8, the compiler will successfully +report being able to compile for POWER9 compatibility. It will +however fail to run due to POWER9+ only instructions being used. + +To preserve the goals of ensuring an optimization for the +local hardware, -mcpu=native is used, but only if we don't +already have C{,XX}_FLAGS with cpu/arch/tune set. PORTABLE +flag that was added for x86 is reused to ensure that the minimum +viable cpu is selected, POWER7 if compiling on big endian and +POWER8 if on little endian. + +This ensures that if a binary distributor compiles on a +POWER9, and aims to support POWER8 packages, then hopefully +they will have the correct C{,XX}_FLAGS, and as such, will +not result in a broken package on POWER8. + +Fixes: 8fc20ac468b266a53083175025375985ec04b796 + +We also replace POWER crc32c with C implementation. +The presence of clang compile failures on POWER due to +missing ppc-asm.h prompted the replacement of the ASM +CRC32 implementation with the C implementation. + +We include this when the compile flags enable it to be build. +For example on POWER7 the optimized crc32 will be built, +however it won't be used because of the runtime detection. +If the executable is moved to a POWER8 big endian it will +work correctly. + +https://github.com/antonblanchard/crc32-vpmsum/blob/master/vec_crc32.c +is used with only small include path change with the local copyright header +maintained. + +util/crc32c.cc removes arch_ppc_crc32 which was only ever +used in a local context. Also incorporated significant advice from +tchaikov in #2869. Replace all compile time checks with runtime checks. + +Corrects getauxval detection from 8bbd76edbf by including the header from the +right directory. + +[Retrieved (and slightly updated for 6.13.3) from: +https://github.com/facebook/rocksdb/pull/7079/commits/7eab5c3bf8449673de7bf0d3446a669694f71f1a] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 59 +- + Makefile | 35 +- + src.mk | 11 +- + util/crc32c.cc | 63 +- + util/crc32c_ppc.c | 94 -- + util/crc32c_ppc.cc | 662 +++++++++++++ + util/crc32c_ppc.h | 19 - + util/crc32c_ppc_asm.S | 752 -------------- + util/crc32c_ppc_clang_workaround.h | 85 ++ + util/crc32c_ppc_constants.h | 1457 +++++++++++++++++----------- + util/crc32c_test.cc | 3 + + 11 files changed, 1684 insertions(+), 1556 deletions(-) + delete mode 100644 util/crc32c_ppc.c + create mode 100644 util/crc32c_ppc.cc + delete mode 100644 util/crc32c_ppc.h + delete mode 100644 util/crc32c_ppc_asm.S + create mode 100644 util/crc32c_ppc_clang_workaround.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91647d83bb..5adf0cf3a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ include(ReadVersion) + get_rocksdb_version(rocksdb_VERSION) + project(rocksdb + VERSION ${rocksdb_VERSION} +- LANGUAGES CXX C ASM) ++ LANGUAGES CXX C) + + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) +@@ -223,26 +223,6 @@ else() + endif() + + include(CheckCCompilerFlag) +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") +- CHECK_C_COMPILER_FLAG("-mcpu=power9" HAS_POWER9) +- if(HAS_POWER9) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power9 -mtune=power9") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power9 -mtune=power9") +- else() +- CHECK_C_COMPILER_FLAG("-mcpu=power8" HAS_POWER8) +- if(HAS_POWER8) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=power8 -mtune=power8") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8 -mtune=power8") +- endif(HAS_POWER8) +- endif(HAS_POWER9) +- CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC) +- if(HAS_ALTIVEC) +- message(STATUS " HAS_ALTIVEC yes") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec") +- endif(HAS_ALTIVEC) +-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") +- + if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") + CHECK_C_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC) + if(HAS_ARMV8_CRC) +@@ -260,21 +240,40 @@ if(PORTABLE) + if(FORCE_SSE42 AND NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mpclmul") + endif() ++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8") ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power7") ++ endif() ++ endif() + else() + if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2") + else() +- if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ if(NOT CMAKE_CXX_FLAGS MATCHES "m(cpu|tune|arch)") ++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++ # Power doesn't have a march option - https://gcc.gnu.org/onlinedocs/gcc/RS_002f6000-and-PowerPC-Options.html ++ # -mcpu activates all available options ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") ++ else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ endif() + endif() + endif() + endif() + +-include(CheckCXXSourceCompiles) ++if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++ include(CheckCXXCompilerFlag) ++ SET(POWER_CRC32_FLAGS "-mcrypto -mpower8-vector -maltivec -mvsx") ++ CHECK_CXX_COMPILER_FLAG("${POWER_CRC32_FLAGS}" HAS_POWER_CRC32_FLAGS) ++endif() ++ + if(NOT MSVC) + set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul") + endif() + ++include(CheckCXXSourceCompiles) + CHECK_CXX_SOURCE_COMPILES(" + #include + #include +@@ -525,7 +524,7 @@ if(HAVE_SCHED_GETCPU) + add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT) + endif() + +-check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL) ++check_cxx_symbol_exists(getauxval sys/auxv.h HAVE_AUXV_GETAUXVAL) + if(HAVE_AUXV_GETAUXVAL) + add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) + endif() +@@ -796,11 +795,13 @@ if(HAVE_SSE42 AND NOT MSVC) + PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul") + endif() + +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++if(HAS_POWER_CRC32_FLAGS) + list(APPEND SOURCES +- util/crc32c_ppc.c +- util/crc32c_ppc_asm.S) +-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") ++ util/crc32c_ppc.cc) ++ set_source_files_properties( ++ util/crc32c_ppc.cc ++ PROPERTIES COMPILE_FLAGS "${POWER_CRC32_FLAGS}") ++endif() + + if(HAS_ARMV8_CRC) + list(APPEND SOURCES +diff --git a/Makefile b/Makefile +index a19d2ff964..7da8f71085 100644 +--- a/Makefile ++++ b/Makefile +@@ -144,16 +144,9 @@ OPT += -momit-leaf-frame-pointer + endif + endif + +-ifeq (,$(shell $(CXX) -fsyntax-only -maltivec -xc /dev/null 2>&1)) +-CXXFLAGS += -DHAS_ALTIVEC +-CFLAGS += -DHAS_ALTIVEC +-HAS_ALTIVEC=1 +-endif +- +-ifeq (,$(shell $(CXX) -fsyntax-only -mcpu=power8 -xc /dev/null 2>&1)) +-CXXFLAGS += -DHAVE_POWER8 +-CFLAGS += -DHAVE_POWER8 +-HAVE_POWER8=1 ++ifeq (,$(shell $(CXX) -fsyntax-only -mcrypto -mpower8-vector -maltivec -mvsx -xc /dev/null 2>&1)) ++POWER_CRC32_FLAGS=-mcrypto -mpower8-vector -maltivec -mvsx ++HAVE_POWER_CRC32_FLAGS=1 + endif + + ifeq (,$(shell $(CXX) -fsyntax-only -march=armv8-a+crc+crypto -xc /dev/null 2>&1)) +@@ -461,10 +454,6 @@ endif + + OBJ_DIR?=. + LIB_OBJECTS = $(patsubst %.cc, $(OBJ_DIR)/%.o, $(LIB_SOURCES)) +-ifeq ($(HAVE_POWER8),1) +-LIB_OBJECTS += $(patsubst %.c, $(OBJ_DIR)/%.o, $(LIB_SOURCES_C)) +-LIB_OBJECTS += $(patsubst %.S, $(OBJ_DIR)/%.o, $(LIB_SOURCES_ASM)) +-endif + + ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1) + LIB_OBJECTS += $(patsubst %.cpp, $(OBJ_DIR)/%.o, $(FOLLY_SOURCES)) +@@ -2254,13 +2242,12 @@ IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBu + lipo ios-x86/$@ ios-arm/$@ -create -output $@ + + else +-ifeq ($(HAVE_POWER8),1) +-$(OBJ_DIR)/util/crc32c_ppc.o: util/crc32c_ppc.c +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ ++ifeq ($(HAVE_POWER_CRC32_FLAGS),1) ++$(OBJ_DIR)/util/crc32c_ppc.o: util/crc32c_ppc.cc ++ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER_CRC32_FLAGS) -c $< -o $@ + +-$(OBJ_DIR)/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ + endif ++ + $(OBJ_DIR)/%.o: %.cc + $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) -c $< -o $@ $(COVERAGEFLAGS) + +diff --git a/src.mk b/src.mk +index c4fec346e4..0f6a19a17c 100644 +--- a/src.mk ++++ b/src.mk +@@ -255,14 +255,9 @@ LIB_SOURCES +=\ + util/crc32c_arm64.cc + endif + +-ifeq (,$(shell $(CXX) -fsyntax-only -maltivec -xc /dev/null 2>&1)) +-LIB_SOURCES_ASM =\ +- util/crc32c_ppc_asm.S +-LIB_SOURCES_C = \ +- util/crc32c_ppc.c +-else +-LIB_SOURCES_ASM = +-LIB_SOURCES_C = ++ifeq ($(HAVE_POWER_CRC32_FLAGS),1) ++LIB_SOURCES += \ ++ util/crc32c_ppc.cc + endif + + TOOL_LIB_SOURCES = \ +diff --git a/util/crc32c.cc b/util/crc32c.cc +index a709e9b1ce..b24a4f0e0f 100644 +--- a/util/crc32c.cc ++++ b/util/crc32c.cc +@@ -20,15 +20,13 @@ + + #include "util/crc32c_arm64.h" + +-#ifdef __powerpc64__ +-#include "util/crc32c_ppc.h" +-#include "util/crc32c_ppc_constants.h" +- +-#if __linux__ + #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT + #include + #endif + ++#ifdef __powerpc64__ ++extern uint32_t crc32c_ppc(uint32_t crc, unsigned char const* buffer, ++ unsigned long len); + #ifndef PPC_FEATURE2_VEC_CRYPTO + #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 + #endif +@@ -37,19 +35,11 @@ + #define AT_HWCAP2 26 + #endif + +-#endif /* __linux__ */ +- + #endif + + namespace ROCKSDB_NAMESPACE { + namespace crc32c { + +-#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) +-#ifdef __powerpc64__ +-static int arch_ppc_crc32 = 0; +-#endif /* __powerpc64__ */ +-#endif +- + static const uint32_t table0_[256] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, + 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, +@@ -342,6 +332,7 @@ static inline void Slow_CRC32(uint64_t* l, uint8_t const **p) { + table0_[c >> 24]; + } + ++#if !defined(HAVE_ARM64_CRC) && !defined(__powerpc64__) + static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { + #ifndef HAVE_SSE42 + Slow_CRC32(l, p); +@@ -355,6 +346,7 @@ static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { + *p += 4; + #endif + } ++#endif + + template + uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { +@@ -400,10 +392,8 @@ uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { + return static_cast(l ^ 0xffffffffu); + } + +-// Detect if ARM64 CRC or not. +-#ifndef HAVE_ARM64_CRC ++#if !defined(HAVE_ARM64_CRC) && !defined(__powerpc64__) + // Detect if SS42 or not. +-#ifndef HAVE_POWER8 + + static bool isSSE42() { + #ifndef HAVE_SSE42 +@@ -439,36 +429,22 @@ static bool isPCLMULQDQ() { + #endif + } + +-#endif // HAVE_POWER8 +-#endif // HAVE_ARM64_CRC ++#endif // !__power64__ && !HAVE_ARM64_CRC + + typedef uint32_t (*Function)(uint32_t, const char*, size_t); + +-#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) ++#if defined(__powerpc64__) + uint32_t ExtendPPCImpl(uint32_t crc, const char *buf, size_t size) { + return crc32c_ppc(crc, (const unsigned char *)buf, size); + } + +-#if __linux__ +-static int arch_ppc_probe(void) { +- arch_ppc_crc32 = 0; +- +-#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) +- if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) arch_ppc_crc32 = 1; +-#endif /* __powerpc64__ */ +- +- return arch_ppc_crc32; +-} +-#endif // __linux__ +- + static bool isAltiVec() { +- if (arch_ppc_probe()) { +- return true; +- } else { +- return false; +- } +-} ++#if defined(__linux__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) ++ if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) return true; + #endif ++ return false; ++} ++#endif // __power64__: + + #if defined(__linux__) && defined(HAVE_ARM64_CRC) + uint32_t ExtendARMImpl(uint32_t crc, const char *buf, size_t size) { +@@ -480,16 +456,9 @@ std::string IsFastCrc32Supported() { + bool has_fast_crc = false; + std::string fast_zero_msg; + std::string arch; +-#ifdef HAVE_POWER8 +-#ifdef HAS_ALTIVEC +- if (arch_ppc_probe()) { +- has_fast_crc = true; +- arch = "PPC"; +- } +-#else +- has_fast_crc = false; ++#ifdef __powerpc64__ ++ has_fast_crc = isAltiVec(); + arch = "PPC"; +-#endif + #elif defined(__linux__) && defined(HAVE_ARM64_CRC) + if (crc32c_runtime_check()) { + has_fast_crc = true; +@@ -1220,7 +1189,7 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, size_t len) { + #endif //HAVE_SSE42 && HAVE_PCLMUL + + static inline Function Choose_Extend() { +-#ifdef HAVE_POWER8 ++#ifdef __powerpc64__ + return isAltiVec() ? ExtendPPCImpl : ExtendImpl; + #elif defined(__linux__) && defined(HAVE_ARM64_CRC) + if(crc32c_runtime_check()) { +diff --git a/util/crc32c_ppc.c b/util/crc32c_ppc.c +deleted file mode 100644 +index 888a4943ea..0000000000 +--- a/util/crc32c_ppc.c ++++ /dev/null +@@ -1,94 +0,0 @@ +-// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +-// Copyright (c) 2017 International Business Machines Corp. +-// All rights reserved. +-// This source code is licensed under both the GPLv2 (found in the +-// COPYING file in the root directory) and Apache 2.0 License +-// (found in the LICENSE.Apache file in the root directory). +- +-#define CRC_TABLE +-#include +-#include +-#include +-#include "util/crc32c_ppc_constants.h" +- +-#define VMX_ALIGN 16 +-#define VMX_ALIGN_MASK (VMX_ALIGN - 1) +- +-#ifdef REFLECT +-static unsigned int crc32_align(unsigned int crc, unsigned char const *p, +- unsigned long len) { +- while (len--) crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); +- return crc; +-} +-#endif +- +-#ifdef HAVE_POWER8 +-unsigned int __crc32_vpmsum(unsigned int crc, unsigned char const *p, +- unsigned long len); +- +-static uint32_t crc32_vpmsum(uint32_t crc, unsigned char const *data, +- unsigned len) { +- unsigned int prealign; +- unsigned int tail; +- +-#ifdef CRC_XOR +- crc ^= 0xffffffff; +-#endif +- +- if (len < VMX_ALIGN + VMX_ALIGN_MASK) { +- crc = crc32_align(crc, data, (unsigned long)len); +- goto out; +- } +- +- if ((unsigned long)data & VMX_ALIGN_MASK) { +- prealign = VMX_ALIGN - ((unsigned long)data & VMX_ALIGN_MASK); +- crc = crc32_align(crc, data, prealign); +- len -= prealign; +- data += prealign; +- } +- +- crc = __crc32_vpmsum(crc, data, (unsigned long)len & ~VMX_ALIGN_MASK); +- +- tail = len & VMX_ALIGN_MASK; +- if (tail) { +- data += len & ~VMX_ALIGN_MASK; +- crc = crc32_align(crc, data, tail); +- } +- +-out: +-#ifdef CRC_XOR +- crc ^= 0xffffffff; +-#endif +- +- return crc; +-} +- +-/* This wrapper function works around the fact that crc32_vpmsum +- * does not gracefully handle the case where the data pointer is NULL. There +- * may be room for performance improvement here. +- */ +-uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { +- unsigned char *buf2; +- +- if (!data) { +- buf2 = (unsigned char *)malloc(len); +- bzero(buf2, len); +- crc = crc32_vpmsum(crc, buf2, len); +- free(buf2); +- } else { +- crc = crc32_vpmsum(crc, data, (unsigned long)len); +- } +- return crc; +-} +- +-#else /* HAVE_POWER8 */ +- +-/* This symbol has to exist on non-ppc architectures (and on legacy +- * ppc systems using power7 or below) in order to compile properly +- * there, even though it won't be called. +- */ +-uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { +- return 0; +-} +- +-#endif /* HAVE_POWER8 */ +diff --git a/util/crc32c_ppc.cc b/util/crc32c_ppc.cc +new file mode 100644 +index 0000000000..44487eb80b +--- /dev/null ++++ b/util/crc32c_ppc.cc +@@ -0,0 +1,662 @@ ++/* ++ * Calculate the checksum of data that is 16 byte aligned and a multiple of ++ * 16 bytes. ++ * ++ * The first step is to reduce it to 1024 bits. We do this in 8 parallel ++ * chunks in order to mask the latency of the vpmsum instructions. If we ++ * have more than 32 kB of data to checksum we repeat this step multiple ++ * times, passing in the previous 1024 bits. ++ * ++ * The next step is to reduce the 1024 bits to 64 bits. This step adds ++ * 32 bits of 0s to the end - this matches what a CRC does. We just ++ * calculate constants that land the data in this 32 bits. ++ * ++ * We then use fixed point Barrett reduction to compute a mod n over GF(2) ++ * for n = CRC using POWER8 instructions. We use x = 32. ++ * ++ * http://en.wikipedia.org/wiki/Barrett_reduction ++ * ++ * This code uses gcc vector builtins instead using assembly directly. ++ * ++ * Copyright (C) 2017 Rogerio Alves , IBM ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of either: ++ * ++ * a) the GNU General Public License as published by the Free Software ++ * Foundation; either version 2 of the License, or (at your option) ++ * any later version, or ++ * b) the Apache License, Version 2.0 ++ */ ++ ++#include ++ ++#define POWER8_INTRINSICS ++#define CRC_TABLE ++ ++#include "crc32c_ppc_constants.h" ++ ++#define VMX_ALIGN 16 ++#define VMX_ALIGN_MASK (VMX_ALIGN - 1) ++ ++#ifdef REFLECT ++static unsigned int crc32_align(unsigned int crc, const unsigned char *p, ++ unsigned long len) { ++ while (len--) crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); ++ return crc; ++} ++#else ++static unsigned int crc32_align(unsigned int crc, const unsigned char *p, ++ unsigned long len) { ++ while (len--) crc = crc_table[((crc >> 24) ^ *p++) & 0xff] ^ (crc << 8); ++ return crc; ++} ++#endif ++ ++static unsigned int __attribute__((aligned(32))) ++__crc32_vpmsum(unsigned int crc, const void *p, unsigned long len); ++ ++#ifndef CRC32_FUNCTION ++#define CRC32_FUNCTION crc32c_ppc ++#endif ++ ++unsigned int CRC32_FUNCTION(unsigned int crc, const unsigned char *p, ++ unsigned long len) { ++ unsigned int prealign; ++ unsigned int tail; ++ ++#ifdef CRC_XOR ++ crc ^= 0xffffffff; ++#endif ++ ++ if (len < VMX_ALIGN + VMX_ALIGN_MASK) { ++ crc = crc32_align(crc, p, len); ++ goto out; ++ } ++ ++ if ((unsigned long)p & VMX_ALIGN_MASK) { ++ prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK); ++ crc = crc32_align(crc, p, prealign); ++ len -= prealign; ++ p += prealign; ++ } ++ ++ crc = __crc32_vpmsum(crc, p, len & ~VMX_ALIGN_MASK); ++ ++ tail = len & VMX_ALIGN_MASK; ++ if (tail) { ++ p += len & ~VMX_ALIGN_MASK; ++ crc = crc32_align(crc, p, tail); ++ } ++ ++out: ++#ifdef CRC_XOR ++ crc ^= 0xffffffff; ++#endif ++ ++ return crc; ++} ++ ++#if defined(__clang__) ++#include "crc32c_ppc_clang_workaround.h" ++#else ++#define __builtin_pack_vector(a, b) __builtin_pack_vector_int128((a), (b)) ++#define __builtin_unpack_vector_0(a) \ ++ __builtin_unpack_vector_int128((vector __int128_t)(a), 0) ++#define __builtin_unpack_vector_1(a) \ ++ __builtin_unpack_vector_int128((vector __int128_t)(a), 1) ++#endif ++ ++/* When we have a load-store in a single-dispatch group and address overlap ++ * such that foward is not allowed (load-hit-store) the group must be flushed. ++ * A group ending NOP prevents the flush. ++ */ ++#define GROUP_ENDING_NOP asm("ori 2,2,0" ::: "memory") ++ ++#if defined(__BIG_ENDIAN__) && defined(REFLECT) ++#define BYTESWAP_DATA ++#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) ++#define BYTESWAP_DATA ++#endif ++ ++#ifdef BYTESWAP_DATA ++#define VEC_PERM(vr, va, vb, vc) \ ++ vr = vec_perm(va, vb, (__vector unsigned char)vc) ++#if defined(__LITTLE_ENDIAN__) ++/* Byte reverse permute constant LE. */ ++static const __vector unsigned long long vperm_const ++ __attribute__((aligned(16))) = {0x08090A0B0C0D0E0FUL, 0x0001020304050607UL}; ++#else ++static const __vector unsigned long long vperm_const ++ __attribute__((aligned(16))) = {0x0F0E0D0C0B0A0908UL, 0X0706050403020100UL}; ++#endif ++#else ++#define VEC_PERM(vr, va, vb, vc) ++#endif ++ ++static unsigned int __attribute__((aligned(32))) ++__crc32_vpmsum(unsigned int crc, const void *p, unsigned long len) { ++ const __vector unsigned long long vzero = {0, 0}; ++ const __vector unsigned long long vones = {0xffffffffffffffffUL, ++ 0xffffffffffffffffUL}; ++ ++#ifdef REFLECT ++ const __vector unsigned long long vmask_32bit = ++ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, ++ (__vector unsigned char)vones, 4); ++#endif ++ ++ const __vector unsigned long long vmask_64bit = ++ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, ++ (__vector unsigned char)vones, 8); ++ ++ __vector unsigned long long vcrc; ++ ++ __vector unsigned long long vconst1, vconst2; ++ ++ /* vdata0-vdata7 will contain our data (p). */ ++ __vector unsigned long long vdata0, vdata1, vdata2, vdata3, vdata4, vdata5, ++ vdata6, vdata7; ++ ++ /* v0-v7 will contain our checksums */ ++ __vector unsigned long long v0 = {0, 0}; ++ __vector unsigned long long v1 = {0, 0}; ++ __vector unsigned long long v2 = {0, 0}; ++ __vector unsigned long long v3 = {0, 0}; ++ __vector unsigned long long v4 = {0, 0}; ++ __vector unsigned long long v5 = {0, 0}; ++ __vector unsigned long long v6 = {0, 0}; ++ __vector unsigned long long v7 = {0, 0}; ++ ++ /* Vector auxiliary variables. */ ++ __vector unsigned long long va0, va1, va2, va3, va4, va5, va6, va7; ++ ++ unsigned int result = 0; ++ unsigned int offset; /* Constant table offset. */ ++ ++ unsigned long i; /* Counter. */ ++ unsigned long chunks; ++ ++ unsigned long block_size; ++ int next_block = 0; ++ ++ /* Align by 128 bits. The last 128 bit block will be processed at end. */ ++ unsigned long length = len & 0xFFFFFFFFFFFFFF80UL; ++ ++#ifdef REFLECT ++ vcrc = (__vector unsigned long long)__builtin_pack_vector(0UL, crc); ++#else ++ vcrc = (__vector unsigned long long)__builtin_pack_vector(crc, 0UL); ++ ++ /* Shift into top 32 bits */ ++ vcrc = (__vector unsigned long long)vec_sld((__vector unsigned char)vcrc, ++ (__vector unsigned char)vzero, 4); ++#endif ++ ++ /* Short version. */ ++ if (len < 256) { ++ /* Calculate where in the constant table we need to start. */ ++ offset = 256 - len; ++ ++ vconst1 = vec_ld(offset, vcrc_short_const); ++ vdata0 = vec_ld(0, (__vector unsigned long long *)p); ++ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); ++ ++ /* xor initial value*/ ++ vdata0 = vec_xor(vdata0, vcrc); ++ ++ vdata0 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata0, (__vector unsigned int)vconst1); ++ v0 = vec_xor(v0, vdata0); ++ ++ for (i = 16; i < len; i += 16) { ++ vconst1 = vec_ld(offset + i, vcrc_short_const); ++ vdata0 = vec_ld(i, (__vector unsigned long long *)p); ++ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); ++ vdata0 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata0, (__vector unsigned int)vconst1); ++ v0 = vec_xor(v0, vdata0); ++ } ++ } else { ++ /* Load initial values. */ ++ vdata0 = vec_ld(0, (__vector unsigned long long *)p); ++ vdata1 = vec_ld(16, (__vector unsigned long long *)p); ++ ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ ++ vdata2 = vec_ld(32, (__vector unsigned long long *)p); ++ vdata3 = vec_ld(48, (__vector unsigned long long *)p); ++ ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vdata4 = vec_ld(64, (__vector unsigned long long *)p); ++ vdata5 = vec_ld(80, (__vector unsigned long long *)p); ++ ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ ++ vdata6 = vec_ld(96, (__vector unsigned long long *)p); ++ vdata7 = vec_ld(112, (__vector unsigned long long *)p); ++ ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ /* xor in initial value */ ++ vdata0 = vec_xor(vdata0, vcrc); ++ ++ p = (char *)p + 128; ++ ++ do { ++ /* Checksum in blocks of MAX_SIZE. */ ++ block_size = length; ++ if (block_size > MAX_SIZE) { ++ block_size = MAX_SIZE; ++ } ++ ++ length = length - block_size; ++ ++ /* ++ * Work out the offset into the constants table to start at. Each ++ * constant is 16 bytes, and it is used against 128 bytes of input ++ * data - 128 / 16 = 8 ++ */ ++ offset = (MAX_SIZE / 8) - (block_size / 8); ++ /* We reduce our final 128 bytes in a separate step */ ++ chunks = (block_size / 128) - 1; ++ ++ vconst1 = vec_ld(offset, vcrc_const); ++ ++ va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0, ++ (__vector unsigned long long)vconst1); ++ va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1, ++ (__vector unsigned long long)vconst1); ++ va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata2, ++ (__vector unsigned long long)vconst1); ++ va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3, ++ (__vector unsigned long long)vconst1); ++ va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4, ++ (__vector unsigned long long)vconst1); ++ va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5, ++ (__vector unsigned long long)vconst1); ++ va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6, ++ (__vector unsigned long long)vconst1); ++ va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7, ++ (__vector unsigned long long)vconst1); ++ ++ if (chunks > 1) { ++ offset += 16; ++ vconst2 = vec_ld(offset, vcrc_const); ++ GROUP_ENDING_NOP; ++ ++ vdata0 = vec_ld(0, (__vector unsigned long long *)p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ ++ vdata1 = vec_ld(16, (__vector unsigned long long *)p); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ ++ vdata2 = vec_ld(32, (__vector unsigned long long *)p); ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ ++ vdata3 = vec_ld(48, (__vector unsigned long long *)p); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vdata4 = vec_ld(64, (__vector unsigned long long *)p); ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ ++ vdata5 = vec_ld(80, (__vector unsigned long long *)p); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ ++ vdata6 = vec_ld(96, (__vector unsigned long long *)p); ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ ++ vdata7 = vec_ld(112, (__vector unsigned long long *)p); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ p = (char *)p + 128; ++ ++ /* ++ * main loop. We modulo schedule it such that it takes three ++ * iterations to complete - first iteration load, second ++ * iteration vpmsum, third iteration xor. ++ */ ++ for (i = 0; i < chunks - 2; i++) { ++ vconst1 = vec_ld(offset, vcrc_const); ++ offset += 16; ++ GROUP_ENDING_NOP; ++ ++ v0 = vec_xor(v0, va0); ++ va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0, ++ (__vector unsigned long long)vconst2); ++ vdata0 = vec_ld(0, (__vector unsigned long long *)p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v1 = vec_xor(v1, va1); ++ va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1, ++ (__vector unsigned long long)vconst2); ++ vdata1 = vec_ld(16, (__vector unsigned long long *)p); ++ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v2 = vec_xor(v2, va2); ++ va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata2, ++ (__vector unsigned long long)vconst2); ++ vdata2 = vec_ld(32, (__vector unsigned long long *)p); ++ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v3 = vec_xor(v3, va3); ++ va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3, ++ (__vector unsigned long long)vconst2); ++ vdata3 = vec_ld(48, (__vector unsigned long long *)p); ++ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); ++ ++ vconst2 = vec_ld(offset, vcrc_const); ++ GROUP_ENDING_NOP; ++ ++ v4 = vec_xor(v4, va4); ++ va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4, ++ (__vector unsigned long long)vconst1); ++ vdata4 = vec_ld(64, (__vector unsigned long long *)p); ++ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v5 = vec_xor(v5, va5); ++ va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5, ++ (__vector unsigned long long)vconst1); ++ vdata5 = vec_ld(80, (__vector unsigned long long *)p); ++ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v6 = vec_xor(v6, va6); ++ va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6, ++ (__vector unsigned long long)vconst1); ++ vdata6 = vec_ld(96, (__vector unsigned long long *)p); ++ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); ++ GROUP_ENDING_NOP; ++ ++ v7 = vec_xor(v7, va7); ++ va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7, ++ (__vector unsigned long long)vconst1); ++ vdata7 = vec_ld(112, (__vector unsigned long long *)p); ++ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); ++ ++ p = (char *)p + 128; ++ } ++ ++ /* First cool down*/ ++ vconst1 = vec_ld(offset, vcrc_const); ++ offset += 16; ++ ++ v0 = vec_xor(v0, va0); ++ va0 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata0, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v1 = vec_xor(v1, va1); ++ va1 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata1, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v2 = vec_xor(v2, va2); ++ va2 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata2, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v3 = vec_xor(v3, va3); ++ va3 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata3, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v4 = vec_xor(v4, va4); ++ va4 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata4, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v5 = vec_xor(v5, va5); ++ va5 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata5, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v6 = vec_xor(v6, va6); ++ va6 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata6, ++ (__vector unsigned long long)vconst1); ++ GROUP_ENDING_NOP; ++ ++ v7 = vec_xor(v7, va7); ++ va7 = __builtin_crypto_vpmsumd((__vector unsigned long long)vdata7, ++ (__vector unsigned long long)vconst1); ++ } /* else */ ++ ++ /* Second cool down. */ ++ v0 = vec_xor(v0, va0); ++ v1 = vec_xor(v1, va1); ++ v2 = vec_xor(v2, va2); ++ v3 = vec_xor(v3, va3); ++ v4 = vec_xor(v4, va4); ++ v5 = vec_xor(v5, va5); ++ v6 = vec_xor(v6, va6); ++ v7 = vec_xor(v7, va7); ++ ++#ifdef REFLECT ++ /* ++ * vpmsumd produces a 96 bit result in the least significant bits ++ * of the register. Since we are bit reflected we have to shift it ++ * left 32 bits so it occupies the least significant bits in the ++ * bit reflected domain. ++ */ ++ v0 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v0, (__vector unsigned char)vzero, 4); ++ v1 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v1, (__vector unsigned char)vzero, 4); ++ v2 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v2, (__vector unsigned char)vzero, 4); ++ v3 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v3, (__vector unsigned char)vzero, 4); ++ v4 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v4, (__vector unsigned char)vzero, 4); ++ v5 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v5, (__vector unsigned char)vzero, 4); ++ v6 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v6, (__vector unsigned char)vzero, 4); ++ v7 = (__vector unsigned long long)vec_sld( ++ (__vector unsigned char)v7, (__vector unsigned char)vzero, 4); ++#endif ++ ++ /* xor with the last 1024 bits. */ ++ va0 = vec_ld(0, (__vector unsigned long long *)p); ++ VEC_PERM(va0, va0, va0, vperm_const); ++ ++ va1 = vec_ld(16, (__vector unsigned long long *)p); ++ VEC_PERM(va1, va1, va1, vperm_const); ++ ++ va2 = vec_ld(32, (__vector unsigned long long *)p); ++ VEC_PERM(va2, va2, va2, vperm_const); ++ ++ va3 = vec_ld(48, (__vector unsigned long long *)p); ++ VEC_PERM(va3, va3, va3, vperm_const); ++ ++ va4 = vec_ld(64, (__vector unsigned long long *)p); ++ VEC_PERM(va4, va4, va4, vperm_const); ++ ++ va5 = vec_ld(80, (__vector unsigned long long *)p); ++ VEC_PERM(va5, va5, va5, vperm_const); ++ ++ va6 = vec_ld(96, (__vector unsigned long long *)p); ++ VEC_PERM(va6, va6, va6, vperm_const); ++ ++ va7 = vec_ld(112, (__vector unsigned long long *)p); ++ VEC_PERM(va7, va7, va7, vperm_const); ++ ++ p = (char *)p + 128; ++ ++ vdata0 = vec_xor(v0, va0); ++ vdata1 = vec_xor(v1, va1); ++ vdata2 = vec_xor(v2, va2); ++ vdata3 = vec_xor(v3, va3); ++ vdata4 = vec_xor(v4, va4); ++ vdata5 = vec_xor(v5, va5); ++ vdata6 = vec_xor(v6, va6); ++ vdata7 = vec_xor(v7, va7); ++ ++ /* Check if we have more blocks to process */ ++ next_block = 0; ++ if (length != 0) { ++ next_block = 1; ++ ++ /* zero v0-v7 */ ++ v0 = vec_xor(v0, v0); ++ v1 = vec_xor(v1, v1); ++ v2 = vec_xor(v2, v2); ++ v3 = vec_xor(v3, v3); ++ v4 = vec_xor(v4, v4); ++ v5 = vec_xor(v5, v5); ++ v6 = vec_xor(v6, v6); ++ v7 = vec_xor(v7, v7); ++ } ++ length = length + 128; ++ ++ } while (next_block); ++ ++ /* Calculate how many bytes we have left. */ ++ length = (len & 127); ++ ++ /* Calculate where in (short) constant table we need to start. */ ++ offset = 128 - length; ++ ++ v0 = vec_ld(offset, vcrc_short_const); ++ v1 = vec_ld(offset + 16, vcrc_short_const); ++ v2 = vec_ld(offset + 32, vcrc_short_const); ++ v3 = vec_ld(offset + 48, vcrc_short_const); ++ v4 = vec_ld(offset + 64, vcrc_short_const); ++ v5 = vec_ld(offset + 80, vcrc_short_const); ++ v6 = vec_ld(offset + 96, vcrc_short_const); ++ v7 = vec_ld(offset + 112, vcrc_short_const); ++ ++ offset += 128; ++ ++ v0 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata0, (__vector unsigned int)v0); ++ v1 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata1, (__vector unsigned int)v1); ++ v2 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata2, (__vector unsigned int)v2); ++ v3 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata3, (__vector unsigned int)v3); ++ v4 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata4, (__vector unsigned int)v4); ++ v5 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata5, (__vector unsigned int)v5); ++ v6 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata6, (__vector unsigned int)v6); ++ v7 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata7, (__vector unsigned int)v7); ++ ++ /* Now reduce the tail (0-112 bytes). */ ++ for (i = 0; i < length; i += 16) { ++ vdata0 = vec_ld(i, (__vector unsigned long long *)p); ++ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); ++ va0 = vec_ld(offset + i, vcrc_short_const); ++ va0 = (__vector unsigned long long)__builtin_crypto_vpmsumw( ++ (__vector unsigned int)vdata0, (__vector unsigned int)va0); ++ v0 = vec_xor(v0, va0); ++ } ++ ++ /* xor all parallel chunks together. */ ++ v0 = vec_xor(v0, v1); ++ v2 = vec_xor(v2, v3); ++ v4 = vec_xor(v4, v5); ++ v6 = vec_xor(v6, v7); ++ ++ v0 = vec_xor(v0, v2); ++ v4 = vec_xor(v4, v6); ++ ++ v0 = vec_xor(v0, v4); ++ } ++ ++ /* Barrett Reduction */ ++ vconst1 = vec_ld(0, v_Barrett_const); ++ vconst2 = vec_ld(16, v_Barrett_const); ++ ++ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, ++ (__vector unsigned char)v0, 8); ++ v0 = vec_xor(v1, v0); ++ ++#ifdef REFLECT ++ /* shift left one bit */ ++ __vector unsigned char vsht_splat = vec_splat_u8(1); ++ v0 = (__vector unsigned long long)vec_sll((__vector unsigned char)v0, ++ vsht_splat); ++#endif ++ ++ v0 = vec_and(v0, vmask_64bit); ++ ++#ifndef REFLECT ++ ++ /* ++ * Now for the actual algorithm. The idea is to calculate q, ++ * the multiple of our polynomial that we need to subtract. By ++ * doing the computation 2x bits higher (ie 64 bits) and shifting the ++ * result back down 2x bits, we round down to the nearest multiple. ++ */ ++ ++ /* ma */ ++ v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v0, ++ (__vector unsigned long long)vconst1); ++ /* q = floor(ma/(2^64)) */ ++ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, ++ (__vector unsigned char)v1, 8); ++ /* qn */ ++ v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst2); ++ /* a - qn, subtraction is xor in GF(2) */ ++ v0 = vec_xor(v0, v1); ++ /* ++ * Get the result into r3. We need to shift it left 8 bytes: ++ * V0 [ 0 1 2 X ] ++ * V0 [ 0 X 2 3 ] ++ */ ++ result = __builtin_unpack_vector_1(v0); ++#else ++ ++ /* ++ * The reflected version of Barrett reduction. Instead of bit ++ * reflecting our data (which is expensive to do), we bit reflect our ++ * constants and our algorithm, which means the intermediate data in ++ * our vector registers goes from 0-63 instead of 63-0. We can reflect ++ * the algorithm because we don't carry in mod 2 arithmetic. ++ */ ++ ++ /* bottom 32 bits of a */ ++ v1 = vec_and(v0, vmask_32bit); ++ ++ /* ma */ ++ v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst1); ++ ++ /* bottom 32bits of ma */ ++ v1 = vec_and(v1, vmask_32bit); ++ /* qn */ ++ v1 = __builtin_crypto_vpmsumd((__vector unsigned long long)v1, ++ (__vector unsigned long long)vconst2); ++ /* a - qn, subtraction is xor in GF(2) */ ++ v0 = vec_xor(v0, v1); ++ ++ /* ++ * Since we are bit reflected, the result (ie the low 32 bits) is in ++ * the high 32 bits. We just need to shift it left 4 bytes ++ * V0 [ 0 1 X 3 ] ++ * V0 [ 0 X 2 3 ] ++ */ ++ ++ /* shift result into top 64 bits of */ ++ v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, ++ (__vector unsigned char)vzero, 4); ++ ++ result = __builtin_unpack_vector_0(v0); ++#endif ++ ++ return result; ++} +diff --git a/util/crc32c_ppc.h b/util/crc32c_ppc.h +deleted file mode 100644 +index c359061c61..0000000000 +--- a/util/crc32c_ppc.h ++++ /dev/null +@@ -1,19 +0,0 @@ +-// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +-// Copyright (c) 2017 International Business Machines Corp. +-// All rights reserved. +-// This source code is licensed under both the GPLv2 (found in the +-// COPYING file in the root directory) and Apache 2.0 License +-// (found in the LICENSE.Apache file in the root directory). +- +-#pragma once +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-extern uint32_t crc32c_ppc(uint32_t crc, unsigned char const *buffer, +- unsigned len); +- +-#ifdef __cplusplus +-} +-#endif +diff --git a/util/crc32c_ppc_asm.S b/util/crc32c_ppc_asm.S +deleted file mode 100644 +index a317bf96b8..0000000000 +--- a/util/crc32c_ppc_asm.S ++++ /dev/null +@@ -1,752 +0,0 @@ +-// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. +-// Copyright (c) 2015 Anton Blanchard , IBM +-// Copyright (c) 2017 International Business Machines Corp. +-// All rights reserved. +-// This source code is licensed under both the GPLv2 (found in the +-// COPYING file in the root directory) and Apache 2.0 License +-// (found in the LICENSE.Apache file in the root directory). +- +-#include +-#include "ppc-opcode.h" +- +-#undef toc +- +-#ifndef r1 +-#define r1 1 +-#endif +- +-#ifndef r2 +-#define r2 2 +-#endif +- +- .section .rodata +-.balign 16 +- +-.byteswap_constant: +- /* byte reverse permute constant */ +- .octa 0x0F0E0D0C0B0A09080706050403020100 +- +-#define __ASSEMBLY__ +-#include "crc32c_ppc_constants.h" +- +- .text +- +-#if defined(__BIG_ENDIAN__) && defined(REFLECT) +-#define BYTESWAP_DATA +-#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) +-#define BYTESWAP_DATA +-#else +-#undef BYTESWAP_DATA +-#endif +- +-#define off16 r25 +-#define off32 r26 +-#define off48 r27 +-#define off64 r28 +-#define off80 r29 +-#define off96 r30 +-#define off112 r31 +- +-#define const1 v24 +-#define const2 v25 +- +-#define byteswap v26 +-#define mask_32bit v27 +-#define mask_64bit v28 +-#define zeroes v29 +- +-#ifdef BYTESWAP_DATA +-#define VPERM(A, B, C, D) vperm A, B, C, D +-#else +-#define VPERM(A, B, C, D) +-#endif +- +-/* unsigned int __crc32_vpmsum(unsigned int crc, void *p, unsigned long len) */ +-FUNC_START(__crc32_vpmsum) +- std r31,-8(r1) +- std r30,-16(r1) +- std r29,-24(r1) +- std r28,-32(r1) +- std r27,-40(r1) +- std r26,-48(r1) +- std r25,-56(r1) +- +- li off16,16 +- li off32,32 +- li off48,48 +- li off64,64 +- li off80,80 +- li off96,96 +- li off112,112 +- li r0,0 +- +- /* Enough room for saving 10 non volatile VMX registers */ +- subi r6,r1,56+10*16 +- subi r7,r1,56+2*16 +- +- stvx v20,0,r6 +- stvx v21,off16,r6 +- stvx v22,off32,r6 +- stvx v23,off48,r6 +- stvx v24,off64,r6 +- stvx v25,off80,r6 +- stvx v26,off96,r6 +- stvx v27,off112,r6 +- stvx v28,0,r7 +- stvx v29,off16,r7 +- +- mr r10,r3 +- +- vxor zeroes,zeroes,zeroes +- vspltisw v0,-1 +- +- vsldoi mask_32bit,zeroes,v0,4 +- vsldoi mask_64bit,zeroes,v0,8 +- +- /* Get the initial value into v8 */ +- vxor v8,v8,v8 +- MTVRD(v8, r3) +-#ifdef REFLECT +- vsldoi v8,zeroes,v8,8 /* shift into bottom 32 bits */ +-#else +- vsldoi v8,v8,zeroes,4 /* shift into top 32 bits */ +-#endif +- +-#ifdef BYTESWAP_DATA +- addis r3,r2,.byteswap_constant@toc@ha +- addi r3,r3,.byteswap_constant@toc@l +- +- lvx byteswap,0,r3 +- addi r3,r3,16 +-#endif +- +- cmpdi r5,256 +- blt .Lshort +- +- rldicr r6,r5,0,56 +- +- /* Checksum in blocks of MAX_SIZE */ +-1: lis r7,MAX_SIZE@h +- ori r7,r7,MAX_SIZE@l +- mr r9,r7 +- cmpd r6,r7 +- bgt 2f +- mr r7,r6 +-2: subf r6,r7,r6 +- +- /* our main loop does 128 bytes at a time */ +- srdi r7,r7,7 +- +- /* +- * Work out the offset into the constants table to start at. Each +- * constant is 16 bytes, and it is used against 128 bytes of input +- * data - 128 / 16 = 8 +- */ +- sldi r8,r7,4 +- srdi r9,r9,3 +- subf r8,r8,r9 +- +- /* We reduce our final 128 bytes in a separate step */ +- addi r7,r7,-1 +- mtctr r7 +- +- addis r3,r2,.constants@toc@ha +- addi r3,r3,.constants@toc@l +- +- /* Find the start of our constants */ +- add r3,r3,r8 +- +- /* zero v0-v7 which will contain our checksums */ +- vxor v0,v0,v0 +- vxor v1,v1,v1 +- vxor v2,v2,v2 +- vxor v3,v3,v3 +- vxor v4,v4,v4 +- vxor v5,v5,v5 +- vxor v6,v6,v6 +- vxor v7,v7,v7 +- +- lvx const1,0,r3 +- +- /* +- * If we are looping back to consume more data we use the values +- * already in v16-v23. +- */ +- cmpdi r0,1 +- beq 2f +- +- /* First warm up pass */ +- lvx v16,0,r4 +- lvx v17,off16,r4 +- VPERM(v16,v16,v16,byteswap) +- VPERM(v17,v17,v17,byteswap) +- lvx v18,off32,r4 +- lvx v19,off48,r4 +- VPERM(v18,v18,v18,byteswap) +- VPERM(v19,v19,v19,byteswap) +- lvx v20,off64,r4 +- lvx v21,off80,r4 +- VPERM(v20,v20,v20,byteswap) +- VPERM(v21,v21,v21,byteswap) +- lvx v22,off96,r4 +- lvx v23,off112,r4 +- VPERM(v22,v22,v22,byteswap) +- VPERM(v23,v23,v23,byteswap) +- addi r4,r4,8*16 +- +- /* xor in initial value */ +- vxor v16,v16,v8 +- +-2: bdz .Lfirst_warm_up_done +- +- addi r3,r3,16 +- lvx const2,0,r3 +- +- /* Second warm up pass */ +- VPMSUMD(v8,v16,const1) +- lvx v16,0,r4 +- VPERM(v16,v16,v16,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v9,v17,const1) +- lvx v17,off16,r4 +- VPERM(v17,v17,v17,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v10,v18,const1) +- lvx v18,off32,r4 +- VPERM(v18,v18,v18,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v11,v19,const1) +- lvx v19,off48,r4 +- VPERM(v19,v19,v19,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v12,v20,const1) +- lvx v20,off64,r4 +- VPERM(v20,v20,v20,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v13,v21,const1) +- lvx v21,off80,r4 +- VPERM(v21,v21,v21,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v14,v22,const1) +- lvx v22,off96,r4 +- VPERM(v22,v22,v22,byteswap) +- ori r2,r2,0 +- +- VPMSUMD(v15,v23,const1) +- lvx v23,off112,r4 +- VPERM(v23,v23,v23,byteswap) +- +- addi r4,r4,8*16 +- +- bdz .Lfirst_cool_down +- +- /* +- * main loop. We modulo schedule it such that it takes three iterations +- * to complete - first iteration load, second iteration vpmsum, third +- * iteration xor. +- */ +- .balign 16 +-4: lvx const1,0,r3 +- addi r3,r3,16 +- ori r2,r2,0 +- +- vxor v0,v0,v8 +- VPMSUMD(v8,v16,const2) +- lvx v16,0,r4 +- VPERM(v16,v16,v16,byteswap) +- ori r2,r2,0 +- +- vxor v1,v1,v9 +- VPMSUMD(v9,v17,const2) +- lvx v17,off16,r4 +- VPERM(v17,v17,v17,byteswap) +- ori r2,r2,0 +- +- vxor v2,v2,v10 +- VPMSUMD(v10,v18,const2) +- lvx v18,off32,r4 +- VPERM(v18,v18,v18,byteswap) +- ori r2,r2,0 +- +- vxor v3,v3,v11 +- VPMSUMD(v11,v19,const2) +- lvx v19,off48,r4 +- VPERM(v19,v19,v19,byteswap) +- lvx const2,0,r3 +- ori r2,r2,0 +- +- vxor v4,v4,v12 +- VPMSUMD(v12,v20,const1) +- lvx v20,off64,r4 +- VPERM(v20,v20,v20,byteswap) +- ori r2,r2,0 +- +- vxor v5,v5,v13 +- VPMSUMD(v13,v21,const1) +- lvx v21,off80,r4 +- VPERM(v21,v21,v21,byteswap) +- ori r2,r2,0 +- +- vxor v6,v6,v14 +- VPMSUMD(v14,v22,const1) +- lvx v22,off96,r4 +- VPERM(v22,v22,v22,byteswap) +- ori r2,r2,0 +- +- vxor v7,v7,v15 +- VPMSUMD(v15,v23,const1) +- lvx v23,off112,r4 +- VPERM(v23,v23,v23,byteswap) +- +- addi r4,r4,8*16 +- +- bdnz 4b +- +-.Lfirst_cool_down: +- /* First cool down pass */ +- lvx const1,0,r3 +- addi r3,r3,16 +- +- vxor v0,v0,v8 +- VPMSUMD(v8,v16,const1) +- ori r2,r2,0 +- +- vxor v1,v1,v9 +- VPMSUMD(v9,v17,const1) +- ori r2,r2,0 +- +- vxor v2,v2,v10 +- VPMSUMD(v10,v18,const1) +- ori r2,r2,0 +- +- vxor v3,v3,v11 +- VPMSUMD(v11,v19,const1) +- ori r2,r2,0 +- +- vxor v4,v4,v12 +- VPMSUMD(v12,v20,const1) +- ori r2,r2,0 +- +- vxor v5,v5,v13 +- VPMSUMD(v13,v21,const1) +- ori r2,r2,0 +- +- vxor v6,v6,v14 +- VPMSUMD(v14,v22,const1) +- ori r2,r2,0 +- +- vxor v7,v7,v15 +- VPMSUMD(v15,v23,const1) +- ori r2,r2,0 +- +-.Lsecond_cool_down: +- /* Second cool down pass */ +- vxor v0,v0,v8 +- vxor v1,v1,v9 +- vxor v2,v2,v10 +- vxor v3,v3,v11 +- vxor v4,v4,v12 +- vxor v5,v5,v13 +- vxor v6,v6,v14 +- vxor v7,v7,v15 +- +-#ifdef REFLECT +- /* +- * vpmsumd produces a 96 bit result in the least significant bits +- * of the register. Since we are bit reflected we have to shift it +- * left 32 bits so it occupies the least significant bits in the +- * bit reflected domain. +- */ +- vsldoi v0,v0,zeroes,4 +- vsldoi v1,v1,zeroes,4 +- vsldoi v2,v2,zeroes,4 +- vsldoi v3,v3,zeroes,4 +- vsldoi v4,v4,zeroes,4 +- vsldoi v5,v5,zeroes,4 +- vsldoi v6,v6,zeroes,4 +- vsldoi v7,v7,zeroes,4 +-#endif +- +- /* xor with last 1024 bits */ +- lvx v8,0,r4 +- lvx v9,off16,r4 +- VPERM(v8,v8,v8,byteswap) +- VPERM(v9,v9,v9,byteswap) +- lvx v10,off32,r4 +- lvx v11,off48,r4 +- VPERM(v10,v10,v10,byteswap) +- VPERM(v11,v11,v11,byteswap) +- lvx v12,off64,r4 +- lvx v13,off80,r4 +- VPERM(v12,v12,v12,byteswap) +- VPERM(v13,v13,v13,byteswap) +- lvx v14,off96,r4 +- lvx v15,off112,r4 +- VPERM(v14,v14,v14,byteswap) +- VPERM(v15,v15,v15,byteswap) +- +- addi r4,r4,8*16 +- +- vxor v16,v0,v8 +- vxor v17,v1,v9 +- vxor v18,v2,v10 +- vxor v19,v3,v11 +- vxor v20,v4,v12 +- vxor v21,v5,v13 +- vxor v22,v6,v14 +- vxor v23,v7,v15 +- +- li r0,1 +- cmpdi r6,0 +- addi r6,r6,128 +- bne 1b +- +- /* Work out how many bytes we have left */ +- andi. r5,r5,127 +- +- /* Calculate where in the constant table we need to start */ +- subfic r6,r5,128 +- add r3,r3,r6 +- +- /* How many 16 byte chunks are in the tail */ +- srdi r7,r5,4 +- mtctr r7 +- +- /* +- * Reduce the previously calculated 1024 bits to 64 bits, shifting +- * 32 bits to include the trailing 32 bits of zeros +- */ +- lvx v0,0,r3 +- lvx v1,off16,r3 +- lvx v2,off32,r3 +- lvx v3,off48,r3 +- lvx v4,off64,r3 +- lvx v5,off80,r3 +- lvx v6,off96,r3 +- lvx v7,off112,r3 +- addi r3,r3,8*16 +- +- VPMSUMW(v0,v16,v0) +- VPMSUMW(v1,v17,v1) +- VPMSUMW(v2,v18,v2) +- VPMSUMW(v3,v19,v3) +- VPMSUMW(v4,v20,v4) +- VPMSUMW(v5,v21,v5) +- VPMSUMW(v6,v22,v6) +- VPMSUMW(v7,v23,v7) +- +- /* Now reduce the tail (0 - 112 bytes) */ +- cmpdi r7,0 +- beq 1f +- +- lvx v16,0,r4 +- lvx v17,0,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off16,r4 +- lvx v17,off16,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off32,r4 +- lvx v17,off32,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off48,r4 +- lvx v17,off48,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off64,r4 +- lvx v17,off64,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off80,r4 +- lvx v17,off80,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- bdz 1f +- +- lvx v16,off96,r4 +- lvx v17,off96,r3 +- VPERM(v16,v16,v16,byteswap) +- VPMSUMW(v16,v16,v17) +- vxor v0,v0,v16 +- +- /* Now xor all the parallel chunks together */ +-1: vxor v0,v0,v1 +- vxor v2,v2,v3 +- vxor v4,v4,v5 +- vxor v6,v6,v7 +- +- vxor v0,v0,v2 +- vxor v4,v4,v6 +- +- vxor v0,v0,v4 +- +-.Lbarrett_reduction: +- /* Barrett constants */ +- addis r3,r2,.barrett_constants@toc@ha +- addi r3,r3,.barrett_constants@toc@l +- +- lvx const1,0,r3 +- lvx const2,off16,r3 +- +- vsldoi v1,v0,v0,8 +- vxor v0,v0,v1 /* xor two 64 bit results together */ +- +-#ifdef REFLECT +- /* shift left one bit */ +- vspltisb v1,1 +- vsl v0,v0,v1 +-#endif +- +- vand v0,v0,mask_64bit +- +-#ifndef REFLECT +- /* +- * Now for the Barrett reduction algorithm. The idea is to calculate q, +- * the multiple of our polynomial that we need to subtract. By +- * doing the computation 2x bits higher (ie 64 bits) and shifting the +- * result back down 2x bits, we round down to the nearest multiple. +- */ +- VPMSUMD(v1,v0,const1) /* ma */ +- vsldoi v1,zeroes,v1,8 /* q = floor(ma/(2^64)) */ +- VPMSUMD(v1,v1,const2) /* qn */ +- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ +- +- /* +- * Get the result into r3. We need to shift it left 8 bytes: +- * V0 [ 0 1 2 X ] +- * V0 [ 0 X 2 3 ] +- */ +- vsldoi v0,v0,zeroes,8 /* shift result into top 64 bits */ +-#else +- /* +- * The reflected version of Barrett reduction. Instead of bit +- * reflecting our data (which is expensive to do), we bit reflect our +- * constants and our algorithm, which means the intermediate data in +- * our vector registers goes from 0-63 instead of 63-0. We can reflect +- * the algorithm because we don't carry in mod 2 arithmetic. +- */ +- vand v1,v0,mask_32bit /* bottom 32 bits of a */ +- VPMSUMD(v1,v1,const1) /* ma */ +- vand v1,v1,mask_32bit /* bottom 32bits of ma */ +- VPMSUMD(v1,v1,const2) /* qn */ +- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ +- +- /* +- * Since we are bit reflected, the result (ie the low 32 bits) is in +- * the high 32 bits. We just need to shift it left 4 bytes +- * V0 [ 0 1 X 3 ] +- * V0 [ 0 X 2 3 ] +- */ +- vsldoi v0,v0,zeroes,4 /* shift result into top 64 bits of */ +-#endif +- +- /* Get it into r3 */ +- MFVRD(r3, v0) +- +-.Lout: +- subi r6,r1,56+10*16 +- subi r7,r1,56+2*16 +- +- lvx v20,0,r6 +- lvx v21,off16,r6 +- lvx v22,off32,r6 +- lvx v23,off48,r6 +- lvx v24,off64,r6 +- lvx v25,off80,r6 +- lvx v26,off96,r6 +- lvx v27,off112,r6 +- lvx v28,0,r7 +- lvx v29,off16,r7 +- +- ld r31,-8(r1) +- ld r30,-16(r1) +- ld r29,-24(r1) +- ld r28,-32(r1) +- ld r27,-40(r1) +- ld r26,-48(r1) +- ld r25,-56(r1) +- +- blr +- +-.Lfirst_warm_up_done: +- lvx const1,0,r3 +- addi r3,r3,16 +- +- VPMSUMD(v8,v16,const1) +- VPMSUMD(v9,v17,const1) +- VPMSUMD(v10,v18,const1) +- VPMSUMD(v11,v19,const1) +- VPMSUMD(v12,v20,const1) +- VPMSUMD(v13,v21,const1) +- VPMSUMD(v14,v22,const1) +- VPMSUMD(v15,v23,const1) +- +- b .Lsecond_cool_down +- +-.Lshort: +- cmpdi r5,0 +- beq .Lzero +- +- addis r3,r2,.short_constants@toc@ha +- addi r3,r3,.short_constants@toc@l +- +- /* Calculate where in the constant table we need to start */ +- subfic r6,r5,256 +- add r3,r3,r6 +- +- /* How many 16 byte chunks? */ +- srdi r7,r5,4 +- mtctr r7 +- +- vxor v19,v19,v19 +- vxor v20,v20,v20 +- +- lvx v0,0,r4 +- lvx v16,0,r3 +- VPERM(v0,v0,v16,byteswap) +- vxor v0,v0,v8 /* xor in initial value */ +- VPMSUMW(v0,v0,v16) +- bdz .Lv0 +- +- lvx v1,off16,r4 +- lvx v17,off16,r3 +- VPERM(v1,v1,v17,byteswap) +- VPMSUMW(v1,v1,v17) +- bdz .Lv1 +- +- lvx v2,off32,r4 +- lvx v16,off32,r3 +- VPERM(v2,v2,v16,byteswap) +- VPMSUMW(v2,v2,v16) +- bdz .Lv2 +- +- lvx v3,off48,r4 +- lvx v17,off48,r3 +- VPERM(v3,v3,v17,byteswap) +- VPMSUMW(v3,v3,v17) +- bdz .Lv3 +- +- lvx v4,off64,r4 +- lvx v16,off64,r3 +- VPERM(v4,v4,v16,byteswap) +- VPMSUMW(v4,v4,v16) +- bdz .Lv4 +- +- lvx v5,off80,r4 +- lvx v17,off80,r3 +- VPERM(v5,v5,v17,byteswap) +- VPMSUMW(v5,v5,v17) +- bdz .Lv5 +- +- lvx v6,off96,r4 +- lvx v16,off96,r3 +- VPERM(v6,v6,v16,byteswap) +- VPMSUMW(v6,v6,v16) +- bdz .Lv6 +- +- lvx v7,off112,r4 +- lvx v17,off112,r3 +- VPERM(v7,v7,v17,byteswap) +- VPMSUMW(v7,v7,v17) +- bdz .Lv7 +- +- addi r3,r3,128 +- addi r4,r4,128 +- +- lvx v8,0,r4 +- lvx v16,0,r3 +- VPERM(v8,v8,v16,byteswap) +- VPMSUMW(v8,v8,v16) +- bdz .Lv8 +- +- lvx v9,off16,r4 +- lvx v17,off16,r3 +- VPERM(v9,v9,v17,byteswap) +- VPMSUMW(v9,v9,v17) +- bdz .Lv9 +- +- lvx v10,off32,r4 +- lvx v16,off32,r3 +- VPERM(v10,v10,v16,byteswap) +- VPMSUMW(v10,v10,v16) +- bdz .Lv10 +- +- lvx v11,off48,r4 +- lvx v17,off48,r3 +- VPERM(v11,v11,v17,byteswap) +- VPMSUMW(v11,v11,v17) +- bdz .Lv11 +- +- lvx v12,off64,r4 +- lvx v16,off64,r3 +- VPERM(v12,v12,v16,byteswap) +- VPMSUMW(v12,v12,v16) +- bdz .Lv12 +- +- lvx v13,off80,r4 +- lvx v17,off80,r3 +- VPERM(v13,v13,v17,byteswap) +- VPMSUMW(v13,v13,v17) +- bdz .Lv13 +- +- lvx v14,off96,r4 +- lvx v16,off96,r3 +- VPERM(v14,v14,v16,byteswap) +- VPMSUMW(v14,v14,v16) +- bdz .Lv14 +- +- lvx v15,off112,r4 +- lvx v17,off112,r3 +- VPERM(v15,v15,v17,byteswap) +- VPMSUMW(v15,v15,v17) +- +-.Lv15: vxor v19,v19,v15 +-.Lv14: vxor v20,v20,v14 +-.Lv13: vxor v19,v19,v13 +-.Lv12: vxor v20,v20,v12 +-.Lv11: vxor v19,v19,v11 +-.Lv10: vxor v20,v20,v10 +-.Lv9: vxor v19,v19,v9 +-.Lv8: vxor v20,v20,v8 +-.Lv7: vxor v19,v19,v7 +-.Lv6: vxor v20,v20,v6 +-.Lv5: vxor v19,v19,v5 +-.Lv4: vxor v20,v20,v4 +-.Lv3: vxor v19,v19,v3 +-.Lv2: vxor v20,v20,v2 +-.Lv1: vxor v19,v19,v1 +-.Lv0: vxor v20,v20,v0 +- +- vxor v0,v19,v20 +- +- b .Lbarrett_reduction +- +-.Lzero: +- mr r3,r10 +- b .Lout +- +-FUNC_END(__crc32_vpmsum) +diff --git a/util/crc32c_ppc_clang_workaround.h b/util/crc32c_ppc_clang_workaround.h +new file mode 100644 +index 0000000000..110cb31782 +--- /dev/null ++++ b/util/crc32c_ppc_clang_workaround.h +@@ -0,0 +1,85 @@ ++// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. ++// Copyright (C) 2015, 2017 International Business Machines Corp. ++// All rights reserved. ++// This source code is licensed under both the GPLv2 (found in the ++// COPYING file in the root directory) and Apache 2.0 License ++// (found in the LICENSE.Apache file in the root directory). ++#ifndef CLANG_WORKAROUND_H ++#define CLANG_WORKAROUND_H ++ ++/* ++ * These stubs fix clang incompatibilities with GCC builtins. ++ */ ++ ++#ifndef __builtin_crypto_vpmsumw ++#define __builtin_crypto_vpmsumw __builtin_crypto_vpmsumb ++#endif ++#ifndef __builtin_crypto_vpmsumd ++#define __builtin_crypto_vpmsumd __builtin_crypto_vpmsumb ++#endif ++ ++static inline __vector unsigned long long __attribute__((overloadable)) ++vec_ld(int __a, const __vector unsigned long long* __b) { ++ return (__vector unsigned long long)__builtin_altivec_lvx(__a, __b); ++} ++ ++/* ++ * GCC __builtin_pack_vector_int128 returns a vector __int128_t but Clang ++ * does not recognize this type. On GCC this builtin is translated to a ++ * xxpermdi instruction that only moves the registers __a, __b instead generates ++ * a load. ++ * ++ * Clang has vec_xxpermdi intrinsics. It was implemented in 4.0.0. ++ */ ++static inline __vector unsigned long long __builtin_pack_vector( ++ unsigned long __a, unsigned long __b) { ++#if defined(__BIG_ENDIAN__) ++ __vector unsigned long long __v = {__a, __b}; ++#else ++ __vector unsigned long long __v = {__b, __a}; ++#endif ++ return __v; ++} ++ ++/* ++ * Clang 7 changed the behavior of vec_xxpermdi in order to provide the same ++ * behavior of GCC. That means code adapted to Clang >= 7 does not work on ++ * Clang <= 6. So, fallback to __builtin_unpack_vector() on Clang <= 6. ++ */ ++#if !defined vec_xxpermdi || __clang_major__ <= 6 ++ ++static inline unsigned long __builtin_unpack_vector( ++ __vector unsigned long long __v, int __o) { ++ return __v[__o]; ++} ++ ++#if defined(__BIG_ENDIAN__) ++#define __builtin_unpack_vector_0(a) __builtin_unpack_vector((a), 0) ++#define __builtin_unpack_vector_1(a) __builtin_unpack_vector((a), 1) ++#else ++#define __builtin_unpack_vector_0(a) __builtin_unpack_vector((a), 1) ++#define __builtin_unpack_vector_1(a) __builtin_unpack_vector((a), 0) ++#endif ++ ++#else ++ ++static inline unsigned long __builtin_unpack_vector_0( ++ __vector unsigned long long __v) { ++#if defined(__BIG_ENDIAN__) ++ return vec_xxpermdi(__v, __v, 0x0)[0]; ++#else ++ return vec_xxpermdi(__v, __v, 0x3)[0]; ++#endif ++} ++ ++static inline unsigned long __builtin_unpack_vector_1( ++ __vector unsigned long long __v) { ++#if defined(__BIG_ENDIAN__) ++ return vec_xxpermdi(__v, __v, 0x3)[0]; ++#else ++ return vec_xxpermdi(__v, __v, 0x0)[0]; ++#endif ++} ++#endif /* vec_xxpermdi */ ++ ++#endif +diff --git a/util/crc32c_ppc_constants.h b/util/crc32c_ppc_constants.h +index f6494cd01c..14df7ccda5 100644 +--- a/util/crc32c_ppc_constants.h ++++ b/util/crc32c_ppc_constants.h +@@ -5,13 +5,21 @@ + // COPYING file in the root directory) and Apache 2.0 License + // (found in the LICENSE.Apache file in the root directory). + +-#pragma once ++/* ++* ++* THIS FILE IS GENERATED WITH ++./crc32_constants -r -x 0x1edc6f41 ++ ++* This is from https://github.com/antonblanchard/crc32-vpmsum/ ++* DO NOT MODIFY IT MANUALLY! ++* ++*/ + + #define CRC 0x1edc6f41 +-#define REFLECT + #define CRC_XOR ++#define REFLECT ++#define MAX_SIZE 32768 + +-#ifndef __ASSEMBLY__ + #ifdef CRC_TABLE + static const unsigned int crc_table[] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, +@@ -59,842 +67,1125 @@ static const unsigned int crc_table[] = { + 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351, + }; + +-#endif ++#endif /* CRC_TABLE */ ++#ifdef POWER8_INTRINSICS + +-#else +-#define MAX_SIZE 32768 +-.constants : ++/* Constants */ + +- /* Reduce 262144 kbits to 1024 bits */ ++/* Reduce 262144 kbits to 1024 bits */ ++static const __vector unsigned long long vcrc_const[255] ++ __attribute__((aligned(16))) = { ++#ifdef __LITTLE_ENDIAN__ + /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ +- .octa 0x00000000b6ca9e20000000009c37c408 +- ++ {0x000000009c37c408, 0x00000000b6ca9e20}, + /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ +- .octa 0x00000000350249a800000001b51df26c +- ++ {0x00000001b51df26c, 0x00000000350249a8}, + /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ +- .octa 0x00000001862dac54000000000724b9d0 +- ++ {0x000000000724b9d0, 0x00000001862dac54}, + /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ +- .octa 0x00000001d87fb48c00000001c00532fe +- ++ {0x00000001c00532fe, 0x00000001d87fb48c}, + /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ +- .octa 0x00000001f39b699e00000000f05a9362 +- ++ {0x00000000f05a9362, 0x00000001f39b699e}, + /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ +- .octa 0x0000000101da11b400000001e1007970 +- ++ {0x00000001e1007970, 0x0000000101da11b4}, + /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ +- .octa 0x00000001cab571e000000000a57366ee +- ++ {0x00000000a57366ee, 0x00000001cab571e0}, + /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ +- .octa 0x00000000c7020cfe0000000192011284 +- ++ {0x0000000192011284, 0x00000000c7020cfe}, + /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ +- .octa 0x00000000cdaed1ae0000000162716d9a +- ++ {0x0000000162716d9a, 0x00000000cdaed1ae}, + /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ +- .octa 0x00000001e804effc00000000cd97ecde +- ++ {0x00000000cd97ecde, 0x00000001e804effc}, + /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ +- .octa 0x0000000077c3ea3a0000000058812bc0 +- ++ {0x0000000058812bc0, 0x0000000077c3ea3a}, + /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ +- .octa 0x0000000068df31b40000000088b8c12e +- ++ {0x0000000088b8c12e, 0x0000000068df31b4}, + /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ +- .octa 0x00000000b059b6c200000001230b234c +- ++ {0x00000001230b234c, 0x00000000b059b6c2}, + /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ +- .octa 0x0000000145fb8ed800000001120b416e +- ++ {0x00000001120b416e, 0x0000000145fb8ed8}, + /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ +- .octa 0x00000000cbc0916800000001974aecb0 +- ++ {0x00000001974aecb0, 0x00000000cbc09168}, + /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ +- .octa 0x000000005ceeedc2000000008ee3f226 +- ++ {0x000000008ee3f226, 0x000000005ceeedc2}, + /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ +- .octa 0x0000000047d74e8600000001089aba9a +- ++ {0x00000001089aba9a, 0x0000000047d74e86}, + /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ +- .octa 0x00000001407e9e220000000065113872 +- ++ {0x0000000065113872, 0x00000001407e9e22}, + /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ +- .octa 0x00000001da967bda000000005c07ec10 +- ++ {0x000000005c07ec10, 0x00000001da967bda}, + /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ +- .octa 0x000000006c8983680000000187590924 +- ++ {0x0000000187590924, 0x000000006c898368}, + /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ +- .octa 0x00000000f2d14c9800000000e35da7c6 +- ++ {0x00000000e35da7c6, 0x00000000f2d14c98}, + /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ +- .octa 0x00000001993c6ad4000000000415855a +- ++ {0x000000000415855a, 0x00000001993c6ad4}, + /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ +- .octa 0x000000014683d1ac0000000073617758 +- ++ {0x0000000073617758, 0x000000014683d1ac}, + /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ +- .octa 0x00000001a7c93e6c0000000176021d28 +- ++ {0x0000000176021d28, 0x00000001a7c93e6c}, + /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ +- .octa 0x000000010211e90a00000001c358fd0a +- ++ {0x00000001c358fd0a, 0x000000010211e90a}, + /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ +- .octa 0x000000001119403e00000001ff7a2c18 +- ++ {0x00000001ff7a2c18, 0x000000001119403e}, + /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ +- .octa 0x000000001c3261aa00000000f2d9f7e4 +- ++ {0x00000000f2d9f7e4, 0x000000001c3261aa}, + /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ +- .octa 0x000000014e37a634000000016cf1f9c8 +- ++ {0x000000016cf1f9c8, 0x000000014e37a634}, + /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ +- .octa 0x0000000073786c0c000000010af9279a +- ++ {0x000000010af9279a, 0x0000000073786c0c}, + /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ +- .octa 0x000000011dc037f80000000004f101e8 +- ++ {0x0000000004f101e8, 0x000000011dc037f8}, + /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ +- .octa 0x0000000031433dfc0000000070bcf184 +- ++ {0x0000000070bcf184, 0x0000000031433dfc}, + /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ +- .octa 0x000000009cde8348000000000a8de642 +- ++ {0x000000000a8de642, 0x000000009cde8348}, + /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ +- .octa 0x0000000038d3c2a60000000062ea130c +- ++ {0x0000000062ea130c, 0x0000000038d3c2a6}, + /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ +- .octa 0x000000011b25f26000000001eb31cbb2 +- ++ {0x00000001eb31cbb2, 0x000000011b25f260}, + /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ +- .octa 0x000000001629e6f00000000170783448 +- ++ {0x0000000170783448, 0x000000001629e6f0}, + /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ +- .octa 0x0000000160838b4c00000001a684b4c6 +- ++ {0x00000001a684b4c6, 0x0000000160838b4c}, + /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ +- .octa 0x000000007a44011c00000000253ca5b4 +- ++ {0x00000000253ca5b4, 0x000000007a44011c}, + /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ +- .octa 0x00000000226f417a0000000057b4b1e2 +- ++ {0x0000000057b4b1e2, 0x00000000226f417a}, + /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ +- .octa 0x0000000045eb2eb400000000b6bd084c +- ++ {0x00000000b6bd084c, 0x0000000045eb2eb4}, + /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ +- .octa 0x000000014459d70c0000000123c2d592 +- ++ {0x0000000123c2d592, 0x000000014459d70c}, + /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ +- .octa 0x00000001d406ed8200000000159dafce +- ++ {0x00000000159dafce, 0x00000001d406ed82}, + /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ +- .octa 0x0000000160c8e1a80000000127e1a64e +- ++ {0x0000000127e1a64e, 0x0000000160c8e1a8}, + /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ +- .octa 0x0000000027ba80980000000056860754 +- ++ {0x0000000056860754, 0x0000000027ba8098}, + /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ +- .octa 0x000000006d92d01800000001e661aae8 +- ++ {0x00000001e661aae8, 0x000000006d92d018}, + /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ +- .octa 0x000000012ed7e3f200000000f82c6166 +- ++ {0x00000000f82c6166, 0x000000012ed7e3f2}, + /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ +- .octa 0x000000002dc8778800000000c4f9c7ae +- ++ {0x00000000c4f9c7ae, 0x000000002dc87788}, + /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ +- .octa 0x0000000018240bb80000000074203d20 +- ++ {0x0000000074203d20, 0x0000000018240bb8}, + /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ +- .octa 0x000000001ad381580000000198173052 +- ++ {0x0000000198173052, 0x000000001ad38158}, + /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ +- .octa 0x00000001396b78f200000001ce8aba54 +- ++ {0x00000001ce8aba54, 0x00000001396b78f2}, + /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ +- .octa 0x000000011a68133400000001850d5d94 +- ++ {0x00000001850d5d94, 0x000000011a681334}, + /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ +- .octa 0x000000012104732e00000001d609239c +- ++ {0x00000001d609239c, 0x000000012104732e}, + /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ +- .octa 0x00000000a140d90c000000001595f048 +- ++ {0x000000001595f048, 0x00000000a140d90c}, + /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ +- .octa 0x00000001b7215eda0000000042ccee08 +- ++ {0x0000000042ccee08, 0x00000001b7215eda}, + /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ +- .octa 0x00000001aaf1df3c000000010a389d74 +- ++ {0x000000010a389d74, 0x00000001aaf1df3c}, + /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ +- .octa 0x0000000029d15b8a000000012a840da6 +- ++ {0x000000012a840da6, 0x0000000029d15b8a}, + /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ +- .octa 0x00000000f1a96922000000001d181c0c +- ++ {0x000000001d181c0c, 0x00000000f1a96922}, + /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ +- .octa 0x00000001ac80d03c0000000068b7d1f6 +- ++ {0x0000000068b7d1f6, 0x00000001ac80d03c}, + /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ +- .octa 0x000000000f11d56a000000005b0f14fc +- ++ {0x000000005b0f14fc, 0x000000000f11d56a}, + /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ +- .octa 0x00000001f1c022a20000000179e9e730 +- ++ {0x0000000179e9e730, 0x00000001f1c022a2}, + /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ +- .octa 0x0000000173d00ae200000001ce1368d6 +- ++ {0x00000001ce1368d6, 0x0000000173d00ae2}, + /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ +- .octa 0x00000001d4ffe4ac0000000112c3a84c +- ++ {0x0000000112c3a84c, 0x00000001d4ffe4ac}, + /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ +- .octa 0x000000016edc5ae400000000de940fee +- ++ {0x00000000de940fee, 0x000000016edc5ae4}, + /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ +- .octa 0x00000001f1a0214000000000fe896b7e +- ++ {0x00000000fe896b7e, 0x00000001f1a02140}, + /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ +- .octa 0x00000000ca0b28a000000001f797431c +- ++ {0x00000001f797431c, 0x00000000ca0b28a0}, + /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ +- .octa 0x00000001928e30a20000000053e989ba +- ++ {0x0000000053e989ba, 0x00000001928e30a2}, + /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ +- .octa 0x0000000097b1b002000000003920cd16 +- ++ {0x000000003920cd16, 0x0000000097b1b002}, + /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ +- .octa 0x00000000b15bf90600000001e6f579b8 +- ++ {0x00000001e6f579b8, 0x00000000b15bf906}, + /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ +- .octa 0x00000000411c5d52000000007493cb0a +- ++ {0x000000007493cb0a, 0x00000000411c5d52}, + /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ +- .octa 0x00000001c36f330000000001bdd376d8 +- ++ {0x00000001bdd376d8, 0x00000001c36f3300}, + /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ +- .octa 0x00000001119227e0000000016badfee6 +- ++ {0x000000016badfee6, 0x00000001119227e0}, + /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ +- .octa 0x00000000114d47020000000071de5c58 +- ++ {0x0000000071de5c58, 0x00000000114d4702}, + /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ +- .octa 0x00000000458b5b9800000000453f317c +- ++ {0x00000000453f317c, 0x00000000458b5b98}, + /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ +- .octa 0x000000012e31fb8e0000000121675cce +- ++ {0x0000000121675cce, 0x000000012e31fb8e}, + /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ +- .octa 0x000000005cf619d800000001f409ee92 +- ++ {0x00000001f409ee92, 0x000000005cf619d8}, + /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ +- .octa 0x0000000063f4d8b200000000f36b9c88 +- ++ {0x00000000f36b9c88, 0x0000000063f4d8b2}, + /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ +- .octa 0x000000004138dc8a0000000036b398f4 +- ++ {0x0000000036b398f4, 0x000000004138dc8a}, + /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ +- .octa 0x00000001d29ee8e000000001748f9adc +- ++ {0x00000001748f9adc, 0x00000001d29ee8e0}, + /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ +- .octa 0x000000006a08ace800000001be94ec00 +- ++ {0x00000001be94ec00, 0x000000006a08ace8}, + /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ +- .octa 0x0000000127d4201000000000b74370d6 +- ++ {0x00000000b74370d6, 0x0000000127d42010}, + /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ +- .octa 0x0000000019d76b6200000001174d0b98 +- ++ {0x00000001174d0b98, 0x0000000019d76b62}, + /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ +- .octa 0x00000001b1471f6e00000000befc06a4 +- ++ {0x00000000befc06a4, 0x00000001b1471f6e}, + /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ +- .octa 0x00000001f64c19cc00000001ae125288 +- ++ {0x00000001ae125288, 0x00000001f64c19cc}, + /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ +- .octa 0x00000000003c0ea00000000095c19b34 +- ++ {0x0000000095c19b34, 0x00000000003c0ea0}, + /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ +- .octa 0x000000014d73abf600000001a78496f2 +- ++ {0x00000001a78496f2, 0x000000014d73abf6}, + /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ +- .octa 0x00000001620eb84400000001ac5390a0 +- ++ {0x00000001ac5390a0, 0x00000001620eb844}, + /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ +- .octa 0x0000000147655048000000002a80ed6e +- ++ {0x000000002a80ed6e, 0x0000000147655048}, + /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ +- .octa 0x0000000067b5077e00000001fa9b0128 +- ++ {0x00000001fa9b0128, 0x0000000067b5077e}, + /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ +- .octa 0x0000000010ffe20600000001ea94929e +- ++ {0x00000001ea94929e, 0x0000000010ffe206}, + /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ +- .octa 0x000000000fee8f1e0000000125f4305c +- ++ {0x0000000125f4305c, 0x000000000fee8f1e}, + /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ +- .octa 0x00000001da26fbae00000001471e2002 +- ++ {0x00000001471e2002, 0x00000001da26fbae}, + /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ +- .octa 0x00000001b3a8bd880000000132d2253a +- ++ {0x0000000132d2253a, 0x00000001b3a8bd88}, + /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ +- .octa 0x00000000e8f3898e00000000f26b3592 +- ++ {0x00000000f26b3592, 0x00000000e8f3898e}, + /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ +- .octa 0x00000000b0d0d28c00000000bc8b67b0 +- ++ {0x00000000bc8b67b0, 0x00000000b0d0d28c}, + /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ +- .octa 0x0000000030f2a798000000013a826ef2 +- ++ {0x000000013a826ef2, 0x0000000030f2a798}, + /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ +- .octa 0x000000000fba10020000000081482c84 +- ++ {0x0000000081482c84, 0x000000000fba1002}, + /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ +- .octa 0x00000000bdb9bd7200000000e77307c2 +- ++ {0x00000000e77307c2, 0x00000000bdb9bd72}, + /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ +- .octa 0x0000000075d3bf5a00000000d4a07ec8 +- ++ {0x00000000d4a07ec8, 0x0000000075d3bf5a}, + /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ +- .octa 0x00000000ef1f98a00000000017102100 +- ++ {0x0000000017102100, 0x00000000ef1f98a0}, + /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ +- .octa 0x00000000689c760200000000db406486 +- ++ {0x00000000db406486, 0x00000000689c7602}, + /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ +- .octa 0x000000016d5fa5fe0000000192db7f88 +- ++ {0x0000000192db7f88, 0x000000016d5fa5fe}, + /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ +- .octa 0x00000001d0d2b9ca000000018bf67b1e +- ++ {0x000000018bf67b1e, 0x00000001d0d2b9ca}, + /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ +- .octa 0x0000000041e7b470000000007c09163e +- ++ {0x000000007c09163e, 0x0000000041e7b470}, + /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ +- .octa 0x00000001cbb6495e000000000adac060 +- ++ {0x000000000adac060, 0x00000001cbb6495e}, + /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ +- .octa 0x000000010052a0b000000000bd8316ae +- ++ {0x00000000bd8316ae, 0x000000010052a0b0}, + /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ +- .octa 0x00000001d8effb5c000000019f09ab54 +- ++ {0x000000019f09ab54, 0x00000001d8effb5c}, + /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ +- .octa 0x00000001d969853c0000000125155542 +- ++ {0x0000000125155542, 0x00000001d969853c}, + /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ +- .octa 0x00000000523ccce2000000018fdb5882 +- ++ {0x000000018fdb5882, 0x00000000523ccce2}, + /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ +- .octa 0x000000001e2436bc00000000e794b3f4 +- ++ {0x00000000e794b3f4, 0x000000001e2436bc}, + /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ +- .octa 0x00000000ddd1c3a2000000016f9bb022 +- ++ {0x000000016f9bb022, 0x00000000ddd1c3a2}, + /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ +- .octa 0x0000000019fcfe3800000000290c9978 +- ++ {0x00000000290c9978, 0x0000000019fcfe38}, + /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ +- .octa 0x00000001ce95db640000000083c0f350 +- ++ {0x0000000083c0f350, 0x00000001ce95db64}, + /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ +- .octa 0x00000000af5828060000000173ea6628 +- ++ {0x0000000173ea6628, 0x00000000af582806}, + /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ +- .octa 0x00000001006388f600000001c8b4e00a +- ++ {0x00000001c8b4e00a, 0x00000001006388f6}, + /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ +- .octa 0x0000000179eca00a00000000de95d6aa +- ++ {0x00000000de95d6aa, 0x0000000179eca00a}, + /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ +- .octa 0x0000000122410a6a000000010b7f7248 +- ++ {0x000000010b7f7248, 0x0000000122410a6a}, + /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ +- .octa 0x000000004288e87c00000001326e3a06 +- ++ {0x00000001326e3a06, 0x000000004288e87c}, + /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ +- .octa 0x000000016c5490da00000000bb62c2e6 +- ++ {0x00000000bb62c2e6, 0x000000016c5490da}, + /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ +- .octa 0x00000000d1c71f6e0000000156a4b2c2 +- ++ {0x0000000156a4b2c2, 0x00000000d1c71f6e}, + /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ +- .octa 0x00000001b4ce08a6000000011dfe763a +- ++ {0x000000011dfe763a, 0x00000001b4ce08a6}, + /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ +- .octa 0x00000001466ba60c000000007bcca8e2 +- ++ {0x000000007bcca8e2, 0x00000001466ba60c}, + /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ +- .octa 0x00000001f6c488a40000000186118faa +- ++ {0x0000000186118faa, 0x00000001f6c488a4}, + /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ +- .octa 0x000000013bfb06820000000111a65a88 +- ++ {0x0000000111a65a88, 0x000000013bfb0682}, + /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ +- .octa 0x00000000690e9e54000000003565e1c4 +- ++ {0x000000003565e1c4, 0x00000000690e9e54}, + /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ +- .octa 0x00000000281346b6000000012ed02a82 +- ++ {0x000000012ed02a82, 0x00000000281346b6}, + /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ +- .octa 0x000000015646402400000000c486ecfc +- ++ {0x00000000c486ecfc, 0x0000000156464024}, + /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ +- .octa 0x000000016063a8dc0000000001b951b2 +- ++ {0x0000000001b951b2, 0x000000016063a8dc}, + /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ +- .octa 0x0000000116a663620000000048143916 +- ++ {0x0000000048143916, 0x0000000116a66362}, + /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ +- .octa 0x000000017e8aa4d200000001dc2ae124 +- ++ {0x00000001dc2ae124, 0x000000017e8aa4d2}, + /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ +- .octa 0x00000001728eb10c00000001416c58d6 +- ++ {0x00000001416c58d6, 0x00000001728eb10c}, + /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ +- .octa 0x00000001b08fd7fa00000000a479744a +- ++ {0x00000000a479744a, 0x00000001b08fd7fa}, + /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ +- .octa 0x00000001092a16e80000000096ca3a26 +- ++ {0x0000000096ca3a26, 0x00000001092a16e8}, + /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ +- .octa 0x00000000a505637c00000000ff223d4e +- ++ {0x00000000ff223d4e, 0x00000000a505637c}, + /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ +- .octa 0x00000000d94869b2000000010e84da42 +- ++ {0x000000010e84da42, 0x00000000d94869b2}, + /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ +- .octa 0x00000001c8b203ae00000001b61ba3d0 +- ++ {0x00000001b61ba3d0, 0x00000001c8b203ae}, + /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ +- .octa 0x000000005704aea000000000680f2de8 +- ++ {0x00000000680f2de8, 0x000000005704aea0}, + /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ +- .octa 0x000000012e295fa2000000008772a9a8 +- ++ {0x000000008772a9a8, 0x000000012e295fa2}, + /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ +- .octa 0x000000011d0908bc0000000155f295bc +- ++ {0x0000000155f295bc, 0x000000011d0908bc}, + /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ +- .octa 0x0000000193ed97ea00000000595f9282 +- ++ {0x00000000595f9282, 0x0000000193ed97ea}, + /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ +- .octa 0x000000013a0f1c520000000164b1c25a +- ++ {0x0000000164b1c25a, 0x000000013a0f1c52}, + /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ +- .octa 0x000000010c2c40c000000000fbd67c50 +- ++ {0x00000000fbd67c50, 0x000000010c2c40c0}, + /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ +- .octa 0x00000000ff6fac3e0000000096076268 +- ++ {0x0000000096076268, 0x00000000ff6fac3e}, + /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ +- .octa 0x000000017b3609c000000001d288e4cc +- ++ {0x00000001d288e4cc, 0x000000017b3609c0}, + /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ +- .octa 0x0000000088c8c92200000001eaac1bdc +- ++ {0x00000001eaac1bdc, 0x0000000088c8c922}, + /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ +- .octa 0x00000001751baae600000001f1ea39e2 +- ++ {0x00000001f1ea39e2, 0x00000001751baae6}, + /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ +- .octa 0x000000010795297200000001eb6506fc +- ++ {0x00000001eb6506fc, 0x0000000107952972}, + /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ +- .octa 0x0000000162b00abe000000010f806ffe +- ++ {0x000000010f806ffe, 0x0000000162b00abe}, + /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ +- .octa 0x000000000d7b404c000000010408481e +- ++ {0x000000010408481e, 0x000000000d7b404c}, + /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ +- .octa 0x00000000763b13d40000000188260534 +- ++ {0x0000000188260534, 0x00000000763b13d4}, + /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ +- .octa 0x00000000f6dc22d80000000058fc73e0 +- ++ {0x0000000058fc73e0, 0x00000000f6dc22d8}, + /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ +- .octa 0x000000007daae06000000000391c59b8 +- ++ {0x00000000391c59b8, 0x000000007daae060}, + /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ +- .octa 0x000000013359ab7c000000018b638400 +- ++ {0x000000018b638400, 0x000000013359ab7c}, + /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ +- .octa 0x000000008add438a000000011738f5c4 +- ++ {0x000000011738f5c4, 0x000000008add438a}, + /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ +- .octa 0x00000001edbefdea000000008cf7c6da +- ++ {0x000000008cf7c6da, 0x00000001edbefdea}, + /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ +- .octa 0x000000004104e0f800000001ef97fb16 +- ++ {0x00000001ef97fb16, 0x000000004104e0f8}, + /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ +- .octa 0x00000000b48a82220000000102130e20 +- ++ {0x0000000102130e20, 0x00000000b48a8222}, + /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ +- .octa 0x00000001bcb4684400000000db968898 +- ++ {0x00000000db968898, 0x00000001bcb46844}, + /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ +- .octa 0x000000013293ce0a00000000b5047b5e +- ++ {0x00000000b5047b5e, 0x000000013293ce0a}, + /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ +- .octa 0x00000001710d0844000000010b90fdb2 +- ++ {0x000000010b90fdb2, 0x00000001710d0844}, + /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ +- .octa 0x0000000117907f6e000000004834a32e +- ++ {0x000000004834a32e, 0x0000000117907f6e}, + /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ +- .octa 0x0000000087ddf93e0000000059c8f2b0 +- ++ {0x0000000059c8f2b0, 0x0000000087ddf93e}, + /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ +- .octa 0x000000005970e9b00000000122cec508 +- ++ {0x0000000122cec508, 0x000000005970e9b0}, + /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ +- .octa 0x0000000185b2b7d0000000000a330cda +- ++ {0x000000000a330cda, 0x0000000185b2b7d0}, + /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ +- .octa 0x00000001dcee0efc000000014a47148c +- ++ {0x000000014a47148c, 0x00000001dcee0efc}, + /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ +- .octa 0x0000000030da27220000000042c61cb8 +- ++ {0x0000000042c61cb8, 0x0000000030da2722}, + /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ +- .octa 0x000000012f925a180000000012fe6960 +- ++ {0x0000000012fe6960, 0x000000012f925a18}, + /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ +- .octa 0x00000000dd2e357c00000000dbda2c20 +- ++ {0x00000000dbda2c20, 0x00000000dd2e357c}, + /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ +- .octa 0x00000000071c80de000000011122410c +- ++ {0x000000011122410c, 0x00000000071c80de}, + /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ +- .octa 0x000000011513140a00000000977b2070 +- ++ {0x00000000977b2070, 0x000000011513140a}, + /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ +- .octa 0x00000001df876e8e000000014050438e +- ++ {0x000000014050438e, 0x00000001df876e8e}, + /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ +- .octa 0x000000015f81d6ce0000000147c840e8 +- ++ {0x0000000147c840e8, 0x000000015f81d6ce}, + /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ +- .octa 0x000000019dd94dbe00000001cc7c88ce +- ++ {0x00000001cc7c88ce, 0x000000019dd94dbe}, + /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ +- .octa 0x00000001373d206e00000001476b35a4 +- ++ {0x00000001476b35a4, 0x00000001373d206e}, + /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ +- .octa 0x00000000668ccade000000013d52d508 +- ++ {0x000000013d52d508, 0x00000000668ccade}, + /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ +- .octa 0x00000001b192d268000000008e4be32e +- ++ {0x000000008e4be32e, 0x00000001b192d268}, + /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ +- .octa 0x00000000e30f3a7800000000024120fe +- ++ {0x00000000024120fe, 0x00000000e30f3a78}, + /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ +- .octa 0x000000010ef1f7bc00000000ddecddb4 +- ++ {0x00000000ddecddb4, 0x000000010ef1f7bc}, + /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ +- .octa 0x00000001f5ac738000000000d4d403bc +- ++ {0x00000000d4d403bc, 0x00000001f5ac7380}, + /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ +- .octa 0x000000011822ea7000000001734b89aa +- ++ {0x00000001734b89aa, 0x000000011822ea70}, + /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ +- .octa 0x00000000c3a33848000000010e7a58d6 +- ++ {0x000000010e7a58d6, 0x00000000c3a33848}, + /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ +- .octa 0x00000001bd151c2400000001f9f04e9c +- ++ {0x00000001f9f04e9c, 0x00000001bd151c24}, + /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ +- .octa 0x0000000056002d7600000000b692225e +- ++ {0x00000000b692225e, 0x0000000056002d76}, + /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ +- .octa 0x000000014657c4f4000000019b8d3f3e +- ++ {0x000000019b8d3f3e, 0x000000014657c4f4}, + /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ +- .octa 0x0000000113742d7c00000001a874f11e +- ++ {0x00000001a874f11e, 0x0000000113742d7c}, + /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ +- .octa 0x000000019c5920ba000000010d5a4254 +- ++ {0x000000010d5a4254, 0x000000019c5920ba}, + /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ +- .octa 0x000000005216d2d600000000bbb2f5d6 +- ++ {0x00000000bbb2f5d6, 0x000000005216d2d6}, + /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ +- .octa 0x0000000136f5ad8a0000000179cc0e36 +- ++ {0x0000000179cc0e36, 0x0000000136f5ad8a}, + /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ +- .octa 0x000000018b07beb600000001dca1da4a +- ++ {0x00000001dca1da4a, 0x000000018b07beb6}, + /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ +- .octa 0x00000000db1e93b000000000feb1a192 +- ++ {0x00000000feb1a192, 0x00000000db1e93b0}, + /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ +- .octa 0x000000000b96fa3a00000000d1eeedd6 +- ++ {0x00000000d1eeedd6, 0x000000000b96fa3a}, + /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ +- .octa 0x00000001d9968af0000000008fad9bb4 +- ++ {0x000000008fad9bb4, 0x00000001d9968af0}, + /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ +- .octa 0x000000000e4a77a200000001884938e4 +- ++ {0x00000001884938e4, 0x000000000e4a77a2}, + /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ +- .octa 0x00000000508c2ac800000001bc2e9bc0 +- ++ {0x00000001bc2e9bc0, 0x00000000508c2ac8}, + /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ +- .octa 0x0000000021572a8000000001f9658a68 +- ++ {0x00000001f9658a68, 0x0000000021572a80}, + /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ +- .octa 0x00000001b859daf2000000001b9224fc +- ++ {0x000000001b9224fc, 0x00000001b859daf2}, + /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ +- .octa 0x000000016f7884740000000055b2fb84 +- ++ {0x0000000055b2fb84, 0x000000016f788474}, + /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ +- .octa 0x00000001b438810e000000018b090348 +- ++ {0x000000018b090348, 0x00000001b438810e}, + /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ +- .octa 0x0000000095ddc6f2000000011ccbd5ea +- ++ {0x000000011ccbd5ea, 0x0000000095ddc6f2}, + /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ +- .octa 0x00000001d977c20c0000000007ae47f8 +- ++ {0x0000000007ae47f8, 0x00000001d977c20c}, + /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ +- .octa 0x00000000ebedb99a0000000172acbec0 +- ++ {0x0000000172acbec0, 0x00000000ebedb99a}, + /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ +- .octa 0x00000001df9e9e9200000001c6e3ff20 +- ++ {0x00000001c6e3ff20, 0x00000001df9e9e92}, + /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ +- .octa 0x00000001a4a3f95200000000e1b38744 +- ++ {0x00000000e1b38744, 0x00000001a4a3f952}, + /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ +- .octa 0x00000000e2f5122000000000791585b2 +- ++ {0x00000000791585b2, 0x00000000e2f51220}, + /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ +- .octa 0x000000004aa01f3e00000000ac53b894 +- ++ {0x00000000ac53b894, 0x000000004aa01f3e}, + /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ +- .octa 0x00000000b3e90a5800000001ed5f2cf4 +- ++ {0x00000001ed5f2cf4, 0x00000000b3e90a58}, + /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ +- .octa 0x000000000c9ca2aa00000001df48b2e0 +- ++ {0x00000001df48b2e0, 0x000000000c9ca2aa}, + /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ +- .octa 0x000000015168231600000000049c1c62 +- ++ {0x00000000049c1c62, 0x0000000151682316}, + /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ +- .octa 0x0000000036fce78c000000017c460c12 +- ++ {0x000000017c460c12, 0x0000000036fce78c}, + /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ +- .octa 0x000000009037dc10000000015be4da7e +- ++ {0x000000015be4da7e, 0x000000009037dc10}, + /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ +- .octa 0x00000000d3298582000000010f38f668 +- ++ {0x000000010f38f668, 0x00000000d3298582}, + /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ +- .octa 0x00000001b42e8ad60000000039f40a00 +- ++ {0x0000000039f40a00, 0x00000001b42e8ad6}, + /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ +- .octa 0x00000000142a983800000000bd4c10c4 +- ++ {0x00000000bd4c10c4, 0x00000000142a9838}, + /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ +- .octa 0x0000000109c7f1900000000042db1d98 +- ++ {0x0000000042db1d98, 0x0000000109c7f190}, + /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ +- .octa 0x0000000056ff931000000001c905bae6 +- ++ {0x00000001c905bae6, 0x0000000056ff9310}, + /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ +- .octa 0x00000001594513aa00000000069d40ea +- ++ {0x00000000069d40ea, 0x00000001594513aa}, + /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ +- .octa 0x00000001e3b5b1e8000000008e4fbad0 +- ++ {0x000000008e4fbad0, 0x00000001e3b5b1e8}, + /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ +- .octa 0x000000011dd5fc080000000047bedd46 +- ++ {0x0000000047bedd46, 0x000000011dd5fc08}, + /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ +- .octa 0x00000001675f0cc20000000026396bf8 +- ++ {0x0000000026396bf8, 0x00000001675f0cc2}, + /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ +- .octa 0x00000000d1c8dd4400000000379beb92 +- ++ {0x00000000379beb92, 0x00000000d1c8dd44}, + /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ +- .octa 0x0000000115ebd3d8000000000abae54a +- ++ {0x000000000abae54a, 0x0000000115ebd3d8}, + /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ +- .octa 0x00000001ecbd0dac0000000007e6a128 +- ++ {0x0000000007e6a128, 0x00000001ecbd0dac}, + /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ +- .octa 0x00000000cdf67af2000000000ade29d2 +- ++ {0x000000000ade29d2, 0x00000000cdf67af2}, + /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ +- .octa 0x000000004c01ff4c00000000f974c45c +- ++ {0x00000000f974c45c, 0x000000004c01ff4c}, + /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ +- .octa 0x00000000f2d8657e00000000e77ac60a +- ++ {0x00000000e77ac60a, 0x00000000f2d8657e}, + /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ +- .octa 0x000000006bae74c40000000145895816 +- ++ {0x0000000145895816, 0x000000006bae74c4}, + /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ +- .octa 0x0000000152af8aa00000000038e362be +- ++ {0x0000000038e362be, 0x0000000152af8aa0}, + /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ +- .octa 0x0000000004663802000000007f991a64 +- ++ {0x000000007f991a64, 0x0000000004663802}, + /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ +- .octa 0x00000001ab2f5afc00000000fa366d3a +- ++ {0x00000000fa366d3a, 0x00000001ab2f5afc}, + /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ +- .octa 0x0000000074a4ebd400000001a2bb34f0 +- ++ {0x00000001a2bb34f0, 0x0000000074a4ebd4}, + /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ +- .octa 0x00000001d7ab3a4c0000000028a9981e +- ++ {0x0000000028a9981e, 0x00000001d7ab3a4c}, + /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ +- .octa 0x00000001a8da60c600000001dbc672be +- ++ {0x00000001dbc672be, 0x00000001a8da60c6}, + /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ +- .octa 0x000000013cf6382000000000b04d77f6 +- ++ {0x00000000b04d77f6, 0x000000013cf63820}, + /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ +- .octa 0x00000000bec12e1e0000000124400d96 +- ++ {0x0000000124400d96, 0x00000000bec12e1e}, + /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ +- .octa 0x00000001c6368010000000014ca4b414 +- ++ {0x000000014ca4b414, 0x00000001c6368010}, + /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ +- .octa 0x00000001e6e78758000000012fe2c938 +- ++ {0x000000012fe2c938, 0x00000001e6e78758}, + /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ +- .octa 0x000000008d7f2b3c00000001faed01e6 +- ++ {0x00000001faed01e6, 0x000000008d7f2b3c}, + /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ +- .octa 0x000000016b4a156e000000007e80ecfe +- ++ {0x000000007e80ecfe, 0x000000016b4a156e}, + /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ +- .octa 0x00000001c63cfeb60000000098daee94 +- ++ {0x0000000098daee94, 0x00000001c63cfeb6}, + /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ +- .octa 0x000000015f902670000000010a04edea +- ++ {0x000000010a04edea, 0x000000015f902670}, + /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ +- .octa 0x00000001cd5de11e00000001c00b4524 +- ++ {0x00000001c00b4524, 0x00000001cd5de11e}, + /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ +- .octa 0x000000001acaec540000000170296550 +- ++ {0x0000000170296550, 0x000000001acaec54}, + /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ +- .octa 0x000000002bd0ca780000000181afaa48 +- ++ {0x0000000181afaa48, 0x000000002bd0ca78}, + /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ +- .octa 0x0000000032d63d5c0000000185a31ffa +- ++ {0x0000000185a31ffa, 0x0000000032d63d5c}, + /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ +- .octa 0x000000001c6d4e4c000000002469f608 +- ++ {0x000000002469f608, 0x000000001c6d4e4c}, + /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ +- .octa 0x0000000106a60b92000000006980102a +- ++ {0x000000006980102a, 0x0000000106a60b92}, + /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ +- .octa 0x00000000d3855e120000000111ea9ca8 +- ++ {0x0000000111ea9ca8, 0x00000000d3855e12}, + /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ +- .octa 0x00000000e312563600000001bd1d29ce +- ++ {0x00000001bd1d29ce, 0x00000000e3125636}, + /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ +- .octa 0x000000009e8f7ea400000001b34b9580 +- ++ {0x00000001b34b9580, 0x000000009e8f7ea4}, + /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ +- .octa 0x00000001c82e562c000000003076054e +- ++ {0x000000003076054e, 0x00000001c82e562c}, + /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ +- .octa 0x00000000ca9f09ce000000012a608ea4 +- ++ {0x000000012a608ea4, 0x00000000ca9f09ce}, + /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ +- .octa 0x00000000c63764e600000000784d05fe +- ++ {0x00000000784d05fe, 0x00000000c63764e6}, + /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ +- .octa 0x0000000168d2e49e000000016ef0d82a +- ++ {0x000000016ef0d82a, 0x0000000168d2e49e}, + /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ +- .octa 0x00000000e986c1480000000075bda454 +- ++ {0x0000000075bda454, 0x00000000e986c148}, + /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ +- .octa 0x00000000cfb65894000000003dc0a1c4 +- ++ {0x000000003dc0a1c4, 0x00000000cfb65894}, + /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ +- .octa 0x0000000111cadee400000000e9a5d8be +- ++ {0x00000000e9a5d8be, 0x0000000111cadee4}, + /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ +- .octa 0x0000000171fb63ce00000001609bc4b4 +- +- .short_constants : +- +- /* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include +- the trailing 32 bits of zeros */ +- /* x^1952 mod p(x)`, x^1984 mod p(x)`, x^2016 mod p(x)`, x^2048 mod +- p(x)` */ +- .octa 0x7fec2963e5bf80485cf015c388e56f72 +- +- /* x^1824 mod p(x)`, x^1856 mod p(x)`, x^1888 mod p(x)`, x^1920 mod +- p(x)` */ +- .octa 0x38e888d4844752a9963a18920246e2e6 +- +- /* x^1696 mod p(x)`, x^1728 mod p(x)`, x^1760 mod p(x)`, x^1792 mod +- p(x)` */ +- .octa 0x42316c00730206ad419a441956993a31 +- +- /* x^1568 mod p(x)`, x^1600 mod p(x)`, x^1632 mod p(x)`, x^1664 mod +- p(x)` */ +- .octa 0x543d5c543e65ddf9924752ba2b830011 +- +- /* x^1440 mod p(x)`, x^1472 mod p(x)`, x^1504 mod p(x)`, x^1536 mod +- p(x)` */ +- .octa 0x78e87aaf56767c9255bd7f9518e4a304 +- +- /* x^1312 mod p(x)`, x^1344 mod p(x)`, x^1376 mod p(x)`, x^1408 mod +- p(x)` */ +- .octa 0x8f68fcec1903da7f6d76739fe0553f1e +- +- /* x^1184 mod p(x)`, x^1216 mod p(x)`, x^1248 mod p(x)`, x^1280 mod +- p(x)` */ +- .octa 0x3f4840246791d588c133722b1fe0b5c3 +- +- /* x^1056 mod p(x)`, x^1088 mod p(x)`, x^1120 mod p(x)`, x^1152 mod +- p(x)` */ +- .octa 0x34c96751b04de25a64b67ee0e55ef1f3 +- +- /* x^928 mod p(x)`, x^960 mod p(x)`, x^992 mod p(x)`, x^1024 mod p(x)` +- */ +- .octa 0x156c8e180b4a395b069db049b8fdb1e7 +- +- /* x^800 mod p(x)`, x^832 mod p(x)`, x^864 mod p(x)`, x^896 mod p(x)` */ +- .octa 0xe0b99ccbe661f7bea11bfaf3c9e90b9e +- +- /* x^672 mod p(x)`, x^704 mod p(x)`, x^736 mod p(x)`, x^768 mod p(x)` */ +- .octa 0x041d37768cd75659817cdc5119b29a35 +- +- /* x^544 mod p(x)`, x^576 mod p(x)`, x^608 mod p(x)`, x^640 mod p(x)` */ +- .octa 0x3a0777818cfaa9651ce9d94b36c41f1c +- +- /* x^416 mod p(x)`, x^448 mod p(x)`, x^480 mod p(x)`, x^512 mod p(x)` */ +- .octa 0x0e148e8252377a554f256efcb82be955 +- +- /* x^288 mod p(x)`, x^320 mod p(x)`, x^352 mod p(x)`, x^384 mod p(x)` */ +- .octa 0x9c25531d19e65ddeec1631edb2dea967 +- +- /* x^160 mod p(x)`, x^192 mod p(x)`, x^224 mod p(x)`, x^256 mod p(x)` */ +- .octa 0x790606ff9957c0a65d27e147510ac59a ++ {0x00000001609bc4b4, 0x0000000171fb63ce} ++#else /* __LITTLE_ENDIAN__ */ ++ /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ ++ {0x00000000b6ca9e20, 0x000000009c37c408}, ++ /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ ++ {0x00000000350249a8, 0x00000001b51df26c}, ++ /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ ++ {0x00000001862dac54, 0x000000000724b9d0}, ++ /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ ++ {0x00000001d87fb48c, 0x00000001c00532fe}, ++ /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ ++ {0x00000001f39b699e, 0x00000000f05a9362}, ++ /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ ++ {0x0000000101da11b4, 0x00000001e1007970}, ++ /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ ++ {0x00000001cab571e0, 0x00000000a57366ee}, ++ /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ ++ {0x00000000c7020cfe, 0x0000000192011284}, ++ /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ ++ {0x00000000cdaed1ae, 0x0000000162716d9a}, ++ /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ ++ {0x00000001e804effc, 0x00000000cd97ecde}, ++ /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ ++ {0x0000000077c3ea3a, 0x0000000058812bc0}, ++ /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ ++ {0x0000000068df31b4, 0x0000000088b8c12e}, ++ /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ ++ {0x00000000b059b6c2, 0x00000001230b234c}, ++ /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ ++ {0x0000000145fb8ed8, 0x00000001120b416e}, ++ /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ ++ {0x00000000cbc09168, 0x00000001974aecb0}, ++ /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ ++ {0x000000005ceeedc2, 0x000000008ee3f226}, ++ /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ ++ {0x0000000047d74e86, 0x00000001089aba9a}, ++ /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ ++ {0x00000001407e9e22, 0x0000000065113872}, ++ /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ ++ {0x00000001da967bda, 0x000000005c07ec10}, ++ /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ ++ {0x000000006c898368, 0x0000000187590924}, ++ /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ ++ {0x00000000f2d14c98, 0x00000000e35da7c6}, ++ /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ ++ {0x00000001993c6ad4, 0x000000000415855a}, ++ /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ ++ {0x000000014683d1ac, 0x0000000073617758}, ++ /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ ++ {0x00000001a7c93e6c, 0x0000000176021d28}, ++ /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ ++ {0x000000010211e90a, 0x00000001c358fd0a}, ++ /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ ++ {0x000000001119403e, 0x00000001ff7a2c18}, ++ /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ ++ {0x000000001c3261aa, 0x00000000f2d9f7e4}, ++ /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ ++ {0x000000014e37a634, 0x000000016cf1f9c8}, ++ /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ ++ {0x0000000073786c0c, 0x000000010af9279a}, ++ /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ ++ {0x000000011dc037f8, 0x0000000004f101e8}, ++ /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ ++ {0x0000000031433dfc, 0x0000000070bcf184}, ++ /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ ++ {0x000000009cde8348, 0x000000000a8de642}, ++ /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ ++ {0x0000000038d3c2a6, 0x0000000062ea130c}, ++ /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ ++ {0x000000011b25f260, 0x00000001eb31cbb2}, ++ /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ ++ {0x000000001629e6f0, 0x0000000170783448}, ++ /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ ++ {0x0000000160838b4c, 0x00000001a684b4c6}, ++ /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ ++ {0x000000007a44011c, 0x00000000253ca5b4}, ++ /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ ++ {0x00000000226f417a, 0x0000000057b4b1e2}, ++ /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ ++ {0x0000000045eb2eb4, 0x00000000b6bd084c}, ++ /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ ++ {0x000000014459d70c, 0x0000000123c2d592}, ++ /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ ++ {0x00000001d406ed82, 0x00000000159dafce}, ++ /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ ++ {0x0000000160c8e1a8, 0x0000000127e1a64e}, ++ /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ ++ {0x0000000027ba8098, 0x0000000056860754}, ++ /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ ++ {0x000000006d92d018, 0x00000001e661aae8}, ++ /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ ++ {0x000000012ed7e3f2, 0x00000000f82c6166}, ++ /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ ++ {0x000000002dc87788, 0x00000000c4f9c7ae}, ++ /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ ++ {0x0000000018240bb8, 0x0000000074203d20}, ++ /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ ++ {0x000000001ad38158, 0x0000000198173052}, ++ /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ ++ {0x00000001396b78f2, 0x00000001ce8aba54}, ++ /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ ++ {0x000000011a681334, 0x00000001850d5d94}, ++ /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ ++ {0x000000012104732e, 0x00000001d609239c}, ++ /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ ++ {0x00000000a140d90c, 0x000000001595f048}, ++ /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ ++ {0x00000001b7215eda, 0x0000000042ccee08}, ++ /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ ++ {0x00000001aaf1df3c, 0x000000010a389d74}, ++ /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ ++ {0x0000000029d15b8a, 0x000000012a840da6}, ++ /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ ++ {0x00000000f1a96922, 0x000000001d181c0c}, ++ /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ ++ {0x00000001ac80d03c, 0x0000000068b7d1f6}, ++ /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ ++ {0x000000000f11d56a, 0x000000005b0f14fc}, ++ /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ ++ {0x00000001f1c022a2, 0x0000000179e9e730}, ++ /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ ++ {0x0000000173d00ae2, 0x00000001ce1368d6}, ++ /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ ++ {0x00000001d4ffe4ac, 0x0000000112c3a84c}, ++ /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ ++ {0x000000016edc5ae4, 0x00000000de940fee}, ++ /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ ++ {0x00000001f1a02140, 0x00000000fe896b7e}, ++ /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ ++ {0x00000000ca0b28a0, 0x00000001f797431c}, ++ /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ ++ {0x00000001928e30a2, 0x0000000053e989ba}, ++ /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ ++ {0x0000000097b1b002, 0x000000003920cd16}, ++ /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ ++ {0x00000000b15bf906, 0x00000001e6f579b8}, ++ /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ ++ {0x00000000411c5d52, 0x000000007493cb0a}, ++ /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ ++ {0x00000001c36f3300, 0x00000001bdd376d8}, ++ /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ ++ {0x00000001119227e0, 0x000000016badfee6}, ++ /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ ++ {0x00000000114d4702, 0x0000000071de5c58}, ++ /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ ++ {0x00000000458b5b98, 0x00000000453f317c}, ++ /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ ++ {0x000000012e31fb8e, 0x0000000121675cce}, ++ /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ ++ {0x000000005cf619d8, 0x00000001f409ee92}, ++ /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ ++ {0x0000000063f4d8b2, 0x00000000f36b9c88}, ++ /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ ++ {0x000000004138dc8a, 0x0000000036b398f4}, ++ /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ ++ {0x00000001d29ee8e0, 0x00000001748f9adc}, ++ /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ ++ {0x000000006a08ace8, 0x00000001be94ec00}, ++ /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ ++ {0x0000000127d42010, 0x00000000b74370d6}, ++ /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ ++ {0x0000000019d76b62, 0x00000001174d0b98}, ++ /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ ++ {0x00000001b1471f6e, 0x00000000befc06a4}, ++ /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ ++ {0x00000001f64c19cc, 0x00000001ae125288}, ++ /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ ++ {0x00000000003c0ea0, 0x0000000095c19b34}, ++ /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ ++ {0x000000014d73abf6, 0x00000001a78496f2}, ++ /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ ++ {0x00000001620eb844, 0x00000001ac5390a0}, ++ /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ ++ {0x0000000147655048, 0x000000002a80ed6e}, ++ /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ ++ {0x0000000067b5077e, 0x00000001fa9b0128}, ++ /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ ++ {0x0000000010ffe206, 0x00000001ea94929e}, ++ /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ ++ {0x000000000fee8f1e, 0x0000000125f4305c}, ++ /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ ++ {0x00000001da26fbae, 0x00000001471e2002}, ++ /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ ++ {0x00000001b3a8bd88, 0x0000000132d2253a}, ++ /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ ++ {0x00000000e8f3898e, 0x00000000f26b3592}, ++ /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ ++ {0x00000000b0d0d28c, 0x00000000bc8b67b0}, ++ /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ ++ {0x0000000030f2a798, 0x000000013a826ef2}, ++ /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ ++ {0x000000000fba1002, 0x0000000081482c84}, ++ /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ ++ {0x00000000bdb9bd72, 0x00000000e77307c2}, ++ /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ ++ {0x0000000075d3bf5a, 0x00000000d4a07ec8}, ++ /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ ++ {0x00000000ef1f98a0, 0x0000000017102100}, ++ /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ ++ {0x00000000689c7602, 0x00000000db406486}, ++ /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ ++ {0x000000016d5fa5fe, 0x0000000192db7f88}, ++ /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ ++ {0x00000001d0d2b9ca, 0x000000018bf67b1e}, ++ /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ ++ {0x0000000041e7b470, 0x000000007c09163e}, ++ /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ ++ {0x00000001cbb6495e, 0x000000000adac060}, ++ /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ ++ {0x000000010052a0b0, 0x00000000bd8316ae}, ++ /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ ++ {0x00000001d8effb5c, 0x000000019f09ab54}, ++ /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ ++ {0x00000001d969853c, 0x0000000125155542}, ++ /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ ++ {0x00000000523ccce2, 0x000000018fdb5882}, ++ /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ ++ {0x000000001e2436bc, 0x00000000e794b3f4}, ++ /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ ++ {0x00000000ddd1c3a2, 0x000000016f9bb022}, ++ /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ ++ {0x0000000019fcfe38, 0x00000000290c9978}, ++ /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ ++ {0x00000001ce95db64, 0x0000000083c0f350}, ++ /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ ++ {0x00000000af582806, 0x0000000173ea6628}, ++ /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ ++ {0x00000001006388f6, 0x00000001c8b4e00a}, ++ /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ ++ {0x0000000179eca00a, 0x00000000de95d6aa}, ++ /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ ++ {0x0000000122410a6a, 0x000000010b7f7248}, ++ /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ ++ {0x000000004288e87c, 0x00000001326e3a06}, ++ /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ ++ {0x000000016c5490da, 0x00000000bb62c2e6}, ++ /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ ++ {0x00000000d1c71f6e, 0x0000000156a4b2c2}, ++ /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ ++ {0x00000001b4ce08a6, 0x000000011dfe763a}, ++ /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ ++ {0x00000001466ba60c, 0x000000007bcca8e2}, ++ /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ ++ {0x00000001f6c488a4, 0x0000000186118faa}, ++ /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ ++ {0x000000013bfb0682, 0x0000000111a65a88}, ++ /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ ++ {0x00000000690e9e54, 0x000000003565e1c4}, ++ /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ ++ {0x00000000281346b6, 0x000000012ed02a82}, ++ /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ ++ {0x0000000156464024, 0x00000000c486ecfc}, ++ /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ ++ {0x000000016063a8dc, 0x0000000001b951b2}, ++ /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ ++ {0x0000000116a66362, 0x0000000048143916}, ++ /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ ++ {0x000000017e8aa4d2, 0x00000001dc2ae124}, ++ /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ ++ {0x00000001728eb10c, 0x00000001416c58d6}, ++ /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ ++ {0x00000001b08fd7fa, 0x00000000a479744a}, ++ /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ ++ {0x00000001092a16e8, 0x0000000096ca3a26}, ++ /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ ++ {0x00000000a505637c, 0x00000000ff223d4e}, ++ /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ ++ {0x00000000d94869b2, 0x000000010e84da42}, ++ /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ ++ {0x00000001c8b203ae, 0x00000001b61ba3d0}, ++ /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ ++ {0x000000005704aea0, 0x00000000680f2de8}, ++ /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ ++ {0x000000012e295fa2, 0x000000008772a9a8}, ++ /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ ++ {0x000000011d0908bc, 0x0000000155f295bc}, ++ /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ ++ {0x0000000193ed97ea, 0x00000000595f9282}, ++ /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ ++ {0x000000013a0f1c52, 0x0000000164b1c25a}, ++ /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ ++ {0x000000010c2c40c0, 0x00000000fbd67c50}, ++ /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ ++ {0x00000000ff6fac3e, 0x0000000096076268}, ++ /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ ++ {0x000000017b3609c0, 0x00000001d288e4cc}, ++ /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ ++ {0x0000000088c8c922, 0x00000001eaac1bdc}, ++ /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ ++ {0x00000001751baae6, 0x00000001f1ea39e2}, ++ /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ ++ {0x0000000107952972, 0x00000001eb6506fc}, ++ /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ ++ {0x0000000162b00abe, 0x000000010f806ffe}, ++ /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ ++ {0x000000000d7b404c, 0x000000010408481e}, ++ /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ ++ {0x00000000763b13d4, 0x0000000188260534}, ++ /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ ++ {0x00000000f6dc22d8, 0x0000000058fc73e0}, ++ /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ ++ {0x000000007daae060, 0x00000000391c59b8}, ++ /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ ++ {0x000000013359ab7c, 0x000000018b638400}, ++ /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ ++ {0x000000008add438a, 0x000000011738f5c4}, ++ /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ ++ {0x00000001edbefdea, 0x000000008cf7c6da}, ++ /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ ++ {0x000000004104e0f8, 0x00000001ef97fb16}, ++ /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ ++ {0x00000000b48a8222, 0x0000000102130e20}, ++ /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ ++ {0x00000001bcb46844, 0x00000000db968898}, ++ /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ ++ {0x000000013293ce0a, 0x00000000b5047b5e}, ++ /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ ++ {0x00000001710d0844, 0x000000010b90fdb2}, ++ /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ ++ {0x0000000117907f6e, 0x000000004834a32e}, ++ /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ ++ {0x0000000087ddf93e, 0x0000000059c8f2b0}, ++ /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ ++ {0x000000005970e9b0, 0x0000000122cec508}, ++ /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ ++ {0x0000000185b2b7d0, 0x000000000a330cda}, ++ /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ ++ {0x00000001dcee0efc, 0x000000014a47148c}, ++ /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ ++ {0x0000000030da2722, 0x0000000042c61cb8}, ++ /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ ++ {0x000000012f925a18, 0x0000000012fe6960}, ++ /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ ++ {0x00000000dd2e357c, 0x00000000dbda2c20}, ++ /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ ++ {0x00000000071c80de, 0x000000011122410c}, ++ /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ ++ {0x000000011513140a, 0x00000000977b2070}, ++ /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ ++ {0x00000001df876e8e, 0x000000014050438e}, ++ /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ ++ {0x000000015f81d6ce, 0x0000000147c840e8}, ++ /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ ++ {0x000000019dd94dbe, 0x00000001cc7c88ce}, ++ /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ ++ {0x00000001373d206e, 0x00000001476b35a4}, ++ /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ ++ {0x00000000668ccade, 0x000000013d52d508}, ++ /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ ++ {0x00000001b192d268, 0x000000008e4be32e}, ++ /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ ++ {0x00000000e30f3a78, 0x00000000024120fe}, ++ /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ ++ {0x000000010ef1f7bc, 0x00000000ddecddb4}, ++ /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ ++ {0x00000001f5ac7380, 0x00000000d4d403bc}, ++ /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ ++ {0x000000011822ea70, 0x00000001734b89aa}, ++ /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ ++ {0x00000000c3a33848, 0x000000010e7a58d6}, ++ /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ ++ {0x00000001bd151c24, 0x00000001f9f04e9c}, ++ /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ ++ {0x0000000056002d76, 0x00000000b692225e}, ++ /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ ++ {0x000000014657c4f4, 0x000000019b8d3f3e}, ++ /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ ++ {0x0000000113742d7c, 0x00000001a874f11e}, ++ /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ ++ {0x000000019c5920ba, 0x000000010d5a4254}, ++ /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ ++ {0x000000005216d2d6, 0x00000000bbb2f5d6}, ++ /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ ++ {0x0000000136f5ad8a, 0x0000000179cc0e36}, ++ /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ ++ {0x000000018b07beb6, 0x00000001dca1da4a}, ++ /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ ++ {0x00000000db1e93b0, 0x00000000feb1a192}, ++ /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ ++ {0x000000000b96fa3a, 0x00000000d1eeedd6}, ++ /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ ++ {0x00000001d9968af0, 0x000000008fad9bb4}, ++ /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ ++ {0x000000000e4a77a2, 0x00000001884938e4}, ++ /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ ++ {0x00000000508c2ac8, 0x00000001bc2e9bc0}, ++ /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ ++ {0x0000000021572a80, 0x00000001f9658a68}, ++ /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ ++ {0x00000001b859daf2, 0x000000001b9224fc}, ++ /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ ++ {0x000000016f788474, 0x0000000055b2fb84}, ++ /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ ++ {0x00000001b438810e, 0x000000018b090348}, ++ /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ ++ {0x0000000095ddc6f2, 0x000000011ccbd5ea}, ++ /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ ++ {0x00000001d977c20c, 0x0000000007ae47f8}, ++ /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ ++ {0x00000000ebedb99a, 0x0000000172acbec0}, ++ /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ ++ {0x00000001df9e9e92, 0x00000001c6e3ff20}, ++ /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ ++ {0x00000001a4a3f952, 0x00000000e1b38744}, ++ /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ ++ {0x00000000e2f51220, 0x00000000791585b2}, ++ /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ ++ {0x000000004aa01f3e, 0x00000000ac53b894}, ++ /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ ++ {0x00000000b3e90a58, 0x00000001ed5f2cf4}, ++ /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ ++ {0x000000000c9ca2aa, 0x00000001df48b2e0}, ++ /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ ++ {0x0000000151682316, 0x00000000049c1c62}, ++ /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ ++ {0x0000000036fce78c, 0x000000017c460c12}, ++ /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ ++ {0x000000009037dc10, 0x000000015be4da7e}, ++ /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ ++ {0x00000000d3298582, 0x000000010f38f668}, ++ /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ ++ {0x00000001b42e8ad6, 0x0000000039f40a00}, ++ /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ ++ {0x00000000142a9838, 0x00000000bd4c10c4}, ++ /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ ++ {0x0000000109c7f190, 0x0000000042db1d98}, ++ /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ ++ {0x0000000056ff9310, 0x00000001c905bae6}, ++ /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ ++ {0x00000001594513aa, 0x00000000069d40ea}, ++ /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ ++ {0x00000001e3b5b1e8, 0x000000008e4fbad0}, ++ /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ ++ {0x000000011dd5fc08, 0x0000000047bedd46}, ++ /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ ++ {0x00000001675f0cc2, 0x0000000026396bf8}, ++ /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ ++ {0x00000000d1c8dd44, 0x00000000379beb92}, ++ /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ ++ {0x0000000115ebd3d8, 0x000000000abae54a}, ++ /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ ++ {0x00000001ecbd0dac, 0x0000000007e6a128}, ++ /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ ++ {0x00000000cdf67af2, 0x000000000ade29d2}, ++ /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ ++ {0x000000004c01ff4c, 0x00000000f974c45c}, ++ /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ ++ {0x00000000f2d8657e, 0x00000000e77ac60a}, ++ /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ ++ {0x000000006bae74c4, 0x0000000145895816}, ++ /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ ++ {0x0000000152af8aa0, 0x0000000038e362be}, ++ /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ ++ {0x0000000004663802, 0x000000007f991a64}, ++ /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ ++ {0x00000001ab2f5afc, 0x00000000fa366d3a}, ++ /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ ++ {0x0000000074a4ebd4, 0x00000001a2bb34f0}, ++ /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ ++ {0x00000001d7ab3a4c, 0x0000000028a9981e}, ++ /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ ++ {0x00000001a8da60c6, 0x00000001dbc672be}, ++ /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ ++ {0x000000013cf63820, 0x00000000b04d77f6}, ++ /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ ++ {0x00000000bec12e1e, 0x0000000124400d96}, ++ /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ ++ {0x00000001c6368010, 0x000000014ca4b414}, ++ /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ ++ {0x00000001e6e78758, 0x000000012fe2c938}, ++ /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ ++ {0x000000008d7f2b3c, 0x00000001faed01e6}, ++ /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ ++ {0x000000016b4a156e, 0x000000007e80ecfe}, ++ /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ ++ {0x00000001c63cfeb6, 0x0000000098daee94}, ++ /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ ++ {0x000000015f902670, 0x000000010a04edea}, ++ /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ ++ {0x00000001cd5de11e, 0x00000001c00b4524}, ++ /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ ++ {0x000000001acaec54, 0x0000000170296550}, ++ /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ ++ {0x000000002bd0ca78, 0x0000000181afaa48}, ++ /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ ++ {0x0000000032d63d5c, 0x0000000185a31ffa}, ++ /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ ++ {0x000000001c6d4e4c, 0x000000002469f608}, ++ /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ ++ {0x0000000106a60b92, 0x000000006980102a}, ++ /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ ++ {0x00000000d3855e12, 0x0000000111ea9ca8}, ++ /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ ++ {0x00000000e3125636, 0x00000001bd1d29ce}, ++ /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ ++ {0x000000009e8f7ea4, 0x00000001b34b9580}, ++ /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ ++ {0x00000001c82e562c, 0x000000003076054e}, ++ /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ ++ {0x00000000ca9f09ce, 0x000000012a608ea4}, ++ /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ ++ {0x00000000c63764e6, 0x00000000784d05fe}, ++ /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ ++ {0x0000000168d2e49e, 0x000000016ef0d82a}, ++ /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ ++ {0x00000000e986c148, 0x0000000075bda454}, ++ /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ ++ {0x00000000cfb65894, 0x000000003dc0a1c4}, ++ /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ ++ {0x0000000111cadee4, 0x00000000e9a5d8be}, ++ /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ ++ {0x0000000171fb63ce, 0x00000001609bc4b4} ++#endif /* __LITTLE_ENDIAN__ */ ++}; + +- /* x^32 mod p(x)`, x^64 mod p(x)`, x^96 mod p(x)`, x^128 mod p(x)` */ +- .octa 0x82f63b786ea2d55ca66805eb18b8ea18 ++/* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the ++ * trailing 32 bits of zeros */ ++ ++static const __vector unsigned long long vcrc_short_const[16] __attribute__(( ++ aligned(16))) = { ++#ifdef __LITTLE_ENDIAN__ ++ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ ++ {0x5cf015c388e56f72, 0x7fec2963e5bf8048}, ++ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ ++ {0x963a18920246e2e6, 0x38e888d4844752a9}, ++ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ ++ {0x419a441956993a31, 0x42316c00730206ad}, ++ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ ++ {0x924752ba2b830011, 0x543d5c543e65ddf9}, ++ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ ++ {0x55bd7f9518e4a304, 0x78e87aaf56767c92}, ++ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ ++ {0x6d76739fe0553f1e, 0x8f68fcec1903da7f}, ++ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ ++ {0xc133722b1fe0b5c3, 0x3f4840246791d588}, ++ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ ++ {0x64b67ee0e55ef1f3, 0x34c96751b04de25a}, ++ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ ++ {0x069db049b8fdb1e7, 0x156c8e180b4a395b}, ++ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ ++ {0xa11bfaf3c9e90b9e, 0xe0b99ccbe661f7be}, ++ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ ++ {0x817cdc5119b29a35, 0x041d37768cd75659}, ++ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ ++ {0x1ce9d94b36c41f1c, 0x3a0777818cfaa965}, ++ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ ++ {0x4f256efcb82be955, 0x0e148e8252377a55}, ++ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ ++ {0xec1631edb2dea967, 0x9c25531d19e65dde}, ++ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ ++ {0x5d27e147510ac59a, 0x790606ff9957c0a6}, ++ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ ++ {0xa66805eb18b8ea18, 0x82f63b786ea2d55c} ++#else /* __LITTLE_ENDIAN__ */ ++ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ ++ {0x7fec2963e5bf8048, 0x5cf015c388e56f72}, ++ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ ++ {0x38e888d4844752a9, 0x963a18920246e2e6}, ++ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ ++ {0x42316c00730206ad, 0x419a441956993a31}, ++ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ ++ {0x543d5c543e65ddf9, 0x924752ba2b830011}, ++ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ ++ {0x78e87aaf56767c92, 0x55bd7f9518e4a304}, ++ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ ++ {0x8f68fcec1903da7f, 0x6d76739fe0553f1e}, ++ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ ++ {0x3f4840246791d588, 0xc133722b1fe0b5c3}, ++ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ ++ {0x34c96751b04de25a, 0x64b67ee0e55ef1f3}, ++ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ ++ {0x156c8e180b4a395b, 0x069db049b8fdb1e7}, ++ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ ++ {0xe0b99ccbe661f7be, 0xa11bfaf3c9e90b9e}, ++ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ ++ {0x041d37768cd75659, 0x817cdc5119b29a35}, ++ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ ++ {0x3a0777818cfaa965, 0x1ce9d94b36c41f1c}, ++ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ ++ {0x0e148e8252377a55, 0x4f256efcb82be955}, ++ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ ++ {0x9c25531d19e65dde, 0xec1631edb2dea967}, ++ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ ++ {0x790606ff9957c0a6, 0x5d27e147510ac59a}, ++ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ ++ {0x82f63b786ea2d55c, 0xa66805eb18b8ea18} ++#endif /* __LITTLE_ENDIAN__ */ ++}; + +- .barrett_constants : +- /* 33 bit reflected Barrett constant m - (4^32)/n */ +- .octa 0x000000000000000000000000dea713f1 /* x^64 div p(x)` */ +- /* 33 bit reflected Barrett constant n */ +- .octa 0x00000000000000000000000105ec76f1 +-#endif ++/* Barrett constants */ ++/* 33 bit reflected Barrett constant m - (4^32)/n */ ++ ++static const __vector unsigned long long v_Barrett_const[2] ++ __attribute__((aligned(16))) = { ++/* x^64 div p(x) */ ++#ifdef __LITTLE_ENDIAN__ ++ {0x00000000dea713f1, 0x0000000000000000}, ++ {0x0000000105ec76f1, 0x0000000000000000} ++#else /* __LITTLE_ENDIAN__ */ ++ {0x0000000000000000, 0x00000000dea713f1}, ++ {0x0000000000000000, 0x0000000105ec76f1} ++#endif /* __LITTLE_ENDIAN__ */ ++}; ++#endif /* POWER8_INTRINSICS */ +diff --git a/util/crc32c_test.cc b/util/crc32c_test.cc +index 3e4f7396e7..546c6a4401 100644 +--- a/util/crc32c_test.cc ++++ b/util/crc32c_test.cc +@@ -108,6 +108,9 @@ TEST(CRC, StandardResults) { + EXPECT_EQ(~expected.crc32c, result); + } + ++ // NULL buffer ++ EXPECT_EQ((uint32_t)0, Value(NULL, 0)); ++ + // Test 2: stitching two computations + for (auto expected : expectedResults) { + size_t partialLength = expected.length / 2; diff --git a/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch b/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch deleted file mode 100644 index f0f409736..000000000 --- a/buildroot/package/rocksdb/0002-replace-POWER-crc32c-with-C-implementation.patch +++ /dev/null @@ -1,4058 +0,0 @@ -From 085e4dcf8173e91311fbf9037d8bc9393f254c6f Mon Sep 17 00:00:00 2001 -From: Daniel Black -Date: Fri, 17 Apr 2020 18:54:37 +1000 -Subject: [PATCH] replace POWER crc32c with C implementation - -The presence of clang compile failures on POWER due to -missing ppc-asm.h prompted the replacement of the ASM -CRC32 implementation with the C implementation. - -https://github.com/antonblanchard/crc32-vpmsum/blob/master/vec_crc32.c -is used with only small include path change with the local copyright header -maintained. - -crc32c_ppc_constants.h per upstream generated, with assembler -compatible code removed. #pragma once per 64324e329eb0a9b4e77241a425a1615ff524c7f1 -removed unnecessary header wasn't used in util/crc32c.cc. - -util/crc32c.cc removes arch_ppc_crc32 which was only ever -used in a local context. Also incorporated significant advice from -tchaikov in #2869. HAVE_POWER was never passed from cmake, so replaced -with the architected _ARCH_PWR8 directive. Altivec overloading removed. - -Replaced arch_ppc_probe wrapper to used isAltivec directly. - -Corrects getauxval detection from 8bbd76edbf by including the header from the -right directory. - -From the crc32c_ppc.c (now replaced) comment: - - This wrapper function works around the fact that crc32_vpmsum - does not gracefully handle the case where the data pointer is NULL. There - may be room for performance improvement here. - -This isn't applicable provided the length is 0. Added test case for -this. - -[Retrieved from: -https://github.com/facebook/rocksdb/commit/085e4dcf8173e91311fbf9037d8bc9393f254c6f] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 19 +- - Makefile | 44 +- - util/crc32c.cc | 59 +- - util/crc32c_ppc.c | 679 ++++++++- - util/crc32c_ppc_asm.S | 752 ---------- - util/crc32c_ppc_clang_workaround.h | 93 ++ - util/crc32c_ppc_constants.h | 2084 ++++++++++++++++------------ - util/crc32c_test.cc | 3 + - 8 files changed, 1943 insertions(+), 1790 deletions(-) - delete mode 100644 util/crc32c_ppc_asm.S - create mode 100644 util/crc32c_ppc_clang_workaround.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a9bc71f80..5f8b226d51 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ include(ReadVersion) - get_rocksdb_version(rocksdb_VERSION) - project(rocksdb - VERSION ${rocksdb_VERSION} -- LANGUAGES CXX C ASM) -+ LANGUAGES CXX C) - - if(POLICY CMP0042) - cmake_policy(SET CMP0042 NEW) -@@ -215,12 +215,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=power8 -mtune=power8") - endif(HAS_POWER8) - endif(HAS_POWER9) -- CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC) -- if(HAS_ALTIVEC) -- message(STATUS " HAS_ALTIVEC yes") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec") -- endif(HAS_ALTIVEC) - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - - if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") -@@ -490,7 +484,7 @@ if(HAVE_SCHED_GETCPU) - add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT) - endif() - --check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL) -+check_cxx_symbol_exists(getauxval sys/auxv.h HAVE_AUXV_GETAUXVAL) - if(HAVE_AUXV_GETAUXVAL) - add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) - endif() -@@ -761,11 +755,14 @@ if(HAVE_SSE42 AND NOT MSVC) - PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul") - endif() - --if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") -+if(HAS_POWER8) - list(APPEND SOURCES -+ util/crc32c_ppc.c) -+ set_source_files_properties( - util/crc32c_ppc.c -- util/crc32c_ppc_asm.S) --endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") -+ PROPERTIES COMPILE_FLAGS "-maltivec" -+ COMPILE_DEFINITIONS "CRC32_FUNCTION=crc32c_ppc;CRC32_CONSTANTS_HEADER=\"crc32c_ppc_constants.h\"") -+endif(HAS_POWER8) - - if(HAS_ARMV8_CRC) - list(APPEND SOURCES -diff --git a/Makefile b/Makefile -index a258819f82..0249ce84bc 100644 ---- a/Makefile -+++ b/Makefile -@@ -132,16 +132,9 @@ OPT += -momit-leaf-frame-pointer - endif - endif - --ifeq (,$(shell $(CXX) -fsyntax-only -maltivec -xc /dev/null 2>&1)) --CXXFLAGS += -DHAS_ALTIVEC --CFLAGS += -DHAS_ALTIVEC --HAS_ALTIVEC=1 --endif -- - ifeq (,$(shell $(CXX) -fsyntax-only -mcpu=power8 -xc /dev/null 2>&1)) --CXXFLAGS += -DHAVE_POWER8 --CFLAGS += -DHAVE_POWER8 - HAVE_POWER8=1 -+POWER8_CFLAGS=-maltivec -DCRC32_CONSTANTS_HEADER='"crc32c_ppc_constants.h"' -DCRC32_FUNCTION=crc32c_ppc - endif - - ifeq (,$(shell $(CXX) -fsyntax-only -march=armv8-a+crc+crypto -xc /dev/null 2>&1)) -@@ -418,7 +411,6 @@ LIBOBJECTS = $(LIB_SOURCES:.cc=.o) - ifeq ($(HAVE_POWER8),1) - LIB_CC_OBJECTS = $(LIB_SOURCES:.cc=.o) - LIBOBJECTS += $(LIB_SOURCES_C:.c=.o) --LIBOBJECTS += $(LIB_SOURCES_ASM:.S=.o) - else - LIB_CC_OBJECTS = $(LIB_SOURCES:.cc=.o) - endif -@@ -730,9 +722,7 @@ $(SHARED3): $(SHARED4) - endif - ifeq ($(HAVE_POWER8),1) - SHARED_C_OBJECTS = $(LIB_SOURCES_C:.c=.o) --SHARED_ASM_OBJECTS = $(LIB_SOURCES_ASM:.S=.o) - SHARED_C_LIBOBJECTS = $(patsubst %.o,shared-objects/%.o,$(SHARED_C_OBJECTS)) --SHARED_ASM_LIBOBJECTS = $(patsubst %.o,shared-objects/%.o,$(SHARED_ASM_OBJECTS)) - shared_libobjects = $(patsubst %,shared-objects/%,$(LIB_CC_OBJECTS)) - else - shared_libobjects = $(patsubst %,shared-objects/%,$(LIBOBJECTS)) -@@ -742,13 +732,10 @@ CLEAN_FILES += shared-objects - shared_all_libobjects = $(shared_libobjects) - - ifeq ($(HAVE_POWER8),1) --shared-ppc-objects = $(SHARED_C_LIBOBJECTS) $(SHARED_ASM_LIBOBJECTS) -+shared-ppc-objects = $(SHARED_C_LIBOBJECTS) - - shared-objects/util/crc32c_ppc.o: util/crc32c_ppc.c -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -- --shared-objects/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -+ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ - endif - $(shared_libobjects): shared-objects/%.o: %.cc - $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ -@@ -1981,15 +1968,11 @@ JAVA_STATIC_INCLUDES = -I./zlib-$(ZLIB_VER) -I./bzip2-$(BZIP2_VER) -I./snappy-$( - - ifeq ($(HAVE_POWER8),1) - JAVA_STATIC_C_LIBOBJECTS = $(patsubst %.c.o,jls/%.c.o,$(LIB_SOURCES_C:.c=.o)) --JAVA_STATIC_ASM_LIBOBJECTS = $(patsubst %.S.o,jls/%.S.o,$(LIB_SOURCES_ASM:.S=.o)) - --java_static_ppc_libobjects = $(JAVA_STATIC_C_LIBOBJECTS) $(JAVA_STATIC_ASM_LIBOBJECTS) -+java_static_ppc_libobjects = $(JAVA_STATIC_C_LIBOBJECTS) - - jls/util/crc32c_ppc.o: util/crc32c_ppc.c -- $(AM_V_CC)$(CC) $(CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ -- --jls/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S -- $(AM_V_CC)$(CC) $(CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ -+ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -c $< -o $@ - - java_static_all_libobjects += $(java_static_ppc_libobjects) - endif -@@ -2075,10 +2058,8 @@ rocksdbjavastaticpublishcentral: - ifeq ($(HAVE_POWER8),1) - JAVA_CC_OBJECTS = $(SHARED_CC_OBJECTS) - JAVA_C_OBJECTS = $(SHARED_C_OBJECTS) --JAVA_ASM_OBJECTS = $(SHARED_ASM_OBJECTS) - - JAVA_C_LIBOBJECTS = $(patsubst %.c.o,jl/%.c.o,$(JAVA_C_OBJECTS)) --JAVA_ASM_LIBOBJECTS = $(patsubst %.S.o,jl/%.S.o,$(JAVA_ASM_OBJECTS)) - endif - - java_libobjects = $(patsubst %,jl/%,$(LIB_CC_OBJECTS)) -@@ -2086,13 +2067,11 @@ CLEAN_FILES += jl - java_all_libobjects = $(java_libobjects) - - ifeq ($(HAVE_POWER8),1) --java_ppc_libobjects = $(JAVA_C_LIBOBJECTS) $(JAVA_ASM_LIBOBJECTS) -+java_ppc_libobjects = $(JAVA_C_LIBOBJECTS) - - jl/crc32c_ppc.o: util/crc32c_ppc.c -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -+ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ - --jl/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ - java_all_libobjects += $(java_ppc_libobjects) - endif - -@@ -2160,10 +2139,7 @@ IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBu - else - ifeq ($(HAVE_POWER8),1) - util/crc32c_ppc.o: util/crc32c_ppc.c -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -- --util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S -- $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -+ $(AM_V_CC)$(CC) $(CFLAGS) $(POWER8_CFLAGS) -c $< -o $@ - endif - .cc.o: - $(AM_V_CC)$(CXX) $(CXXFLAGS) -c $< -o $@ $(COVERAGEFLAGS) -@@ -2200,7 +2176,6 @@ endif - - ifeq ($(HAVE_POWER8),1) - DEPFILES_C = $(LIB_SOURCES_C:.c=.c.d) --DEPFILES_ASM = $(LIB_SOURCES_ASM:.S=.S.d) - - %.c.d: %.c - @$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) \ -@@ -2212,8 +2187,7 @@ DEPFILES_ASM = $(LIB_SOURCES_ASM:.S=.S.d) - - $(DEPFILES_C): %.c.d - --$(DEPFILES_ASM): %.S.d --depend: $(DEPFILES) $(DEPFILES_C) $(DEPFILES_ASM) -+depend: $(DEPFILES) $(DEPFILES_C) - else - depend: $(DEPFILES) - endif -diff --git a/util/crc32c.cc b/util/crc32c.cc -index fa70d23ff5..ce16cb777e 100644 ---- a/util/crc32c.cc -+++ b/util/crc32c.cc -@@ -20,15 +20,12 @@ - - #include "util/crc32c_arm64.h" - --#ifdef __powerpc64__ --#include "util/crc32c_ppc.h" --#include "util/crc32c_ppc_constants.h" -- --#if __linux__ - #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT - #include - #endif - -+#ifdef __powerpc64__ -+#include "util/crc32c_ppc.h" - #ifndef PPC_FEATURE2_VEC_CRYPTO - #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 - #endif -@@ -37,19 +34,11 @@ - #define AT_HWCAP2 26 - #endif - --#endif /* __linux__ */ -- - #endif - - namespace ROCKSDB_NAMESPACE { - namespace crc32c { - --#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) --#ifdef __powerpc64__ --static int arch_ppc_crc32 = 0; --#endif /* __powerpc64__ */ --#endif -- - static const uint32_t table0_[256] = { - 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, - 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, -@@ -342,6 +331,7 @@ static inline void Slow_CRC32(uint64_t* l, uint8_t const **p) { - table0_[c >> 24]; - } - -+#ifndef _ARCH_PWR8 - static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { - #ifndef HAVE_SSE42 - Slow_CRC32(l, p); -@@ -355,6 +345,7 @@ static inline void Fast_CRC32(uint64_t* l, uint8_t const **p) { - *p += 4; - #endif - } -+#endif - - template - uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { -@@ -403,7 +394,7 @@ uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { - // Detect if ARM64 CRC or not. - #ifndef HAVE_ARM64_CRC - // Detect if SS42 or not. --#ifndef HAVE_POWER8 -+#ifndef _ARCH_PWR8 - - static bool isSSE42() { - #ifndef HAVE_SSE42 -@@ -439,36 +430,23 @@ static bool isPCLMULQDQ() { - #endif - } - --#endif // HAVE_POWER8 -+#endif // _ARCH_PWR8 - #endif // HAVE_ARM64_CRC - - typedef uint32_t (*Function)(uint32_t, const char*, size_t); - --#if defined(HAVE_POWER8) && defined(HAS_ALTIVEC) -+#if defined(__powerpc64__) - uint32_t ExtendPPCImpl(uint32_t crc, const char *buf, size_t size) { - return crc32c_ppc(crc, (const unsigned char *)buf, size); - } - --#if __linux__ --static int arch_ppc_probe(void) { -- arch_ppc_crc32 = 0; -- --#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) -- if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) arch_ppc_crc32 = 1; --#endif /* __powerpc64__ */ -- -- return arch_ppc_crc32; --} --#endif // __linux__ -- - static bool isAltiVec() { -- if (arch_ppc_probe()) { -- return true; -- } else { -- return false; -- } --} -+#if defined(__linux__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) -+ if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) return true; - #endif -+ return false; -+} -+#endif // __power64__ - - #if defined(__linux__) && defined(HAVE_ARM64_CRC) - uint32_t ExtendARMImpl(uint32_t crc, const char *buf, size_t size) { -@@ -480,16 +458,9 @@ std::string IsFastCrc32Supported() { - bool has_fast_crc = false; - std::string fast_zero_msg; - std::string arch; --#ifdef HAVE_POWER8 --#ifdef HAS_ALTIVEC -- if (arch_ppc_probe()) { -- has_fast_crc = true; -- arch = "PPC"; -- } --#else -- has_fast_crc = false; -+#ifdef __powerpc64__ -+ has_fast_crc = isAltiVec(); - arch = "PPC"; --#endif - #elif defined(__linux__) && defined(HAVE_ARM64_CRC) - if (crc32c_runtime_check()) { - has_fast_crc = true; -@@ -1220,7 +1191,7 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, size_t len) { - #endif //HAVE_SSE42 && HAVE_PCLMUL - - static inline Function Choose_Extend() { --#ifdef HAVE_POWER8 -+#ifdef __powerpc64__ - return isAltiVec() ? ExtendPPCImpl : ExtendImpl; - #elif defined(__linux__) && defined(HAVE_ARM64_CRC) - if(crc32c_runtime_check()) { -diff --git a/util/crc32c_ppc.c b/util/crc32c_ppc.c -index 888a4943ea..a8914e8fbd 100644 ---- a/util/crc32c_ppc.c -+++ b/util/crc32c_ppc.c -@@ -4,91 +4,648 @@ - // This source code is licensed under both the GPLv2 (found in the - // COPYING file in the root directory) and Apache 2.0 License - // (found in the LICENSE.Apache file in the root directory). -+// From: https://github.com/antonblanchard/crc32-vpmsum/blob/master/vec_crc32.c - -+#include -+ -+#define POWER8_INTRINSICS - #define CRC_TABLE --#include --#include --#include --#include "util/crc32c_ppc_constants.h" - --#define VMX_ALIGN 16 --#define VMX_ALIGN_MASK (VMX_ALIGN - 1) -+#ifdef CRC32_CONSTANTS_HEADER -+#include CRC32_CONSTANTS_HEADER -+#else -+#include "crc32_constants.h" -+#endif -+ -+#define VMX_ALIGN 16 -+#define VMX_ALIGN_MASK (VMX_ALIGN-1) - - #ifdef REFLECT --static unsigned int crc32_align(unsigned int crc, unsigned char const *p, -- unsigned long len) { -- while (len--) crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); -- return crc; -+static unsigned int crc32_align(unsigned int crc, const unsigned char *p, -+ unsigned long len) -+{ -+ while (len--) -+ crc = crc_table[(crc ^ *p++) & 0xff] ^ (crc >> 8); -+ return crc; -+} -+#else -+static unsigned int crc32_align(unsigned int crc, const unsigned char *p, -+ unsigned long len) -+{ -+ while (len--) -+ crc = crc_table[((crc >> 24) ^ *p++) & 0xff] ^ (crc << 8); -+ return crc; - } - #endif - --#ifdef HAVE_POWER8 --unsigned int __crc32_vpmsum(unsigned int crc, unsigned char const *p, -- unsigned long len); -+static unsigned int __attribute__ ((aligned (32))) -+__crc32_vpmsum(unsigned int crc, const void* p, unsigned long len); - --static uint32_t crc32_vpmsum(uint32_t crc, unsigned char const *data, -- unsigned len) { -- unsigned int prealign; -- unsigned int tail; -+#ifndef CRC32_FUNCTION -+#define CRC32_FUNCTION crc32_vpmsum -+#endif -+ -+unsigned int CRC32_FUNCTION(unsigned int crc, const unsigned char *p, -+ unsigned long len) -+{ -+ unsigned int prealign; -+ unsigned int tail; - - #ifdef CRC_XOR -- crc ^= 0xffffffff; -+ crc ^= 0xffffffff; - #endif - -- if (len < VMX_ALIGN + VMX_ALIGN_MASK) { -- crc = crc32_align(crc, data, (unsigned long)len); -- goto out; -- } -+ if (len < VMX_ALIGN + VMX_ALIGN_MASK) { -+ crc = crc32_align(crc, p, len); -+ goto out; -+ } - -- if ((unsigned long)data & VMX_ALIGN_MASK) { -- prealign = VMX_ALIGN - ((unsigned long)data & VMX_ALIGN_MASK); -- crc = crc32_align(crc, data, prealign); -- len -= prealign; -- data += prealign; -- } -+ if ((unsigned long)p & VMX_ALIGN_MASK) { -+ prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK); -+ crc = crc32_align(crc, p, prealign); -+ len -= prealign; -+ p += prealign; -+ } - -- crc = __crc32_vpmsum(crc, data, (unsigned long)len & ~VMX_ALIGN_MASK); -+ crc = __crc32_vpmsum(crc, p, len & ~VMX_ALIGN_MASK); - -- tail = len & VMX_ALIGN_MASK; -- if (tail) { -- data += len & ~VMX_ALIGN_MASK; -- crc = crc32_align(crc, data, tail); -- } -+ tail = len & VMX_ALIGN_MASK; -+ if (tail) { -+ p += len & ~VMX_ALIGN_MASK; -+ crc = crc32_align(crc, p, tail); -+ } - - out: - #ifdef CRC_XOR -- crc ^= 0xffffffff; -+ crc ^= 0xffffffff; - #endif - -- return crc; -+ return crc; - } - --/* This wrapper function works around the fact that crc32_vpmsum -- * does not gracefully handle the case where the data pointer is NULL. There -- * may be room for performance improvement here. -+#if defined (__clang__) -+#include "crc32c_ppc_clang_workaround.h" -+#else -+#define __builtin_pack_vector(a, b) __builtin_pack_vector_int128 ((a), (b)) -+#define __builtin_unpack_vector_0(a) __builtin_unpack_vector_int128 ((vector __int128_t)(a), 0) -+#define __builtin_unpack_vector_1(a) __builtin_unpack_vector_int128 ((vector __int128_t)(a), 1) -+#endif -+ -+/* When we have a load-store in a single-dispatch group and address overlap -+ * such that foward is not allowed (load-hit-store) the group must be flushed. -+ * A group ending NOP prevents the flush. - */ --uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { -- unsigned char *buf2; -- -- if (!data) { -- buf2 = (unsigned char *)malloc(len); -- bzero(buf2, len); -- crc = crc32_vpmsum(crc, buf2, len); -- free(buf2); -- } else { -- crc = crc32_vpmsum(crc, data, (unsigned long)len); -- } -- return crc; --} -+#define GROUP_ENDING_NOP asm("ori 2,2,0" ::: "memory") - --#else /* HAVE_POWER8 */ -+#if defined(__BIG_ENDIAN__) && defined (REFLECT) -+#define BYTESWAP_DATA -+#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) -+#define BYTESWAP_DATA -+#endif - --/* This symbol has to exist on non-ppc architectures (and on legacy -- * ppc systems using power7 or below) in order to compile properly -- * there, even though it won't be called. -- */ --uint32_t crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len) { -- return 0; --} -+#ifdef BYTESWAP_DATA -+#define VEC_PERM(vr, va, vb, vc) vr = vec_perm(va, vb,\ -+ (__vector unsigned char) vc) -+#if defined(__LITTLE_ENDIAN__) -+/* Byte reverse permute constant LE. */ -+static const __vector unsigned long long vperm_const -+ __attribute__ ((aligned(16))) = { 0x08090A0B0C0D0E0FUL, -+ 0x0001020304050607UL }; -+#else -+static const __vector unsigned long long vperm_const -+ __attribute__ ((aligned(16))) = { 0x0F0E0D0C0B0A0908UL, -+ 0X0706050403020100UL }; -+#endif -+#else -+#define VEC_PERM(vr, va, vb, vc) -+#endif -+ -+static unsigned int __attribute__ ((aligned (32))) -+__crc32_vpmsum(unsigned int crc, const void* p, unsigned long len) { -+ -+ const __vector unsigned long long vzero = {0,0}; -+ const __vector unsigned long long vones = {0xffffffffffffffffUL, -+ 0xffffffffffffffffUL}; -+ -+#ifdef REFLECT -+ const __vector unsigned long long vmask_32bit = -+ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, -+ (__vector unsigned char)vones, 4); -+#endif -+ -+ const __vector unsigned long long vmask_64bit = -+ (__vector unsigned long long)vec_sld((__vector unsigned char)vzero, -+ (__vector unsigned char)vones, 8); -+ -+ __vector unsigned long long vcrc; -+ -+ __vector unsigned long long vconst1, vconst2; -+ -+ /* vdata0-vdata7 will contain our data (p). */ -+ __vector unsigned long long vdata0, vdata1, vdata2, vdata3, vdata4, -+ vdata5, vdata6, vdata7; -+ -+ /* v0-v7 will contain our checksums */ -+ __vector unsigned long long v0 = {0,0}; -+ __vector unsigned long long v1 = {0,0}; -+ __vector unsigned long long v2 = {0,0}; -+ __vector unsigned long long v3 = {0,0}; -+ __vector unsigned long long v4 = {0,0}; -+ __vector unsigned long long v5 = {0,0}; -+ __vector unsigned long long v6 = {0,0}; -+ __vector unsigned long long v7 = {0,0}; -+ -+ -+ /* Vector auxiliary variables. */ -+ __vector unsigned long long va0, va1, va2, va3, va4, va5, va6, va7; -+ -+ unsigned int result = 0; -+ unsigned int offset; /* Constant table offset. */ -+ -+ unsigned long i; /* Counter. */ -+ unsigned long chunks; -+ -+ unsigned long block_size; -+ int next_block = 0; -+ -+ /* Align by 128 bits. The last 128 bit block will be processed at end. */ -+ unsigned long length = len & 0xFFFFFFFFFFFFFF80UL; -+ -+#ifdef REFLECT -+ vcrc = (__vector unsigned long long)__builtin_pack_vector(0UL, crc); -+#else -+ vcrc = (__vector unsigned long long)__builtin_pack_vector(crc, 0UL); -+ -+ /* Shift into top 32 bits */ -+ vcrc = (__vector unsigned long long)vec_sld((__vector unsigned char)vcrc, -+ (__vector unsigned char)vzero, 4); -+#endif -+ -+ /* Short version. */ -+ if (len < 256) { -+ /* Calculate where in the constant table we need to start. */ -+ offset = 256 - len; -+ -+ vconst1 = vec_ld(offset, vcrc_short_const); -+ vdata0 = vec_ld(0, (__vector unsigned long long*) p); -+ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); -+ -+ /* xor initial value*/ -+ vdata0 = vec_xor(vdata0, vcrc); -+ -+ vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw -+ ((__vector unsigned int)vdata0, (__vector unsigned int)vconst1); -+ v0 = vec_xor(v0, vdata0); -+ -+ for (i = 16; i < len; i += 16) { -+ vconst1 = vec_ld(offset + i, vcrc_short_const); -+ vdata0 = vec_ld(i, (__vector unsigned long long*) p); -+ VEC_PERM(vdata0, vdata0, vconst1, vperm_const); -+ vdata0 = (__vector unsigned long long) __builtin_crypto_vpmsumw -+ ((__vector unsigned int)vdata0, (__vector unsigned int)vconst1); -+ v0 = vec_xor(v0, vdata0); -+ } -+ } else { -+ -+ /* Load initial values. */ -+ vdata0 = vec_ld(0, (__vector unsigned long long*) p); -+ vdata1 = vec_ld(16, (__vector unsigned long long*) p); -+ -+ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); -+ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); -+ -+ vdata2 = vec_ld(32, (__vector unsigned long long*) p); -+ vdata3 = vec_ld(48, (__vector unsigned long long*) p); -+ -+ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); -+ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); -+ -+ vdata4 = vec_ld(64, (__vector unsigned long long*) p); -+ vdata5 = vec_ld(80, (__vector unsigned long long*) p); -+ -+ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); -+ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); -+ -+ vdata6 = vec_ld(96, (__vector unsigned long long*) p); -+ vdata7 = vec_ld(112, (__vector unsigned long long*) p); -+ -+ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); -+ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); -+ -+ /* xor in initial value */ -+ vdata0 = vec_xor(vdata0, vcrc); -+ -+ p = (char *)p + 128; -+ -+ do { -+ /* Checksum in blocks of MAX_SIZE. */ -+ block_size = length; -+ if (block_size > MAX_SIZE) { -+ block_size = MAX_SIZE; -+ } -+ -+ length = length - block_size; -+ -+ /* -+ * Work out the offset into the constants table to start at. Each -+ * constant is 16 bytes, and it is used against 128 bytes of input -+ * data - 128 / 16 = 8 -+ */ -+ offset = (MAX_SIZE/8) - (block_size/8); -+ /* We reduce our final 128 bytes in a separate step */ -+ chunks = (block_size/128)-1; -+ -+ vconst1 = vec_ld(offset, vcrc_const); -+ -+ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata0, -+ (__vector unsigned long long)vconst1); -+ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata1, -+ (__vector unsigned long long)vconst1); -+ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata2, -+ (__vector unsigned long long)vconst1); -+ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata3, -+ (__vector unsigned long long)vconst1); -+ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata4, -+ (__vector unsigned long long)vconst1); -+ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata5, -+ (__vector unsigned long long)vconst1); -+ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata6, -+ (__vector unsigned long long)vconst1); -+ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long long)vdata7, -+ (__vector unsigned long long)vconst1); -+ -+ if (chunks > 1) { -+ offset += 16; -+ vconst2 = vec_ld(offset, vcrc_const); -+ GROUP_ENDING_NOP; -+ -+ vdata0 = vec_ld(0, (__vector unsigned long long*) p); -+ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); -+ -+ vdata1 = vec_ld(16, (__vector unsigned long long*) p); -+ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); -+ -+ vdata2 = vec_ld(32, (__vector unsigned long long*) p); -+ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); -+ -+ vdata3 = vec_ld(48, (__vector unsigned long long*) p); -+ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); -+ -+ vdata4 = vec_ld(64, (__vector unsigned long long*) p); -+ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); -+ -+ vdata5 = vec_ld(80, (__vector unsigned long long*) p); -+ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); -+ -+ vdata6 = vec_ld(96, (__vector unsigned long long*) p); -+ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); -+ -+ vdata7 = vec_ld(112, (__vector unsigned long long*) p); -+ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); -+ -+ p = (char *)p + 128; - --#endif /* HAVE_POWER8 */ -+ /* -+ * main loop. We modulo schedule it such that it takes three -+ * iterations to complete - first iteration load, second -+ * iteration vpmsum, third iteration xor. -+ */ -+ for (i = 0; i < chunks-2; i++) { -+ vconst1 = vec_ld(offset, vcrc_const); -+ offset += 16; -+ GROUP_ENDING_NOP; -+ -+ v0 = vec_xor(v0, va0); -+ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata0, (__vector unsigned long long)vconst2); -+ vdata0 = vec_ld(0, (__vector unsigned long long*) p); -+ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v1 = vec_xor(v1, va1); -+ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata1, (__vector unsigned long long)vconst2); -+ vdata1 = vec_ld(16, (__vector unsigned long long*) p); -+ VEC_PERM(vdata1, vdata1, vdata1, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v2 = vec_xor(v2, va2); -+ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata2, (__vector unsigned long long)vconst2); -+ vdata2 = vec_ld(32, (__vector unsigned long long*) p); -+ VEC_PERM(vdata2, vdata2, vdata2, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v3 = vec_xor(v3, va3); -+ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata3, (__vector unsigned long long)vconst2); -+ vdata3 = vec_ld(48, (__vector unsigned long long*) p); -+ VEC_PERM(vdata3, vdata3, vdata3, vperm_const); -+ -+ vconst2 = vec_ld(offset, vcrc_const); -+ GROUP_ENDING_NOP; -+ -+ v4 = vec_xor(v4, va4); -+ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata4, (__vector unsigned long long)vconst1); -+ vdata4 = vec_ld(64, (__vector unsigned long long*) p); -+ VEC_PERM(vdata4, vdata4, vdata4, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v5 = vec_xor(v5, va5); -+ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata5, (__vector unsigned long long)vconst1); -+ vdata5 = vec_ld(80, (__vector unsigned long long*) p); -+ VEC_PERM(vdata5, vdata5, vdata5, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v6 = vec_xor(v6, va6); -+ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata6, (__vector unsigned long long)vconst1); -+ vdata6 = vec_ld(96, (__vector unsigned long long*) p); -+ VEC_PERM(vdata6, vdata6, vdata6, vperm_const); -+ GROUP_ENDING_NOP; -+ -+ v7 = vec_xor(v7, va7); -+ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata7, (__vector unsigned long long)vconst1); -+ vdata7 = vec_ld(112, (__vector unsigned long long*) p); -+ VEC_PERM(vdata7, vdata7, vdata7, vperm_const); -+ -+ p = (char *)p + 128; -+ } -+ -+ /* First cool down*/ -+ vconst1 = vec_ld(offset, vcrc_const); -+ offset += 16; -+ -+ v0 = vec_xor(v0, va0); -+ va0 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata0, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v1 = vec_xor(v1, va1); -+ va1 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata1, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v2 = vec_xor(v2, va2); -+ va2 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata2, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v3 = vec_xor(v3, va3); -+ va3 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata3, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v4 = vec_xor(v4, va4); -+ va4 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata4, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v5 = vec_xor(v5, va5); -+ va5 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata5, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v6 = vec_xor(v6, va6); -+ va6 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata6, (__vector unsigned long long)vconst1); -+ GROUP_ENDING_NOP; -+ -+ v7 = vec_xor(v7, va7); -+ va7 = __builtin_crypto_vpmsumd ((__vector unsigned long -+ long)vdata7, (__vector unsigned long long)vconst1); -+ }/* else */ -+ -+ /* Second cool down. */ -+ v0 = vec_xor(v0, va0); -+ v1 = vec_xor(v1, va1); -+ v2 = vec_xor(v2, va2); -+ v3 = vec_xor(v3, va3); -+ v4 = vec_xor(v4, va4); -+ v5 = vec_xor(v5, va5); -+ v6 = vec_xor(v6, va6); -+ v7 = vec_xor(v7, va7); -+ -+#ifdef REFLECT -+ /* -+ * vpmsumd produces a 96 bit result in the least significant bits -+ * of the register. Since we are bit reflected we have to shift it -+ * left 32 bits so it occupies the least significant bits in the -+ * bit reflected domain. -+ */ -+ v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, -+ (__vector unsigned char)vzero, 4); -+ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v1, -+ (__vector unsigned char)vzero, 4); -+ v2 = (__vector unsigned long long)vec_sld((__vector unsigned char)v2, -+ (__vector unsigned char)vzero, 4); -+ v3 = (__vector unsigned long long)vec_sld((__vector unsigned char)v3, -+ (__vector unsigned char)vzero, 4); -+ v4 = (__vector unsigned long long)vec_sld((__vector unsigned char)v4, -+ (__vector unsigned char)vzero, 4); -+ v5 = (__vector unsigned long long)vec_sld((__vector unsigned char)v5, -+ (__vector unsigned char)vzero, 4); -+ v6 = (__vector unsigned long long)vec_sld((__vector unsigned char)v6, -+ (__vector unsigned char)vzero, 4); -+ v7 = (__vector unsigned long long)vec_sld((__vector unsigned char)v7, -+ (__vector unsigned char)vzero, 4); -+#endif -+ -+ /* xor with the last 1024 bits. */ -+ va0 = vec_ld(0, (__vector unsigned long long*) p); -+ VEC_PERM(va0, va0, va0, vperm_const); -+ -+ va1 = vec_ld(16, (__vector unsigned long long*) p); -+ VEC_PERM(va1, va1, va1, vperm_const); -+ -+ va2 = vec_ld(32, (__vector unsigned long long*) p); -+ VEC_PERM(va2, va2, va2, vperm_const); -+ -+ va3 = vec_ld(48, (__vector unsigned long long*) p); -+ VEC_PERM(va3, va3, va3, vperm_const); -+ -+ va4 = vec_ld(64, (__vector unsigned long long*) p); -+ VEC_PERM(va4, va4, va4, vperm_const); -+ -+ va5 = vec_ld(80, (__vector unsigned long long*) p); -+ VEC_PERM(va5, va5, va5, vperm_const); -+ -+ va6 = vec_ld(96, (__vector unsigned long long*) p); -+ VEC_PERM(va6, va6, va6, vperm_const); -+ -+ va7 = vec_ld(112, (__vector unsigned long long*) p); -+ VEC_PERM(va7, va7, va7, vperm_const); -+ -+ p = (char *)p + 128; -+ -+ vdata0 = vec_xor(v0, va0); -+ vdata1 = vec_xor(v1, va1); -+ vdata2 = vec_xor(v2, va2); -+ vdata3 = vec_xor(v3, va3); -+ vdata4 = vec_xor(v4, va4); -+ vdata5 = vec_xor(v5, va5); -+ vdata6 = vec_xor(v6, va6); -+ vdata7 = vec_xor(v7, va7); -+ -+ /* Check if we have more blocks to process */ -+ next_block = 0; -+ if (length != 0) { -+ next_block = 1; -+ -+ /* zero v0-v7 */ -+ v0 = vec_xor(v0, v0); -+ v1 = vec_xor(v1, v1); -+ v2 = vec_xor(v2, v2); -+ v3 = vec_xor(v3, v3); -+ v4 = vec_xor(v4, v4); -+ v5 = vec_xor(v5, v5); -+ v6 = vec_xor(v6, v6); -+ v7 = vec_xor(v7, v7); -+ } -+ length = length + 128; -+ -+ } while (next_block); -+ -+ /* Calculate how many bytes we have left. */ -+ length = (len & 127); -+ -+ /* Calculate where in (short) constant table we need to start. */ -+ offset = 128 - length; -+ -+ v0 = vec_ld(offset, vcrc_short_const); -+ v1 = vec_ld(offset + 16, vcrc_short_const); -+ v2 = vec_ld(offset + 32, vcrc_short_const); -+ v3 = vec_ld(offset + 48, vcrc_short_const); -+ v4 = vec_ld(offset + 64, vcrc_short_const); -+ v5 = vec_ld(offset + 80, vcrc_short_const); -+ v6 = vec_ld(offset + 96, vcrc_short_const); -+ v7 = vec_ld(offset + 112, vcrc_short_const); -+ -+ offset += 128; -+ -+ v0 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata0,(__vector unsigned int)v0); -+ v1 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata1,(__vector unsigned int)v1); -+ v2 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata2,(__vector unsigned int)v2); -+ v3 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata3,(__vector unsigned int)v3); -+ v4 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata4,(__vector unsigned int)v4); -+ v5 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata5,(__vector unsigned int)v5); -+ v6 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata6,(__vector unsigned int)v6); -+ v7 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata7,(__vector unsigned int)v7); -+ -+ /* Now reduce the tail (0-112 bytes). */ -+ for (i = 0; i < length; i+=16) { -+ vdata0 = vec_ld(i,(__vector unsigned long long*)p); -+ VEC_PERM(vdata0, vdata0, vdata0, vperm_const); -+ va0 = vec_ld(offset + i,vcrc_short_const); -+ va0 = (__vector unsigned long long)__builtin_crypto_vpmsumw ( -+ (__vector unsigned int)vdata0,(__vector unsigned int)va0); -+ v0 = vec_xor(v0, va0); -+ } -+ -+ /* xor all parallel chunks together. */ -+ v0 = vec_xor(v0, v1); -+ v2 = vec_xor(v2, v3); -+ v4 = vec_xor(v4, v5); -+ v6 = vec_xor(v6, v7); -+ -+ v0 = vec_xor(v0, v2); -+ v4 = vec_xor(v4, v6); -+ -+ v0 = vec_xor(v0, v4); -+ } -+ -+ /* Barrett Reduction */ -+ vconst1 = vec_ld(0, v_Barrett_const); -+ vconst2 = vec_ld(16, v_Barrett_const); -+ -+ v1 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, -+ (__vector unsigned char)v0, 8); -+ v0 = vec_xor(v1,v0); -+ -+#ifdef REFLECT -+ /* shift left one bit */ -+ __vector unsigned char vsht_splat = vec_splat_u8 (1); -+ v0 = (__vector unsigned long long)vec_sll ((__vector unsigned char)v0, -+ vsht_splat); -+#endif -+ -+ v0 = vec_and(v0, vmask_64bit); -+ -+#ifndef REFLECT -+ -+ /* -+ * Now for the actual algorithm. The idea is to calculate q, -+ * the multiple of our polynomial that we need to subtract. By -+ * doing the computation 2x bits higher (ie 64 bits) and shifting the -+ * result back down 2x bits, we round down to the nearest multiple. -+ */ -+ -+ /* ma */ -+ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v0, -+ (__vector unsigned long long)vconst1); -+ /* q = floor(ma/(2^64)) */ -+ v1 = (__vector unsigned long long)vec_sld ((__vector unsigned char)vzero, -+ (__vector unsigned char)v1, 8); -+ /* qn */ -+ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, -+ (__vector unsigned long long)vconst2); -+ /* a - qn, subtraction is xor in GF(2) */ -+ v0 = vec_xor (v0, v1); -+ /* -+ * Get the result into r3. We need to shift it left 8 bytes: -+ * V0 [ 0 1 2 X ] -+ * V0 [ 0 X 2 3 ] -+ */ -+ result = __builtin_unpack_vector_1 (v0); -+#else -+ -+ /* -+ * The reflected version of Barrett reduction. Instead of bit -+ * reflecting our data (which is expensive to do), we bit reflect our -+ * constants and our algorithm, which means the intermediate data in -+ * our vector registers goes from 0-63 instead of 63-0. We can reflect -+ * the algorithm because we don't carry in mod 2 arithmetic. -+ */ -+ -+ /* bottom 32 bits of a */ -+ v1 = vec_and(v0, vmask_32bit); -+ -+ /* ma */ -+ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, -+ (__vector unsigned long long)vconst1); -+ -+ /* bottom 32bits of ma */ -+ v1 = vec_and(v1, vmask_32bit); -+ /* qn */ -+ v1 = __builtin_crypto_vpmsumd ((__vector unsigned long long)v1, -+ (__vector unsigned long long)vconst2); -+ /* a - qn, subtraction is xor in GF(2) */ -+ v0 = vec_xor (v0, v1); -+ -+ /* -+ * Since we are bit reflected, the result (ie the low 32 bits) is in -+ * the high 32 bits. We just need to shift it left 4 bytes -+ * V0 [ 0 1 X 3 ] -+ * V0 [ 0 X 2 3 ] -+ */ -+ -+ /* shift result into top 64 bits of */ -+ v0 = (__vector unsigned long long)vec_sld((__vector unsigned char)v0, -+ (__vector unsigned char)vzero, 4); -+ -+ result = __builtin_unpack_vector_0 (v0); -+#endif -+ -+ return result; -+} -diff --git a/util/crc32c_ppc_asm.S b/util/crc32c_ppc_asm.S -deleted file mode 100644 -index a317bf96b8..0000000000 ---- a/util/crc32c_ppc_asm.S -+++ /dev/null -@@ -1,752 +0,0 @@ --// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. --// Copyright (c) 2015 Anton Blanchard , IBM --// Copyright (c) 2017 International Business Machines Corp. --// All rights reserved. --// This source code is licensed under both the GPLv2 (found in the --// COPYING file in the root directory) and Apache 2.0 License --// (found in the LICENSE.Apache file in the root directory). -- --#include --#include "ppc-opcode.h" -- --#undef toc -- --#ifndef r1 --#define r1 1 --#endif -- --#ifndef r2 --#define r2 2 --#endif -- -- .section .rodata --.balign 16 -- --.byteswap_constant: -- /* byte reverse permute constant */ -- .octa 0x0F0E0D0C0B0A09080706050403020100 -- --#define __ASSEMBLY__ --#include "crc32c_ppc_constants.h" -- -- .text -- --#if defined(__BIG_ENDIAN__) && defined(REFLECT) --#define BYTESWAP_DATA --#elif defined(__LITTLE_ENDIAN__) && !defined(REFLECT) --#define BYTESWAP_DATA --#else --#undef BYTESWAP_DATA --#endif -- --#define off16 r25 --#define off32 r26 --#define off48 r27 --#define off64 r28 --#define off80 r29 --#define off96 r30 --#define off112 r31 -- --#define const1 v24 --#define const2 v25 -- --#define byteswap v26 --#define mask_32bit v27 --#define mask_64bit v28 --#define zeroes v29 -- --#ifdef BYTESWAP_DATA --#define VPERM(A, B, C, D) vperm A, B, C, D --#else --#define VPERM(A, B, C, D) --#endif -- --/* unsigned int __crc32_vpmsum(unsigned int crc, void *p, unsigned long len) */ --FUNC_START(__crc32_vpmsum) -- std r31,-8(r1) -- std r30,-16(r1) -- std r29,-24(r1) -- std r28,-32(r1) -- std r27,-40(r1) -- std r26,-48(r1) -- std r25,-56(r1) -- -- li off16,16 -- li off32,32 -- li off48,48 -- li off64,64 -- li off80,80 -- li off96,96 -- li off112,112 -- li r0,0 -- -- /* Enough room for saving 10 non volatile VMX registers */ -- subi r6,r1,56+10*16 -- subi r7,r1,56+2*16 -- -- stvx v20,0,r6 -- stvx v21,off16,r6 -- stvx v22,off32,r6 -- stvx v23,off48,r6 -- stvx v24,off64,r6 -- stvx v25,off80,r6 -- stvx v26,off96,r6 -- stvx v27,off112,r6 -- stvx v28,0,r7 -- stvx v29,off16,r7 -- -- mr r10,r3 -- -- vxor zeroes,zeroes,zeroes -- vspltisw v0,-1 -- -- vsldoi mask_32bit,zeroes,v0,4 -- vsldoi mask_64bit,zeroes,v0,8 -- -- /* Get the initial value into v8 */ -- vxor v8,v8,v8 -- MTVRD(v8, r3) --#ifdef REFLECT -- vsldoi v8,zeroes,v8,8 /* shift into bottom 32 bits */ --#else -- vsldoi v8,v8,zeroes,4 /* shift into top 32 bits */ --#endif -- --#ifdef BYTESWAP_DATA -- addis r3,r2,.byteswap_constant@toc@ha -- addi r3,r3,.byteswap_constant@toc@l -- -- lvx byteswap,0,r3 -- addi r3,r3,16 --#endif -- -- cmpdi r5,256 -- blt .Lshort -- -- rldicr r6,r5,0,56 -- -- /* Checksum in blocks of MAX_SIZE */ --1: lis r7,MAX_SIZE@h -- ori r7,r7,MAX_SIZE@l -- mr r9,r7 -- cmpd r6,r7 -- bgt 2f -- mr r7,r6 --2: subf r6,r7,r6 -- -- /* our main loop does 128 bytes at a time */ -- srdi r7,r7,7 -- -- /* -- * Work out the offset into the constants table to start at. Each -- * constant is 16 bytes, and it is used against 128 bytes of input -- * data - 128 / 16 = 8 -- */ -- sldi r8,r7,4 -- srdi r9,r9,3 -- subf r8,r8,r9 -- -- /* We reduce our final 128 bytes in a separate step */ -- addi r7,r7,-1 -- mtctr r7 -- -- addis r3,r2,.constants@toc@ha -- addi r3,r3,.constants@toc@l -- -- /* Find the start of our constants */ -- add r3,r3,r8 -- -- /* zero v0-v7 which will contain our checksums */ -- vxor v0,v0,v0 -- vxor v1,v1,v1 -- vxor v2,v2,v2 -- vxor v3,v3,v3 -- vxor v4,v4,v4 -- vxor v5,v5,v5 -- vxor v6,v6,v6 -- vxor v7,v7,v7 -- -- lvx const1,0,r3 -- -- /* -- * If we are looping back to consume more data we use the values -- * already in v16-v23. -- */ -- cmpdi r0,1 -- beq 2f -- -- /* First warm up pass */ -- lvx v16,0,r4 -- lvx v17,off16,r4 -- VPERM(v16,v16,v16,byteswap) -- VPERM(v17,v17,v17,byteswap) -- lvx v18,off32,r4 -- lvx v19,off48,r4 -- VPERM(v18,v18,v18,byteswap) -- VPERM(v19,v19,v19,byteswap) -- lvx v20,off64,r4 -- lvx v21,off80,r4 -- VPERM(v20,v20,v20,byteswap) -- VPERM(v21,v21,v21,byteswap) -- lvx v22,off96,r4 -- lvx v23,off112,r4 -- VPERM(v22,v22,v22,byteswap) -- VPERM(v23,v23,v23,byteswap) -- addi r4,r4,8*16 -- -- /* xor in initial value */ -- vxor v16,v16,v8 -- --2: bdz .Lfirst_warm_up_done -- -- addi r3,r3,16 -- lvx const2,0,r3 -- -- /* Second warm up pass */ -- VPMSUMD(v8,v16,const1) -- lvx v16,0,r4 -- VPERM(v16,v16,v16,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v9,v17,const1) -- lvx v17,off16,r4 -- VPERM(v17,v17,v17,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v10,v18,const1) -- lvx v18,off32,r4 -- VPERM(v18,v18,v18,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v11,v19,const1) -- lvx v19,off48,r4 -- VPERM(v19,v19,v19,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v12,v20,const1) -- lvx v20,off64,r4 -- VPERM(v20,v20,v20,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v13,v21,const1) -- lvx v21,off80,r4 -- VPERM(v21,v21,v21,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v14,v22,const1) -- lvx v22,off96,r4 -- VPERM(v22,v22,v22,byteswap) -- ori r2,r2,0 -- -- VPMSUMD(v15,v23,const1) -- lvx v23,off112,r4 -- VPERM(v23,v23,v23,byteswap) -- -- addi r4,r4,8*16 -- -- bdz .Lfirst_cool_down -- -- /* -- * main loop. We modulo schedule it such that it takes three iterations -- * to complete - first iteration load, second iteration vpmsum, third -- * iteration xor. -- */ -- .balign 16 --4: lvx const1,0,r3 -- addi r3,r3,16 -- ori r2,r2,0 -- -- vxor v0,v0,v8 -- VPMSUMD(v8,v16,const2) -- lvx v16,0,r4 -- VPERM(v16,v16,v16,byteswap) -- ori r2,r2,0 -- -- vxor v1,v1,v9 -- VPMSUMD(v9,v17,const2) -- lvx v17,off16,r4 -- VPERM(v17,v17,v17,byteswap) -- ori r2,r2,0 -- -- vxor v2,v2,v10 -- VPMSUMD(v10,v18,const2) -- lvx v18,off32,r4 -- VPERM(v18,v18,v18,byteswap) -- ori r2,r2,0 -- -- vxor v3,v3,v11 -- VPMSUMD(v11,v19,const2) -- lvx v19,off48,r4 -- VPERM(v19,v19,v19,byteswap) -- lvx const2,0,r3 -- ori r2,r2,0 -- -- vxor v4,v4,v12 -- VPMSUMD(v12,v20,const1) -- lvx v20,off64,r4 -- VPERM(v20,v20,v20,byteswap) -- ori r2,r2,0 -- -- vxor v5,v5,v13 -- VPMSUMD(v13,v21,const1) -- lvx v21,off80,r4 -- VPERM(v21,v21,v21,byteswap) -- ori r2,r2,0 -- -- vxor v6,v6,v14 -- VPMSUMD(v14,v22,const1) -- lvx v22,off96,r4 -- VPERM(v22,v22,v22,byteswap) -- ori r2,r2,0 -- -- vxor v7,v7,v15 -- VPMSUMD(v15,v23,const1) -- lvx v23,off112,r4 -- VPERM(v23,v23,v23,byteswap) -- -- addi r4,r4,8*16 -- -- bdnz 4b -- --.Lfirst_cool_down: -- /* First cool down pass */ -- lvx const1,0,r3 -- addi r3,r3,16 -- -- vxor v0,v0,v8 -- VPMSUMD(v8,v16,const1) -- ori r2,r2,0 -- -- vxor v1,v1,v9 -- VPMSUMD(v9,v17,const1) -- ori r2,r2,0 -- -- vxor v2,v2,v10 -- VPMSUMD(v10,v18,const1) -- ori r2,r2,0 -- -- vxor v3,v3,v11 -- VPMSUMD(v11,v19,const1) -- ori r2,r2,0 -- -- vxor v4,v4,v12 -- VPMSUMD(v12,v20,const1) -- ori r2,r2,0 -- -- vxor v5,v5,v13 -- VPMSUMD(v13,v21,const1) -- ori r2,r2,0 -- -- vxor v6,v6,v14 -- VPMSUMD(v14,v22,const1) -- ori r2,r2,0 -- -- vxor v7,v7,v15 -- VPMSUMD(v15,v23,const1) -- ori r2,r2,0 -- --.Lsecond_cool_down: -- /* Second cool down pass */ -- vxor v0,v0,v8 -- vxor v1,v1,v9 -- vxor v2,v2,v10 -- vxor v3,v3,v11 -- vxor v4,v4,v12 -- vxor v5,v5,v13 -- vxor v6,v6,v14 -- vxor v7,v7,v15 -- --#ifdef REFLECT -- /* -- * vpmsumd produces a 96 bit result in the least significant bits -- * of the register. Since we are bit reflected we have to shift it -- * left 32 bits so it occupies the least significant bits in the -- * bit reflected domain. -- */ -- vsldoi v0,v0,zeroes,4 -- vsldoi v1,v1,zeroes,4 -- vsldoi v2,v2,zeroes,4 -- vsldoi v3,v3,zeroes,4 -- vsldoi v4,v4,zeroes,4 -- vsldoi v5,v5,zeroes,4 -- vsldoi v6,v6,zeroes,4 -- vsldoi v7,v7,zeroes,4 --#endif -- -- /* xor with last 1024 bits */ -- lvx v8,0,r4 -- lvx v9,off16,r4 -- VPERM(v8,v8,v8,byteswap) -- VPERM(v9,v9,v9,byteswap) -- lvx v10,off32,r4 -- lvx v11,off48,r4 -- VPERM(v10,v10,v10,byteswap) -- VPERM(v11,v11,v11,byteswap) -- lvx v12,off64,r4 -- lvx v13,off80,r4 -- VPERM(v12,v12,v12,byteswap) -- VPERM(v13,v13,v13,byteswap) -- lvx v14,off96,r4 -- lvx v15,off112,r4 -- VPERM(v14,v14,v14,byteswap) -- VPERM(v15,v15,v15,byteswap) -- -- addi r4,r4,8*16 -- -- vxor v16,v0,v8 -- vxor v17,v1,v9 -- vxor v18,v2,v10 -- vxor v19,v3,v11 -- vxor v20,v4,v12 -- vxor v21,v5,v13 -- vxor v22,v6,v14 -- vxor v23,v7,v15 -- -- li r0,1 -- cmpdi r6,0 -- addi r6,r6,128 -- bne 1b -- -- /* Work out how many bytes we have left */ -- andi. r5,r5,127 -- -- /* Calculate where in the constant table we need to start */ -- subfic r6,r5,128 -- add r3,r3,r6 -- -- /* How many 16 byte chunks are in the tail */ -- srdi r7,r5,4 -- mtctr r7 -- -- /* -- * Reduce the previously calculated 1024 bits to 64 bits, shifting -- * 32 bits to include the trailing 32 bits of zeros -- */ -- lvx v0,0,r3 -- lvx v1,off16,r3 -- lvx v2,off32,r3 -- lvx v3,off48,r3 -- lvx v4,off64,r3 -- lvx v5,off80,r3 -- lvx v6,off96,r3 -- lvx v7,off112,r3 -- addi r3,r3,8*16 -- -- VPMSUMW(v0,v16,v0) -- VPMSUMW(v1,v17,v1) -- VPMSUMW(v2,v18,v2) -- VPMSUMW(v3,v19,v3) -- VPMSUMW(v4,v20,v4) -- VPMSUMW(v5,v21,v5) -- VPMSUMW(v6,v22,v6) -- VPMSUMW(v7,v23,v7) -- -- /* Now reduce the tail (0 - 112 bytes) */ -- cmpdi r7,0 -- beq 1f -- -- lvx v16,0,r4 -- lvx v17,0,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off16,r4 -- lvx v17,off16,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off32,r4 -- lvx v17,off32,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off48,r4 -- lvx v17,off48,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off64,r4 -- lvx v17,off64,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off80,r4 -- lvx v17,off80,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- bdz 1f -- -- lvx v16,off96,r4 -- lvx v17,off96,r3 -- VPERM(v16,v16,v16,byteswap) -- VPMSUMW(v16,v16,v17) -- vxor v0,v0,v16 -- -- /* Now xor all the parallel chunks together */ --1: vxor v0,v0,v1 -- vxor v2,v2,v3 -- vxor v4,v4,v5 -- vxor v6,v6,v7 -- -- vxor v0,v0,v2 -- vxor v4,v4,v6 -- -- vxor v0,v0,v4 -- --.Lbarrett_reduction: -- /* Barrett constants */ -- addis r3,r2,.barrett_constants@toc@ha -- addi r3,r3,.barrett_constants@toc@l -- -- lvx const1,0,r3 -- lvx const2,off16,r3 -- -- vsldoi v1,v0,v0,8 -- vxor v0,v0,v1 /* xor two 64 bit results together */ -- --#ifdef REFLECT -- /* shift left one bit */ -- vspltisb v1,1 -- vsl v0,v0,v1 --#endif -- -- vand v0,v0,mask_64bit -- --#ifndef REFLECT -- /* -- * Now for the Barrett reduction algorithm. The idea is to calculate q, -- * the multiple of our polynomial that we need to subtract. By -- * doing the computation 2x bits higher (ie 64 bits) and shifting the -- * result back down 2x bits, we round down to the nearest multiple. -- */ -- VPMSUMD(v1,v0,const1) /* ma */ -- vsldoi v1,zeroes,v1,8 /* q = floor(ma/(2^64)) */ -- VPMSUMD(v1,v1,const2) /* qn */ -- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ -- -- /* -- * Get the result into r3. We need to shift it left 8 bytes: -- * V0 [ 0 1 2 X ] -- * V0 [ 0 X 2 3 ] -- */ -- vsldoi v0,v0,zeroes,8 /* shift result into top 64 bits */ --#else -- /* -- * The reflected version of Barrett reduction. Instead of bit -- * reflecting our data (which is expensive to do), we bit reflect our -- * constants and our algorithm, which means the intermediate data in -- * our vector registers goes from 0-63 instead of 63-0. We can reflect -- * the algorithm because we don't carry in mod 2 arithmetic. -- */ -- vand v1,v0,mask_32bit /* bottom 32 bits of a */ -- VPMSUMD(v1,v1,const1) /* ma */ -- vand v1,v1,mask_32bit /* bottom 32bits of ma */ -- VPMSUMD(v1,v1,const2) /* qn */ -- vxor v0,v0,v1 /* a - qn, subtraction is xor in GF(2) */ -- -- /* -- * Since we are bit reflected, the result (ie the low 32 bits) is in -- * the high 32 bits. We just need to shift it left 4 bytes -- * V0 [ 0 1 X 3 ] -- * V0 [ 0 X 2 3 ] -- */ -- vsldoi v0,v0,zeroes,4 /* shift result into top 64 bits of */ --#endif -- -- /* Get it into r3 */ -- MFVRD(r3, v0) -- --.Lout: -- subi r6,r1,56+10*16 -- subi r7,r1,56+2*16 -- -- lvx v20,0,r6 -- lvx v21,off16,r6 -- lvx v22,off32,r6 -- lvx v23,off48,r6 -- lvx v24,off64,r6 -- lvx v25,off80,r6 -- lvx v26,off96,r6 -- lvx v27,off112,r6 -- lvx v28,0,r7 -- lvx v29,off16,r7 -- -- ld r31,-8(r1) -- ld r30,-16(r1) -- ld r29,-24(r1) -- ld r28,-32(r1) -- ld r27,-40(r1) -- ld r26,-48(r1) -- ld r25,-56(r1) -- -- blr -- --.Lfirst_warm_up_done: -- lvx const1,0,r3 -- addi r3,r3,16 -- -- VPMSUMD(v8,v16,const1) -- VPMSUMD(v9,v17,const1) -- VPMSUMD(v10,v18,const1) -- VPMSUMD(v11,v19,const1) -- VPMSUMD(v12,v20,const1) -- VPMSUMD(v13,v21,const1) -- VPMSUMD(v14,v22,const1) -- VPMSUMD(v15,v23,const1) -- -- b .Lsecond_cool_down -- --.Lshort: -- cmpdi r5,0 -- beq .Lzero -- -- addis r3,r2,.short_constants@toc@ha -- addi r3,r3,.short_constants@toc@l -- -- /* Calculate where in the constant table we need to start */ -- subfic r6,r5,256 -- add r3,r3,r6 -- -- /* How many 16 byte chunks? */ -- srdi r7,r5,4 -- mtctr r7 -- -- vxor v19,v19,v19 -- vxor v20,v20,v20 -- -- lvx v0,0,r4 -- lvx v16,0,r3 -- VPERM(v0,v0,v16,byteswap) -- vxor v0,v0,v8 /* xor in initial value */ -- VPMSUMW(v0,v0,v16) -- bdz .Lv0 -- -- lvx v1,off16,r4 -- lvx v17,off16,r3 -- VPERM(v1,v1,v17,byteswap) -- VPMSUMW(v1,v1,v17) -- bdz .Lv1 -- -- lvx v2,off32,r4 -- lvx v16,off32,r3 -- VPERM(v2,v2,v16,byteswap) -- VPMSUMW(v2,v2,v16) -- bdz .Lv2 -- -- lvx v3,off48,r4 -- lvx v17,off48,r3 -- VPERM(v3,v3,v17,byteswap) -- VPMSUMW(v3,v3,v17) -- bdz .Lv3 -- -- lvx v4,off64,r4 -- lvx v16,off64,r3 -- VPERM(v4,v4,v16,byteswap) -- VPMSUMW(v4,v4,v16) -- bdz .Lv4 -- -- lvx v5,off80,r4 -- lvx v17,off80,r3 -- VPERM(v5,v5,v17,byteswap) -- VPMSUMW(v5,v5,v17) -- bdz .Lv5 -- -- lvx v6,off96,r4 -- lvx v16,off96,r3 -- VPERM(v6,v6,v16,byteswap) -- VPMSUMW(v6,v6,v16) -- bdz .Lv6 -- -- lvx v7,off112,r4 -- lvx v17,off112,r3 -- VPERM(v7,v7,v17,byteswap) -- VPMSUMW(v7,v7,v17) -- bdz .Lv7 -- -- addi r3,r3,128 -- addi r4,r4,128 -- -- lvx v8,0,r4 -- lvx v16,0,r3 -- VPERM(v8,v8,v16,byteswap) -- VPMSUMW(v8,v8,v16) -- bdz .Lv8 -- -- lvx v9,off16,r4 -- lvx v17,off16,r3 -- VPERM(v9,v9,v17,byteswap) -- VPMSUMW(v9,v9,v17) -- bdz .Lv9 -- -- lvx v10,off32,r4 -- lvx v16,off32,r3 -- VPERM(v10,v10,v16,byteswap) -- VPMSUMW(v10,v10,v16) -- bdz .Lv10 -- -- lvx v11,off48,r4 -- lvx v17,off48,r3 -- VPERM(v11,v11,v17,byteswap) -- VPMSUMW(v11,v11,v17) -- bdz .Lv11 -- -- lvx v12,off64,r4 -- lvx v16,off64,r3 -- VPERM(v12,v12,v16,byteswap) -- VPMSUMW(v12,v12,v16) -- bdz .Lv12 -- -- lvx v13,off80,r4 -- lvx v17,off80,r3 -- VPERM(v13,v13,v17,byteswap) -- VPMSUMW(v13,v13,v17) -- bdz .Lv13 -- -- lvx v14,off96,r4 -- lvx v16,off96,r3 -- VPERM(v14,v14,v16,byteswap) -- VPMSUMW(v14,v14,v16) -- bdz .Lv14 -- -- lvx v15,off112,r4 -- lvx v17,off112,r3 -- VPERM(v15,v15,v17,byteswap) -- VPMSUMW(v15,v15,v17) -- --.Lv15: vxor v19,v19,v15 --.Lv14: vxor v20,v20,v14 --.Lv13: vxor v19,v19,v13 --.Lv12: vxor v20,v20,v12 --.Lv11: vxor v19,v19,v11 --.Lv10: vxor v20,v20,v10 --.Lv9: vxor v19,v19,v9 --.Lv8: vxor v20,v20,v8 --.Lv7: vxor v19,v19,v7 --.Lv6: vxor v20,v20,v6 --.Lv5: vxor v19,v19,v5 --.Lv4: vxor v20,v20,v4 --.Lv3: vxor v19,v19,v3 --.Lv2: vxor v20,v20,v2 --.Lv1: vxor v19,v19,v1 --.Lv0: vxor v20,v20,v0 -- -- vxor v0,v19,v20 -- -- b .Lbarrett_reduction -- --.Lzero: -- mr r3,r10 -- b .Lout -- --FUNC_END(__crc32_vpmsum) -diff --git a/util/crc32c_ppc_clang_workaround.h b/util/crc32c_ppc_clang_workaround.h -new file mode 100644 -index 0000000000..fc4391a603 ---- /dev/null -+++ b/util/crc32c_ppc_clang_workaround.h -@@ -0,0 +1,93 @@ -+// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. -+// Copyright (C) 2015, 2017 International Business Machines Corp. -+// All rights reserved. -+// This source code is licensed under both the GPLv2 (found in the -+// COPYING file in the root directory) and Apache 2.0 License -+// (found in the LICENSE.Apache file in the root directory). -+#ifndef CLANG_WORKAROUND_H -+#define CLANG_WORKAROUND_H -+ -+/* -+ * These stubs fix clang incompatibilities with GCC builtins. -+ */ -+ -+#ifndef __builtin_crypto_vpmsumw -+#define __builtin_crypto_vpmsumw __builtin_crypto_vpmsumb -+#endif -+#ifndef __builtin_crypto_vpmsumd -+#define __builtin_crypto_vpmsumd __builtin_crypto_vpmsumb -+#endif -+ -+static inline -+__vector unsigned long long __attribute__((overloadable)) -+vec_ld(int __a, const __vector unsigned long long* __b) -+{ -+ return (__vector unsigned long long)__builtin_altivec_lvx(__a, __b); -+} -+ -+/* -+ * GCC __builtin_pack_vector_int128 returns a vector __int128_t but Clang -+ * does not recognize this type. On GCC this builtin is translated to a -+ * xxpermdi instruction that only moves the registers __a, __b instead generates -+ * a load. -+ * -+ * Clang has vec_xxpermdi intrinsics. It was implemented in 4.0.0. -+ */ -+static inline -+__vector unsigned long long __builtin_pack_vector (unsigned long __a, -+ unsigned long __b) -+{ -+ #if defined(__BIG_ENDIAN__) -+ __vector unsigned long long __v = {__a, __b}; -+ #else -+ __vector unsigned long long __v = {__b, __a}; -+ #endif -+ return __v; -+} -+ -+/* -+ * Clang 7 changed the behavior of vec_xxpermdi in order to provide the same -+ * behavior of GCC. That means code adapted to Clang >= 7 does not work on -+ * Clang <= 6. So, fallback to __builtin_unpack_vector() on Clang <= 6. -+ */ -+#if !defined vec_xxpermdi || __clang_major__ <= 6 -+ -+static inline -+unsigned long __builtin_unpack_vector (__vector unsigned long long __v, -+ int __o) -+{ -+ return __v[__o]; -+} -+ -+#if defined(__BIG_ENDIAN__) -+#define __builtin_unpack_vector_0(a) __builtin_unpack_vector ((a), 0) -+#define __builtin_unpack_vector_1(a) __builtin_unpack_vector ((a), 1) -+#else -+#define __builtin_unpack_vector_0(a) __builtin_unpack_vector ((a), 1) -+#define __builtin_unpack_vector_1(a) __builtin_unpack_vector ((a), 0) -+#endif -+ -+#else -+ -+static inline -+unsigned long __builtin_unpack_vector_0 (__vector unsigned long long __v) -+{ -+ #if defined(__BIG_ENDIAN__) -+ return vec_xxpermdi(__v, __v, 0x0)[0]; -+ #else -+ return vec_xxpermdi(__v, __v, 0x3)[0]; -+ #endif -+} -+ -+static inline -+unsigned long __builtin_unpack_vector_1 (__vector unsigned long long __v) -+{ -+ #if defined(__BIG_ENDIAN__) -+ return vec_xxpermdi(__v, __v, 0x3)[0]; -+ #else -+ return vec_xxpermdi(__v, __v, 0x0)[0]; -+ #endif -+} -+#endif /* vec_xxpermdi */ -+ -+#endif -diff --git a/util/crc32c_ppc_constants.h b/util/crc32c_ppc_constants.h -index f6494cd01c..b558d46777 100644 ---- a/util/crc32c_ppc_constants.h -+++ b/util/crc32c_ppc_constants.h -@@ -5,896 +5,1206 @@ - // COPYING file in the root directory) and Apache 2.0 License - // (found in the LICENSE.Apache file in the root directory). - --#pragma once -+/* -+* -+* THIS FILE IS GENERATED WITH -+./crc32_constants -r -x 0x1edc6f41 -+ -+* This is from https://github.com/antonblanchard/crc32-vpmsum/ -+* DO NOT MODIFY IT MANUALLY! -+* -+*/ - - #define CRC 0x1edc6f41 --#define REFLECT - #define CRC_XOR -+#define REFLECT -+#define MAX_SIZE 32768 - --#ifndef __ASSEMBLY__ - #ifdef CRC_TABLE - static const unsigned int crc_table[] = { -- 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, -- 0x26a1e7e8, 0xd4ca64eb, 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, -- 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, 0x105ec76f, 0xe235446c, -- 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, -- 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, -- 0xbc267848, 0x4e4dfb4b, 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, -- 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, 0xaa64d611, 0x580f5512, -- 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, -- 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, -- 0x1642ae59, 0xe4292d5a, 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, -- 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, 0x417b1dbc, 0xb3109ebf, -- 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, -- 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, -- 0xed03a29b, 0x1f682198, 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, -- 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, 0xdbfc821c, 0x2997011f, -- 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, -- 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, -- 0x4767748a, 0xb50cf789, 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, -- 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, 0x7198540d, 0x83f3d70e, -- 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, -- 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, -- 0xdde0eb2a, 0x2f8b6829, 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, -- 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, 0x082f63b7, 0xfa44e0b4, -- 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, -- 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, -- 0xb4091bff, 0x466298fc, 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, -- 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, 0xa24bb5a6, 0x502036a5, -- 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, -- 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, -- 0x0e330a81, 0xfc588982, 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, -- 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, 0x38cc2a06, 0xcaa7a905, -- 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, -- 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, -- 0xe52cc12c, 0x1747422f, 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, -- 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, 0xd3d3e1ab, 0x21b862a8, -- 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, -- 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, -- 0x7fab5e8c, 0x8dc0dd8f, 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, -- 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, 0x69e9f0d5, 0x9b8273d6, -- 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, -- 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, -- 0xd5cf889d, 0x27a40b9e, 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, -- 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351, --}; -- --#endif -- --#else --#define MAX_SIZE 32768 --.constants : -- -- /* Reduce 262144 kbits to 1024 bits */ -- /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ -- .octa 0x00000000b6ca9e20000000009c37c408 -- -- /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ -- .octa 0x00000000350249a800000001b51df26c -- -- /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ -- .octa 0x00000001862dac54000000000724b9d0 -- -- /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ -- .octa 0x00000001d87fb48c00000001c00532fe -- -- /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ -- .octa 0x00000001f39b699e00000000f05a9362 -- -- /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ -- .octa 0x0000000101da11b400000001e1007970 -- -- /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ -- .octa 0x00000001cab571e000000000a57366ee -- -- /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ -- .octa 0x00000000c7020cfe0000000192011284 -- -- /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ -- .octa 0x00000000cdaed1ae0000000162716d9a -- -- /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ -- .octa 0x00000001e804effc00000000cd97ecde -- -- /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ -- .octa 0x0000000077c3ea3a0000000058812bc0 -- -- /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ -- .octa 0x0000000068df31b40000000088b8c12e -- -- /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ -- .octa 0x00000000b059b6c200000001230b234c -- -- /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ -- .octa 0x0000000145fb8ed800000001120b416e -- -- /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ -- .octa 0x00000000cbc0916800000001974aecb0 -- -- /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ -- .octa 0x000000005ceeedc2000000008ee3f226 -- -- /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ -- .octa 0x0000000047d74e8600000001089aba9a -- -- /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ -- .octa 0x00000001407e9e220000000065113872 -- -- /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ -- .octa 0x00000001da967bda000000005c07ec10 -- -- /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ -- .octa 0x000000006c8983680000000187590924 -- -- /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ -- .octa 0x00000000f2d14c9800000000e35da7c6 -- -- /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ -- .octa 0x00000001993c6ad4000000000415855a -- -- /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ -- .octa 0x000000014683d1ac0000000073617758 -- -- /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ -- .octa 0x00000001a7c93e6c0000000176021d28 -- -- /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ -- .octa 0x000000010211e90a00000001c358fd0a -- -- /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ -- .octa 0x000000001119403e00000001ff7a2c18 -- -- /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ -- .octa 0x000000001c3261aa00000000f2d9f7e4 -- -- /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ -- .octa 0x000000014e37a634000000016cf1f9c8 -- -- /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ -- .octa 0x0000000073786c0c000000010af9279a -- -- /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ -- .octa 0x000000011dc037f80000000004f101e8 -- -- /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ -- .octa 0x0000000031433dfc0000000070bcf184 -- -- /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ -- .octa 0x000000009cde8348000000000a8de642 -- -- /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ -- .octa 0x0000000038d3c2a60000000062ea130c -- -- /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ -- .octa 0x000000011b25f26000000001eb31cbb2 -- -- /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ -- .octa 0x000000001629e6f00000000170783448 -- -- /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ -- .octa 0x0000000160838b4c00000001a684b4c6 -- -- /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ -- .octa 0x000000007a44011c00000000253ca5b4 -- -- /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ -- .octa 0x00000000226f417a0000000057b4b1e2 -- -- /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ -- .octa 0x0000000045eb2eb400000000b6bd084c -- -- /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ -- .octa 0x000000014459d70c0000000123c2d592 -- -- /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ -- .octa 0x00000001d406ed8200000000159dafce -- -- /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ -- .octa 0x0000000160c8e1a80000000127e1a64e -- -- /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ -- .octa 0x0000000027ba80980000000056860754 -- -- /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ -- .octa 0x000000006d92d01800000001e661aae8 -- -- /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ -- .octa 0x000000012ed7e3f200000000f82c6166 -- -- /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ -- .octa 0x000000002dc8778800000000c4f9c7ae -- -- /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ -- .octa 0x0000000018240bb80000000074203d20 -- -- /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ -- .octa 0x000000001ad381580000000198173052 -- -- /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ -- .octa 0x00000001396b78f200000001ce8aba54 -- -- /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ -- .octa 0x000000011a68133400000001850d5d94 -- -- /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ -- .octa 0x000000012104732e00000001d609239c -- -- /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ -- .octa 0x00000000a140d90c000000001595f048 -- -- /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ -- .octa 0x00000001b7215eda0000000042ccee08 -- -- /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ -- .octa 0x00000001aaf1df3c000000010a389d74 -- -- /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ -- .octa 0x0000000029d15b8a000000012a840da6 -- -- /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ -- .octa 0x00000000f1a96922000000001d181c0c -- -- /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ -- .octa 0x00000001ac80d03c0000000068b7d1f6 -- -- /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ -- .octa 0x000000000f11d56a000000005b0f14fc -- -- /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ -- .octa 0x00000001f1c022a20000000179e9e730 -- -- /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ -- .octa 0x0000000173d00ae200000001ce1368d6 -- -- /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ -- .octa 0x00000001d4ffe4ac0000000112c3a84c -- -- /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ -- .octa 0x000000016edc5ae400000000de940fee -- -- /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ -- .octa 0x00000001f1a0214000000000fe896b7e -- -- /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ -- .octa 0x00000000ca0b28a000000001f797431c -- -- /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ -- .octa 0x00000001928e30a20000000053e989ba -- -- /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ -- .octa 0x0000000097b1b002000000003920cd16 -- -- /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ -- .octa 0x00000000b15bf90600000001e6f579b8 -- -- /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ -- .octa 0x00000000411c5d52000000007493cb0a -- -- /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ -- .octa 0x00000001c36f330000000001bdd376d8 -- -- /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ -- .octa 0x00000001119227e0000000016badfee6 -- -- /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ -- .octa 0x00000000114d47020000000071de5c58 -- -- /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ -- .octa 0x00000000458b5b9800000000453f317c -- -- /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ -- .octa 0x000000012e31fb8e0000000121675cce -- -- /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ -- .octa 0x000000005cf619d800000001f409ee92 -- -- /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ -- .octa 0x0000000063f4d8b200000000f36b9c88 -- -- /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ -- .octa 0x000000004138dc8a0000000036b398f4 -- -- /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ -- .octa 0x00000001d29ee8e000000001748f9adc -- -- /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ -- .octa 0x000000006a08ace800000001be94ec00 -- -- /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ -- .octa 0x0000000127d4201000000000b74370d6 -- -- /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ -- .octa 0x0000000019d76b6200000001174d0b98 -- -- /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ -- .octa 0x00000001b1471f6e00000000befc06a4 -- -- /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ -- .octa 0x00000001f64c19cc00000001ae125288 -- -- /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ -- .octa 0x00000000003c0ea00000000095c19b34 -- -- /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ -- .octa 0x000000014d73abf600000001a78496f2 -- -- /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ -- .octa 0x00000001620eb84400000001ac5390a0 -- -- /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ -- .octa 0x0000000147655048000000002a80ed6e -- -- /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ -- .octa 0x0000000067b5077e00000001fa9b0128 -- -- /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ -- .octa 0x0000000010ffe20600000001ea94929e -- -- /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ -- .octa 0x000000000fee8f1e0000000125f4305c -- -- /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ -- .octa 0x00000001da26fbae00000001471e2002 -- -- /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ -- .octa 0x00000001b3a8bd880000000132d2253a -- -- /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ -- .octa 0x00000000e8f3898e00000000f26b3592 -- -- /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ -- .octa 0x00000000b0d0d28c00000000bc8b67b0 -- -- /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ -- .octa 0x0000000030f2a798000000013a826ef2 -- -- /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ -- .octa 0x000000000fba10020000000081482c84 -- -- /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ -- .octa 0x00000000bdb9bd7200000000e77307c2 -- -- /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ -- .octa 0x0000000075d3bf5a00000000d4a07ec8 -- -- /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ -- .octa 0x00000000ef1f98a00000000017102100 -- -- /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ -- .octa 0x00000000689c760200000000db406486 -- -- /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ -- .octa 0x000000016d5fa5fe0000000192db7f88 -- -- /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ -- .octa 0x00000001d0d2b9ca000000018bf67b1e -- -- /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ -- .octa 0x0000000041e7b470000000007c09163e -- -- /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ -- .octa 0x00000001cbb6495e000000000adac060 -- -- /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ -- .octa 0x000000010052a0b000000000bd8316ae -- -- /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ -- .octa 0x00000001d8effb5c000000019f09ab54 -- -- /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ -- .octa 0x00000001d969853c0000000125155542 -- -- /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ -- .octa 0x00000000523ccce2000000018fdb5882 -- -- /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ -- .octa 0x000000001e2436bc00000000e794b3f4 -- -- /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ -- .octa 0x00000000ddd1c3a2000000016f9bb022 -- -- /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ -- .octa 0x0000000019fcfe3800000000290c9978 -- -- /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ -- .octa 0x00000001ce95db640000000083c0f350 -- -- /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ -- .octa 0x00000000af5828060000000173ea6628 -- -- /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ -- .octa 0x00000001006388f600000001c8b4e00a -- -- /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ -- .octa 0x0000000179eca00a00000000de95d6aa -- -- /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ -- .octa 0x0000000122410a6a000000010b7f7248 -- -- /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ -- .octa 0x000000004288e87c00000001326e3a06 -- -- /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ -- .octa 0x000000016c5490da00000000bb62c2e6 -- -- /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ -- .octa 0x00000000d1c71f6e0000000156a4b2c2 -- -- /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ -- .octa 0x00000001b4ce08a6000000011dfe763a -- -- /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ -- .octa 0x00000001466ba60c000000007bcca8e2 -- -- /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ -- .octa 0x00000001f6c488a40000000186118faa -- -- /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ -- .octa 0x000000013bfb06820000000111a65a88 -- -- /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ -- .octa 0x00000000690e9e54000000003565e1c4 -- -- /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ -- .octa 0x00000000281346b6000000012ed02a82 -- -- /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ -- .octa 0x000000015646402400000000c486ecfc -- -- /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ -- .octa 0x000000016063a8dc0000000001b951b2 -- -- /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ -- .octa 0x0000000116a663620000000048143916 -- -- /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ -- .octa 0x000000017e8aa4d200000001dc2ae124 -- -- /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ -- .octa 0x00000001728eb10c00000001416c58d6 -- -- /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ -- .octa 0x00000001b08fd7fa00000000a479744a -- -- /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ -- .octa 0x00000001092a16e80000000096ca3a26 -- -- /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ -- .octa 0x00000000a505637c00000000ff223d4e -- -- /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ -- .octa 0x00000000d94869b2000000010e84da42 -- -- /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ -- .octa 0x00000001c8b203ae00000001b61ba3d0 -- -- /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ -- .octa 0x000000005704aea000000000680f2de8 -- -- /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ -- .octa 0x000000012e295fa2000000008772a9a8 -- -- /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ -- .octa 0x000000011d0908bc0000000155f295bc -- -- /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ -- .octa 0x0000000193ed97ea00000000595f9282 -- -- /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ -- .octa 0x000000013a0f1c520000000164b1c25a -- -- /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ -- .octa 0x000000010c2c40c000000000fbd67c50 -- -- /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ -- .octa 0x00000000ff6fac3e0000000096076268 -- -- /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ -- .octa 0x000000017b3609c000000001d288e4cc -- -- /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ -- .octa 0x0000000088c8c92200000001eaac1bdc -- -- /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ -- .octa 0x00000001751baae600000001f1ea39e2 -- -- /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ -- .octa 0x000000010795297200000001eb6506fc -- -- /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ -- .octa 0x0000000162b00abe000000010f806ffe -- -- /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ -- .octa 0x000000000d7b404c000000010408481e -- -- /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ -- .octa 0x00000000763b13d40000000188260534 -- -- /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ -- .octa 0x00000000f6dc22d80000000058fc73e0 -- -- /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ -- .octa 0x000000007daae06000000000391c59b8 -- -- /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ -- .octa 0x000000013359ab7c000000018b638400 -- -- /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ -- .octa 0x000000008add438a000000011738f5c4 -- -- /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ -- .octa 0x00000001edbefdea000000008cf7c6da -- -- /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ -- .octa 0x000000004104e0f800000001ef97fb16 -- -- /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ -- .octa 0x00000000b48a82220000000102130e20 -- -- /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ -- .octa 0x00000001bcb4684400000000db968898 -- -- /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ -- .octa 0x000000013293ce0a00000000b5047b5e -- -- /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ -- .octa 0x00000001710d0844000000010b90fdb2 -- -- /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ -- .octa 0x0000000117907f6e000000004834a32e -- -- /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ -- .octa 0x0000000087ddf93e0000000059c8f2b0 -- -- /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ -- .octa 0x000000005970e9b00000000122cec508 -- -- /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ -- .octa 0x0000000185b2b7d0000000000a330cda -- -- /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ -- .octa 0x00000001dcee0efc000000014a47148c -- -- /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ -- .octa 0x0000000030da27220000000042c61cb8 -- -- /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ -- .octa 0x000000012f925a180000000012fe6960 -- -- /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ -- .octa 0x00000000dd2e357c00000000dbda2c20 -- -- /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ -- .octa 0x00000000071c80de000000011122410c -- -- /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ -- .octa 0x000000011513140a00000000977b2070 -- -- /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ -- .octa 0x00000001df876e8e000000014050438e -- -- /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ -- .octa 0x000000015f81d6ce0000000147c840e8 -- -- /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ -- .octa 0x000000019dd94dbe00000001cc7c88ce -- -- /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ -- .octa 0x00000001373d206e00000001476b35a4 -- -- /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ -- .octa 0x00000000668ccade000000013d52d508 -- -- /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ -- .octa 0x00000001b192d268000000008e4be32e -- -- /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ -- .octa 0x00000000e30f3a7800000000024120fe -- -- /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ -- .octa 0x000000010ef1f7bc00000000ddecddb4 -- -- /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ -- .octa 0x00000001f5ac738000000000d4d403bc -- -- /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ -- .octa 0x000000011822ea7000000001734b89aa -- -- /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ -- .octa 0x00000000c3a33848000000010e7a58d6 -- -- /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ -- .octa 0x00000001bd151c2400000001f9f04e9c -- -- /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ -- .octa 0x0000000056002d7600000000b692225e -- -- /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ -- .octa 0x000000014657c4f4000000019b8d3f3e -- -- /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ -- .octa 0x0000000113742d7c00000001a874f11e -- -- /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ -- .octa 0x000000019c5920ba000000010d5a4254 -- -- /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ -- .octa 0x000000005216d2d600000000bbb2f5d6 -- -- /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ -- .octa 0x0000000136f5ad8a0000000179cc0e36 -- -- /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ -- .octa 0x000000018b07beb600000001dca1da4a -- -- /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ -- .octa 0x00000000db1e93b000000000feb1a192 -- -- /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ -- .octa 0x000000000b96fa3a00000000d1eeedd6 -- -- /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ -- .octa 0x00000001d9968af0000000008fad9bb4 -- -- /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ -- .octa 0x000000000e4a77a200000001884938e4 -- -- /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ -- .octa 0x00000000508c2ac800000001bc2e9bc0 -- -- /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ -- .octa 0x0000000021572a8000000001f9658a68 -- -- /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ -- .octa 0x00000001b859daf2000000001b9224fc -- -- /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ -- .octa 0x000000016f7884740000000055b2fb84 -- -- /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ -- .octa 0x00000001b438810e000000018b090348 -- -- /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ -- .octa 0x0000000095ddc6f2000000011ccbd5ea -- -- /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ -- .octa 0x00000001d977c20c0000000007ae47f8 -- -- /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ -- .octa 0x00000000ebedb99a0000000172acbec0 -- -- /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ -- .octa 0x00000001df9e9e9200000001c6e3ff20 -- -- /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ -- .octa 0x00000001a4a3f95200000000e1b38744 -- -- /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ -- .octa 0x00000000e2f5122000000000791585b2 -- -- /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ -- .octa 0x000000004aa01f3e00000000ac53b894 -- -- /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ -- .octa 0x00000000b3e90a5800000001ed5f2cf4 -- -- /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ -- .octa 0x000000000c9ca2aa00000001df48b2e0 -- -- /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ -- .octa 0x000000015168231600000000049c1c62 -- -- /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ -- .octa 0x0000000036fce78c000000017c460c12 -- -- /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ -- .octa 0x000000009037dc10000000015be4da7e -- -- /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ -- .octa 0x00000000d3298582000000010f38f668 -- -- /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ -- .octa 0x00000001b42e8ad60000000039f40a00 -- -- /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ -- .octa 0x00000000142a983800000000bd4c10c4 -- -- /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ -- .octa 0x0000000109c7f1900000000042db1d98 -- -- /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ -- .octa 0x0000000056ff931000000001c905bae6 -- -- /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ -- .octa 0x00000001594513aa00000000069d40ea -- -- /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ -- .octa 0x00000001e3b5b1e8000000008e4fbad0 -- -- /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ -- .octa 0x000000011dd5fc080000000047bedd46 -- -- /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ -- .octa 0x00000001675f0cc20000000026396bf8 -- -- /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ -- .octa 0x00000000d1c8dd4400000000379beb92 -- -- /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ -- .octa 0x0000000115ebd3d8000000000abae54a -- -- /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ -- .octa 0x00000001ecbd0dac0000000007e6a128 -- -- /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ -- .octa 0x00000000cdf67af2000000000ade29d2 -- -- /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ -- .octa 0x000000004c01ff4c00000000f974c45c -- -- /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ -- .octa 0x00000000f2d8657e00000000e77ac60a -- -- /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ -- .octa 0x000000006bae74c40000000145895816 -- -- /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ -- .octa 0x0000000152af8aa00000000038e362be -- -- /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ -- .octa 0x0000000004663802000000007f991a64 -- -- /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ -- .octa 0x00000001ab2f5afc00000000fa366d3a -- -- /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ -- .octa 0x0000000074a4ebd400000001a2bb34f0 -- -- /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ -- .octa 0x00000001d7ab3a4c0000000028a9981e -- -- /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ -- .octa 0x00000001a8da60c600000001dbc672be -- -- /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ -- .octa 0x000000013cf6382000000000b04d77f6 -- -- /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ -- .octa 0x00000000bec12e1e0000000124400d96 -- -- /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ -- .octa 0x00000001c6368010000000014ca4b414 -- -- /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ -- .octa 0x00000001e6e78758000000012fe2c938 -- -- /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ -- .octa 0x000000008d7f2b3c00000001faed01e6 -- -- /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ -- .octa 0x000000016b4a156e000000007e80ecfe -- -- /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ -- .octa 0x00000001c63cfeb60000000098daee94 -- -- /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ -- .octa 0x000000015f902670000000010a04edea -- -- /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ -- .octa 0x00000001cd5de11e00000001c00b4524 -- -- /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ -- .octa 0x000000001acaec540000000170296550 -- -- /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ -- .octa 0x000000002bd0ca780000000181afaa48 -- -- /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ -- .octa 0x0000000032d63d5c0000000185a31ffa -- -- /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ -- .octa 0x000000001c6d4e4c000000002469f608 -- -- /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ -- .octa 0x0000000106a60b92000000006980102a -- -- /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ -- .octa 0x00000000d3855e120000000111ea9ca8 -- -- /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ -- .octa 0x00000000e312563600000001bd1d29ce -- -- /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ -- .octa 0x000000009e8f7ea400000001b34b9580 -- -- /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ -- .octa 0x00000001c82e562c000000003076054e -- -- /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ -- .octa 0x00000000ca9f09ce000000012a608ea4 -- -- /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ -- .octa 0x00000000c63764e600000000784d05fe -- -- /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ -- .octa 0x0000000168d2e49e000000016ef0d82a -- -- /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ -- .octa 0x00000000e986c1480000000075bda454 -- -- /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ -- .octa 0x00000000cfb65894000000003dc0a1c4 -- -- /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ -- .octa 0x0000000111cadee400000000e9a5d8be -- -- /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ -- .octa 0x0000000171fb63ce00000001609bc4b4 -- -- .short_constants : -- -- /* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include -- the trailing 32 bits of zeros */ -- /* x^1952 mod p(x)`, x^1984 mod p(x)`, x^2016 mod p(x)`, x^2048 mod -- p(x)` */ -- .octa 0x7fec2963e5bf80485cf015c388e56f72 -- -- /* x^1824 mod p(x)`, x^1856 mod p(x)`, x^1888 mod p(x)`, x^1920 mod -- p(x)` */ -- .octa 0x38e888d4844752a9963a18920246e2e6 -- -- /* x^1696 mod p(x)`, x^1728 mod p(x)`, x^1760 mod p(x)`, x^1792 mod -- p(x)` */ -- .octa 0x42316c00730206ad419a441956993a31 -- -- /* x^1568 mod p(x)`, x^1600 mod p(x)`, x^1632 mod p(x)`, x^1664 mod -- p(x)` */ -- .octa 0x543d5c543e65ddf9924752ba2b830011 -- -- /* x^1440 mod p(x)`, x^1472 mod p(x)`, x^1504 mod p(x)`, x^1536 mod -- p(x)` */ -- .octa 0x78e87aaf56767c9255bd7f9518e4a304 -- -- /* x^1312 mod p(x)`, x^1344 mod p(x)`, x^1376 mod p(x)`, x^1408 mod -- p(x)` */ -- .octa 0x8f68fcec1903da7f6d76739fe0553f1e -- -- /* x^1184 mod p(x)`, x^1216 mod p(x)`, x^1248 mod p(x)`, x^1280 mod -- p(x)` */ -- .octa 0x3f4840246791d588c133722b1fe0b5c3 -- -- /* x^1056 mod p(x)`, x^1088 mod p(x)`, x^1120 mod p(x)`, x^1152 mod -- p(x)` */ -- .octa 0x34c96751b04de25a64b67ee0e55ef1f3 -- -- /* x^928 mod p(x)`, x^960 mod p(x)`, x^992 mod p(x)`, x^1024 mod p(x)` -- */ -- .octa 0x156c8e180b4a395b069db049b8fdb1e7 -- -- /* x^800 mod p(x)`, x^832 mod p(x)`, x^864 mod p(x)`, x^896 mod p(x)` */ -- .octa 0xe0b99ccbe661f7bea11bfaf3c9e90b9e -- -- /* x^672 mod p(x)`, x^704 mod p(x)`, x^736 mod p(x)`, x^768 mod p(x)` */ -- .octa 0x041d37768cd75659817cdc5119b29a35 -- -- /* x^544 mod p(x)`, x^576 mod p(x)`, x^608 mod p(x)`, x^640 mod p(x)` */ -- .octa 0x3a0777818cfaa9651ce9d94b36c41f1c -- -- /* x^416 mod p(x)`, x^448 mod p(x)`, x^480 mod p(x)`, x^512 mod p(x)` */ -- .octa 0x0e148e8252377a554f256efcb82be955 -- -- /* x^288 mod p(x)`, x^320 mod p(x)`, x^352 mod p(x)`, x^384 mod p(x)` */ -- .octa 0x9c25531d19e65ddeec1631edb2dea967 -- -- /* x^160 mod p(x)`, x^192 mod p(x)`, x^224 mod p(x)`, x^256 mod p(x)` */ -- .octa 0x790606ff9957c0a65d27e147510ac59a -- -- /* x^32 mod p(x)`, x^64 mod p(x)`, x^96 mod p(x)`, x^128 mod p(x)` */ -- .octa 0x82f63b786ea2d55ca66805eb18b8ea18 -- -- .barrett_constants : -- /* 33 bit reflected Barrett constant m - (4^32)/n */ -- .octa 0x000000000000000000000000dea713f1 /* x^64 div p(x)` */ -- /* 33 bit reflected Barrett constant n */ -- .octa 0x00000000000000000000000105ec76f1 --#endif -+ 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, -+ 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, -+ 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, -+ 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, -+ 0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, -+ 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, -+ 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, -+ 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, -+ 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, -+ 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, -+ 0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, -+ 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, -+ 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, -+ 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, -+ 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, -+ 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, -+ 0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, -+ 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, -+ 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, -+ 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, -+ 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, -+ 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, -+ 0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, -+ 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, -+ 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, -+ 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, -+ 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, -+ 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, -+ 0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, -+ 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, -+ 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, -+ 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, -+ 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, -+ 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, -+ 0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, -+ 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, -+ 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, -+ 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, -+ 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, -+ 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, -+ 0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, -+ 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, -+ 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, -+ 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, -+ 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, -+ 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, -+ 0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, -+ 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, -+ 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, -+ 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, -+ 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, -+ 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, -+ 0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, -+ 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, -+ 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, -+ 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, -+ 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, -+ 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, -+ 0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, -+ 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, -+ 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, -+ 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, -+ 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, -+ 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351,}; -+ -+#endif /* CRC_TABLE */ -+#ifdef POWER8_INTRINSICS -+ -+/* Constants */ -+ -+/* Reduce 262144 kbits to 1024 bits */ -+static const __vector unsigned long long vcrc_const[255] -+ __attribute__((aligned (16))) = { -+#ifdef __LITTLE_ENDIAN__ -+ /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ -+ { 0x000000009c37c408, 0x00000000b6ca9e20 }, -+ /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ -+ { 0x00000001b51df26c, 0x00000000350249a8 }, -+ /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ -+ { 0x000000000724b9d0, 0x00000001862dac54 }, -+ /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ -+ { 0x00000001c00532fe, 0x00000001d87fb48c }, -+ /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ -+ { 0x00000000f05a9362, 0x00000001f39b699e }, -+ /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ -+ { 0x00000001e1007970, 0x0000000101da11b4 }, -+ /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ -+ { 0x00000000a57366ee, 0x00000001cab571e0 }, -+ /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ -+ { 0x0000000192011284, 0x00000000c7020cfe }, -+ /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ -+ { 0x0000000162716d9a, 0x00000000cdaed1ae }, -+ /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ -+ { 0x00000000cd97ecde, 0x00000001e804effc }, -+ /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ -+ { 0x0000000058812bc0, 0x0000000077c3ea3a }, -+ /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ -+ { 0x0000000088b8c12e, 0x0000000068df31b4 }, -+ /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ -+ { 0x00000001230b234c, 0x00000000b059b6c2 }, -+ /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ -+ { 0x00000001120b416e, 0x0000000145fb8ed8 }, -+ /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ -+ { 0x00000001974aecb0, 0x00000000cbc09168 }, -+ /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ -+ { 0x000000008ee3f226, 0x000000005ceeedc2 }, -+ /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ -+ { 0x00000001089aba9a, 0x0000000047d74e86 }, -+ /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ -+ { 0x0000000065113872, 0x00000001407e9e22 }, -+ /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ -+ { 0x000000005c07ec10, 0x00000001da967bda }, -+ /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ -+ { 0x0000000187590924, 0x000000006c898368 }, -+ /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ -+ { 0x00000000e35da7c6, 0x00000000f2d14c98 }, -+ /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ -+ { 0x000000000415855a, 0x00000001993c6ad4 }, -+ /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ -+ { 0x0000000073617758, 0x000000014683d1ac }, -+ /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ -+ { 0x0000000176021d28, 0x00000001a7c93e6c }, -+ /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ -+ { 0x00000001c358fd0a, 0x000000010211e90a }, -+ /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ -+ { 0x00000001ff7a2c18, 0x000000001119403e }, -+ /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ -+ { 0x00000000f2d9f7e4, 0x000000001c3261aa }, -+ /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ -+ { 0x000000016cf1f9c8, 0x000000014e37a634 }, -+ /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ -+ { 0x000000010af9279a, 0x0000000073786c0c }, -+ /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ -+ { 0x0000000004f101e8, 0x000000011dc037f8 }, -+ /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ -+ { 0x0000000070bcf184, 0x0000000031433dfc }, -+ /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ -+ { 0x000000000a8de642, 0x000000009cde8348 }, -+ /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ -+ { 0x0000000062ea130c, 0x0000000038d3c2a6 }, -+ /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ -+ { 0x00000001eb31cbb2, 0x000000011b25f260 }, -+ /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ -+ { 0x0000000170783448, 0x000000001629e6f0 }, -+ /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ -+ { 0x00000001a684b4c6, 0x0000000160838b4c }, -+ /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ -+ { 0x00000000253ca5b4, 0x000000007a44011c }, -+ /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ -+ { 0x0000000057b4b1e2, 0x00000000226f417a }, -+ /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ -+ { 0x00000000b6bd084c, 0x0000000045eb2eb4 }, -+ /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ -+ { 0x0000000123c2d592, 0x000000014459d70c }, -+ /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ -+ { 0x00000000159dafce, 0x00000001d406ed82 }, -+ /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ -+ { 0x0000000127e1a64e, 0x0000000160c8e1a8 }, -+ /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ -+ { 0x0000000056860754, 0x0000000027ba8098 }, -+ /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ -+ { 0x00000001e661aae8, 0x000000006d92d018 }, -+ /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ -+ { 0x00000000f82c6166, 0x000000012ed7e3f2 }, -+ /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ -+ { 0x00000000c4f9c7ae, 0x000000002dc87788 }, -+ /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ -+ { 0x0000000074203d20, 0x0000000018240bb8 }, -+ /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ -+ { 0x0000000198173052, 0x000000001ad38158 }, -+ /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ -+ { 0x00000001ce8aba54, 0x00000001396b78f2 }, -+ /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ -+ { 0x00000001850d5d94, 0x000000011a681334 }, -+ /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ -+ { 0x00000001d609239c, 0x000000012104732e }, -+ /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ -+ { 0x000000001595f048, 0x00000000a140d90c }, -+ /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ -+ { 0x0000000042ccee08, 0x00000001b7215eda }, -+ /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ -+ { 0x000000010a389d74, 0x00000001aaf1df3c }, -+ /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ -+ { 0x000000012a840da6, 0x0000000029d15b8a }, -+ /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ -+ { 0x000000001d181c0c, 0x00000000f1a96922 }, -+ /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ -+ { 0x0000000068b7d1f6, 0x00000001ac80d03c }, -+ /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ -+ { 0x000000005b0f14fc, 0x000000000f11d56a }, -+ /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ -+ { 0x0000000179e9e730, 0x00000001f1c022a2 }, -+ /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ -+ { 0x00000001ce1368d6, 0x0000000173d00ae2 }, -+ /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ -+ { 0x0000000112c3a84c, 0x00000001d4ffe4ac }, -+ /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ -+ { 0x00000000de940fee, 0x000000016edc5ae4 }, -+ /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ -+ { 0x00000000fe896b7e, 0x00000001f1a02140 }, -+ /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ -+ { 0x00000001f797431c, 0x00000000ca0b28a0 }, -+ /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ -+ { 0x0000000053e989ba, 0x00000001928e30a2 }, -+ /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ -+ { 0x000000003920cd16, 0x0000000097b1b002 }, -+ /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ -+ { 0x00000001e6f579b8, 0x00000000b15bf906 }, -+ /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ -+ { 0x000000007493cb0a, 0x00000000411c5d52 }, -+ /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ -+ { 0x00000001bdd376d8, 0x00000001c36f3300 }, -+ /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ -+ { 0x000000016badfee6, 0x00000001119227e0 }, -+ /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ -+ { 0x0000000071de5c58, 0x00000000114d4702 }, -+ /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ -+ { 0x00000000453f317c, 0x00000000458b5b98 }, -+ /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ -+ { 0x0000000121675cce, 0x000000012e31fb8e }, -+ /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ -+ { 0x00000001f409ee92, 0x000000005cf619d8 }, -+ /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ -+ { 0x00000000f36b9c88, 0x0000000063f4d8b2 }, -+ /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ -+ { 0x0000000036b398f4, 0x000000004138dc8a }, -+ /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ -+ { 0x00000001748f9adc, 0x00000001d29ee8e0 }, -+ /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ -+ { 0x00000001be94ec00, 0x000000006a08ace8 }, -+ /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ -+ { 0x00000000b74370d6, 0x0000000127d42010 }, -+ /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ -+ { 0x00000001174d0b98, 0x0000000019d76b62 }, -+ /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ -+ { 0x00000000befc06a4, 0x00000001b1471f6e }, -+ /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ -+ { 0x00000001ae125288, 0x00000001f64c19cc }, -+ /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ -+ { 0x0000000095c19b34, 0x00000000003c0ea0 }, -+ /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ -+ { 0x00000001a78496f2, 0x000000014d73abf6 }, -+ /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ -+ { 0x00000001ac5390a0, 0x00000001620eb844 }, -+ /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ -+ { 0x000000002a80ed6e, 0x0000000147655048 }, -+ /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ -+ { 0x00000001fa9b0128, 0x0000000067b5077e }, -+ /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ -+ { 0x00000001ea94929e, 0x0000000010ffe206 }, -+ /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ -+ { 0x0000000125f4305c, 0x000000000fee8f1e }, -+ /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ -+ { 0x00000001471e2002, 0x00000001da26fbae }, -+ /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ -+ { 0x0000000132d2253a, 0x00000001b3a8bd88 }, -+ /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ -+ { 0x00000000f26b3592, 0x00000000e8f3898e }, -+ /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ -+ { 0x00000000bc8b67b0, 0x00000000b0d0d28c }, -+ /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ -+ { 0x000000013a826ef2, 0x0000000030f2a798 }, -+ /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ -+ { 0x0000000081482c84, 0x000000000fba1002 }, -+ /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ -+ { 0x00000000e77307c2, 0x00000000bdb9bd72 }, -+ /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ -+ { 0x00000000d4a07ec8, 0x0000000075d3bf5a }, -+ /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ -+ { 0x0000000017102100, 0x00000000ef1f98a0 }, -+ /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ -+ { 0x00000000db406486, 0x00000000689c7602 }, -+ /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ -+ { 0x0000000192db7f88, 0x000000016d5fa5fe }, -+ /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ -+ { 0x000000018bf67b1e, 0x00000001d0d2b9ca }, -+ /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ -+ { 0x000000007c09163e, 0x0000000041e7b470 }, -+ /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ -+ { 0x000000000adac060, 0x00000001cbb6495e }, -+ /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ -+ { 0x00000000bd8316ae, 0x000000010052a0b0 }, -+ /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ -+ { 0x000000019f09ab54, 0x00000001d8effb5c }, -+ /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ -+ { 0x0000000125155542, 0x00000001d969853c }, -+ /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ -+ { 0x000000018fdb5882, 0x00000000523ccce2 }, -+ /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ -+ { 0x00000000e794b3f4, 0x000000001e2436bc }, -+ /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ -+ { 0x000000016f9bb022, 0x00000000ddd1c3a2 }, -+ /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ -+ { 0x00000000290c9978, 0x0000000019fcfe38 }, -+ /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ -+ { 0x0000000083c0f350, 0x00000001ce95db64 }, -+ /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ -+ { 0x0000000173ea6628, 0x00000000af582806 }, -+ /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ -+ { 0x00000001c8b4e00a, 0x00000001006388f6 }, -+ /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ -+ { 0x00000000de95d6aa, 0x0000000179eca00a }, -+ /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ -+ { 0x000000010b7f7248, 0x0000000122410a6a }, -+ /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ -+ { 0x00000001326e3a06, 0x000000004288e87c }, -+ /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ -+ { 0x00000000bb62c2e6, 0x000000016c5490da }, -+ /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ -+ { 0x0000000156a4b2c2, 0x00000000d1c71f6e }, -+ /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ -+ { 0x000000011dfe763a, 0x00000001b4ce08a6 }, -+ /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ -+ { 0x000000007bcca8e2, 0x00000001466ba60c }, -+ /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ -+ { 0x0000000186118faa, 0x00000001f6c488a4 }, -+ /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ -+ { 0x0000000111a65a88, 0x000000013bfb0682 }, -+ /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ -+ { 0x000000003565e1c4, 0x00000000690e9e54 }, -+ /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ -+ { 0x000000012ed02a82, 0x00000000281346b6 }, -+ /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ -+ { 0x00000000c486ecfc, 0x0000000156464024 }, -+ /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ -+ { 0x0000000001b951b2, 0x000000016063a8dc }, -+ /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ -+ { 0x0000000048143916, 0x0000000116a66362 }, -+ /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ -+ { 0x00000001dc2ae124, 0x000000017e8aa4d2 }, -+ /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ -+ { 0x00000001416c58d6, 0x00000001728eb10c }, -+ /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ -+ { 0x00000000a479744a, 0x00000001b08fd7fa }, -+ /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ -+ { 0x0000000096ca3a26, 0x00000001092a16e8 }, -+ /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ -+ { 0x00000000ff223d4e, 0x00000000a505637c }, -+ /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ -+ { 0x000000010e84da42, 0x00000000d94869b2 }, -+ /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ -+ { 0x00000001b61ba3d0, 0x00000001c8b203ae }, -+ /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ -+ { 0x00000000680f2de8, 0x000000005704aea0 }, -+ /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ -+ { 0x000000008772a9a8, 0x000000012e295fa2 }, -+ /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ -+ { 0x0000000155f295bc, 0x000000011d0908bc }, -+ /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ -+ { 0x00000000595f9282, 0x0000000193ed97ea }, -+ /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ -+ { 0x0000000164b1c25a, 0x000000013a0f1c52 }, -+ /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ -+ { 0x00000000fbd67c50, 0x000000010c2c40c0 }, -+ /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ -+ { 0x0000000096076268, 0x00000000ff6fac3e }, -+ /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ -+ { 0x00000001d288e4cc, 0x000000017b3609c0 }, -+ /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ -+ { 0x00000001eaac1bdc, 0x0000000088c8c922 }, -+ /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ -+ { 0x00000001f1ea39e2, 0x00000001751baae6 }, -+ /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ -+ { 0x00000001eb6506fc, 0x0000000107952972 }, -+ /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ -+ { 0x000000010f806ffe, 0x0000000162b00abe }, -+ /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ -+ { 0x000000010408481e, 0x000000000d7b404c }, -+ /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ -+ { 0x0000000188260534, 0x00000000763b13d4 }, -+ /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ -+ { 0x0000000058fc73e0, 0x00000000f6dc22d8 }, -+ /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ -+ { 0x00000000391c59b8, 0x000000007daae060 }, -+ /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ -+ { 0x000000018b638400, 0x000000013359ab7c }, -+ /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ -+ { 0x000000011738f5c4, 0x000000008add438a }, -+ /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ -+ { 0x000000008cf7c6da, 0x00000001edbefdea }, -+ /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ -+ { 0x00000001ef97fb16, 0x000000004104e0f8 }, -+ /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ -+ { 0x0000000102130e20, 0x00000000b48a8222 }, -+ /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ -+ { 0x00000000db968898, 0x00000001bcb46844 }, -+ /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ -+ { 0x00000000b5047b5e, 0x000000013293ce0a }, -+ /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ -+ { 0x000000010b90fdb2, 0x00000001710d0844 }, -+ /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ -+ { 0x000000004834a32e, 0x0000000117907f6e }, -+ /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ -+ { 0x0000000059c8f2b0, 0x0000000087ddf93e }, -+ /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ -+ { 0x0000000122cec508, 0x000000005970e9b0 }, -+ /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ -+ { 0x000000000a330cda, 0x0000000185b2b7d0 }, -+ /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ -+ { 0x000000014a47148c, 0x00000001dcee0efc }, -+ /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ -+ { 0x0000000042c61cb8, 0x0000000030da2722 }, -+ /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ -+ { 0x0000000012fe6960, 0x000000012f925a18 }, -+ /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ -+ { 0x00000000dbda2c20, 0x00000000dd2e357c }, -+ /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ -+ { 0x000000011122410c, 0x00000000071c80de }, -+ /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ -+ { 0x00000000977b2070, 0x000000011513140a }, -+ /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ -+ { 0x000000014050438e, 0x00000001df876e8e }, -+ /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ -+ { 0x0000000147c840e8, 0x000000015f81d6ce }, -+ /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ -+ { 0x00000001cc7c88ce, 0x000000019dd94dbe }, -+ /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ -+ { 0x00000001476b35a4, 0x00000001373d206e }, -+ /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ -+ { 0x000000013d52d508, 0x00000000668ccade }, -+ /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ -+ { 0x000000008e4be32e, 0x00000001b192d268 }, -+ /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ -+ { 0x00000000024120fe, 0x00000000e30f3a78 }, -+ /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ -+ { 0x00000000ddecddb4, 0x000000010ef1f7bc }, -+ /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ -+ { 0x00000000d4d403bc, 0x00000001f5ac7380 }, -+ /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ -+ { 0x00000001734b89aa, 0x000000011822ea70 }, -+ /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ -+ { 0x000000010e7a58d6, 0x00000000c3a33848 }, -+ /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ -+ { 0x00000001f9f04e9c, 0x00000001bd151c24 }, -+ /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ -+ { 0x00000000b692225e, 0x0000000056002d76 }, -+ /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ -+ { 0x000000019b8d3f3e, 0x000000014657c4f4 }, -+ /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ -+ { 0x00000001a874f11e, 0x0000000113742d7c }, -+ /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ -+ { 0x000000010d5a4254, 0x000000019c5920ba }, -+ /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ -+ { 0x00000000bbb2f5d6, 0x000000005216d2d6 }, -+ /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ -+ { 0x0000000179cc0e36, 0x0000000136f5ad8a }, -+ /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ -+ { 0x00000001dca1da4a, 0x000000018b07beb6 }, -+ /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ -+ { 0x00000000feb1a192, 0x00000000db1e93b0 }, -+ /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ -+ { 0x00000000d1eeedd6, 0x000000000b96fa3a }, -+ /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ -+ { 0x000000008fad9bb4, 0x00000001d9968af0 }, -+ /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ -+ { 0x00000001884938e4, 0x000000000e4a77a2 }, -+ /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ -+ { 0x00000001bc2e9bc0, 0x00000000508c2ac8 }, -+ /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ -+ { 0x00000001f9658a68, 0x0000000021572a80 }, -+ /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ -+ { 0x000000001b9224fc, 0x00000001b859daf2 }, -+ /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ -+ { 0x0000000055b2fb84, 0x000000016f788474 }, -+ /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ -+ { 0x000000018b090348, 0x00000001b438810e }, -+ /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ -+ { 0x000000011ccbd5ea, 0x0000000095ddc6f2 }, -+ /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ -+ { 0x0000000007ae47f8, 0x00000001d977c20c }, -+ /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ -+ { 0x0000000172acbec0, 0x00000000ebedb99a }, -+ /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ -+ { 0x00000001c6e3ff20, 0x00000001df9e9e92 }, -+ /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ -+ { 0x00000000e1b38744, 0x00000001a4a3f952 }, -+ /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ -+ { 0x00000000791585b2, 0x00000000e2f51220 }, -+ /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ -+ { 0x00000000ac53b894, 0x000000004aa01f3e }, -+ /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ -+ { 0x00000001ed5f2cf4, 0x00000000b3e90a58 }, -+ /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ -+ { 0x00000001df48b2e0, 0x000000000c9ca2aa }, -+ /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ -+ { 0x00000000049c1c62, 0x0000000151682316 }, -+ /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ -+ { 0x000000017c460c12, 0x0000000036fce78c }, -+ /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ -+ { 0x000000015be4da7e, 0x000000009037dc10 }, -+ /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ -+ { 0x000000010f38f668, 0x00000000d3298582 }, -+ /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ -+ { 0x0000000039f40a00, 0x00000001b42e8ad6 }, -+ /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ -+ { 0x00000000bd4c10c4, 0x00000000142a9838 }, -+ /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ -+ { 0x0000000042db1d98, 0x0000000109c7f190 }, -+ /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ -+ { 0x00000001c905bae6, 0x0000000056ff9310 }, -+ /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ -+ { 0x00000000069d40ea, 0x00000001594513aa }, -+ /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ -+ { 0x000000008e4fbad0, 0x00000001e3b5b1e8 }, -+ /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ -+ { 0x0000000047bedd46, 0x000000011dd5fc08 }, -+ /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ -+ { 0x0000000026396bf8, 0x00000001675f0cc2 }, -+ /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ -+ { 0x00000000379beb92, 0x00000000d1c8dd44 }, -+ /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ -+ { 0x000000000abae54a, 0x0000000115ebd3d8 }, -+ /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ -+ { 0x0000000007e6a128, 0x00000001ecbd0dac }, -+ /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ -+ { 0x000000000ade29d2, 0x00000000cdf67af2 }, -+ /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ -+ { 0x00000000f974c45c, 0x000000004c01ff4c }, -+ /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ -+ { 0x00000000e77ac60a, 0x00000000f2d8657e }, -+ /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ -+ { 0x0000000145895816, 0x000000006bae74c4 }, -+ /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ -+ { 0x0000000038e362be, 0x0000000152af8aa0 }, -+ /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ -+ { 0x000000007f991a64, 0x0000000004663802 }, -+ /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ -+ { 0x00000000fa366d3a, 0x00000001ab2f5afc }, -+ /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ -+ { 0x00000001a2bb34f0, 0x0000000074a4ebd4 }, -+ /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ -+ { 0x0000000028a9981e, 0x00000001d7ab3a4c }, -+ /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ -+ { 0x00000001dbc672be, 0x00000001a8da60c6 }, -+ /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ -+ { 0x00000000b04d77f6, 0x000000013cf63820 }, -+ /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ -+ { 0x0000000124400d96, 0x00000000bec12e1e }, -+ /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ -+ { 0x000000014ca4b414, 0x00000001c6368010 }, -+ /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ -+ { 0x000000012fe2c938, 0x00000001e6e78758 }, -+ /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ -+ { 0x00000001faed01e6, 0x000000008d7f2b3c }, -+ /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ -+ { 0x000000007e80ecfe, 0x000000016b4a156e }, -+ /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ -+ { 0x0000000098daee94, 0x00000001c63cfeb6 }, -+ /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ -+ { 0x000000010a04edea, 0x000000015f902670 }, -+ /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ -+ { 0x00000001c00b4524, 0x00000001cd5de11e }, -+ /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ -+ { 0x0000000170296550, 0x000000001acaec54 }, -+ /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ -+ { 0x0000000181afaa48, 0x000000002bd0ca78 }, -+ /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ -+ { 0x0000000185a31ffa, 0x0000000032d63d5c }, -+ /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ -+ { 0x000000002469f608, 0x000000001c6d4e4c }, -+ /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ -+ { 0x000000006980102a, 0x0000000106a60b92 }, -+ /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ -+ { 0x0000000111ea9ca8, 0x00000000d3855e12 }, -+ /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ -+ { 0x00000001bd1d29ce, 0x00000000e3125636 }, -+ /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ -+ { 0x00000001b34b9580, 0x000000009e8f7ea4 }, -+ /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ -+ { 0x000000003076054e, 0x00000001c82e562c }, -+ /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ -+ { 0x000000012a608ea4, 0x00000000ca9f09ce }, -+ /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ -+ { 0x00000000784d05fe, 0x00000000c63764e6 }, -+ /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ -+ { 0x000000016ef0d82a, 0x0000000168d2e49e }, -+ /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ -+ { 0x0000000075bda454, 0x00000000e986c148 }, -+ /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ -+ { 0x000000003dc0a1c4, 0x00000000cfb65894 }, -+ /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ -+ { 0x00000000e9a5d8be, 0x0000000111cadee4 }, -+ /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ -+ { 0x00000001609bc4b4, 0x0000000171fb63ce } -+#else /* __LITTLE_ENDIAN__ */ -+ /* x^261120 mod p(x)` << 1, x^261184 mod p(x)` << 1 */ -+ { 0x00000000b6ca9e20, 0x000000009c37c408 }, -+ /* x^260096 mod p(x)` << 1, x^260160 mod p(x)` << 1 */ -+ { 0x00000000350249a8, 0x00000001b51df26c }, -+ /* x^259072 mod p(x)` << 1, x^259136 mod p(x)` << 1 */ -+ { 0x00000001862dac54, 0x000000000724b9d0 }, -+ /* x^258048 mod p(x)` << 1, x^258112 mod p(x)` << 1 */ -+ { 0x00000001d87fb48c, 0x00000001c00532fe }, -+ /* x^257024 mod p(x)` << 1, x^257088 mod p(x)` << 1 */ -+ { 0x00000001f39b699e, 0x00000000f05a9362 }, -+ /* x^256000 mod p(x)` << 1, x^256064 mod p(x)` << 1 */ -+ { 0x0000000101da11b4, 0x00000001e1007970 }, -+ /* x^254976 mod p(x)` << 1, x^255040 mod p(x)` << 1 */ -+ { 0x00000001cab571e0, 0x00000000a57366ee }, -+ /* x^253952 mod p(x)` << 1, x^254016 mod p(x)` << 1 */ -+ { 0x00000000c7020cfe, 0x0000000192011284 }, -+ /* x^252928 mod p(x)` << 1, x^252992 mod p(x)` << 1 */ -+ { 0x00000000cdaed1ae, 0x0000000162716d9a }, -+ /* x^251904 mod p(x)` << 1, x^251968 mod p(x)` << 1 */ -+ { 0x00000001e804effc, 0x00000000cd97ecde }, -+ /* x^250880 mod p(x)` << 1, x^250944 mod p(x)` << 1 */ -+ { 0x0000000077c3ea3a, 0x0000000058812bc0 }, -+ /* x^249856 mod p(x)` << 1, x^249920 mod p(x)` << 1 */ -+ { 0x0000000068df31b4, 0x0000000088b8c12e }, -+ /* x^248832 mod p(x)` << 1, x^248896 mod p(x)` << 1 */ -+ { 0x00000000b059b6c2, 0x00000001230b234c }, -+ /* x^247808 mod p(x)` << 1, x^247872 mod p(x)` << 1 */ -+ { 0x0000000145fb8ed8, 0x00000001120b416e }, -+ /* x^246784 mod p(x)` << 1, x^246848 mod p(x)` << 1 */ -+ { 0x00000000cbc09168, 0x00000001974aecb0 }, -+ /* x^245760 mod p(x)` << 1, x^245824 mod p(x)` << 1 */ -+ { 0x000000005ceeedc2, 0x000000008ee3f226 }, -+ /* x^244736 mod p(x)` << 1, x^244800 mod p(x)` << 1 */ -+ { 0x0000000047d74e86, 0x00000001089aba9a }, -+ /* x^243712 mod p(x)` << 1, x^243776 mod p(x)` << 1 */ -+ { 0x00000001407e9e22, 0x0000000065113872 }, -+ /* x^242688 mod p(x)` << 1, x^242752 mod p(x)` << 1 */ -+ { 0x00000001da967bda, 0x000000005c07ec10 }, -+ /* x^241664 mod p(x)` << 1, x^241728 mod p(x)` << 1 */ -+ { 0x000000006c898368, 0x0000000187590924 }, -+ /* x^240640 mod p(x)` << 1, x^240704 mod p(x)` << 1 */ -+ { 0x00000000f2d14c98, 0x00000000e35da7c6 }, -+ /* x^239616 mod p(x)` << 1, x^239680 mod p(x)` << 1 */ -+ { 0x00000001993c6ad4, 0x000000000415855a }, -+ /* x^238592 mod p(x)` << 1, x^238656 mod p(x)` << 1 */ -+ { 0x000000014683d1ac, 0x0000000073617758 }, -+ /* x^237568 mod p(x)` << 1, x^237632 mod p(x)` << 1 */ -+ { 0x00000001a7c93e6c, 0x0000000176021d28 }, -+ /* x^236544 mod p(x)` << 1, x^236608 mod p(x)` << 1 */ -+ { 0x000000010211e90a, 0x00000001c358fd0a }, -+ /* x^235520 mod p(x)` << 1, x^235584 mod p(x)` << 1 */ -+ { 0x000000001119403e, 0x00000001ff7a2c18 }, -+ /* x^234496 mod p(x)` << 1, x^234560 mod p(x)` << 1 */ -+ { 0x000000001c3261aa, 0x00000000f2d9f7e4 }, -+ /* x^233472 mod p(x)` << 1, x^233536 mod p(x)` << 1 */ -+ { 0x000000014e37a634, 0x000000016cf1f9c8 }, -+ /* x^232448 mod p(x)` << 1, x^232512 mod p(x)` << 1 */ -+ { 0x0000000073786c0c, 0x000000010af9279a }, -+ /* x^231424 mod p(x)` << 1, x^231488 mod p(x)` << 1 */ -+ { 0x000000011dc037f8, 0x0000000004f101e8 }, -+ /* x^230400 mod p(x)` << 1, x^230464 mod p(x)` << 1 */ -+ { 0x0000000031433dfc, 0x0000000070bcf184 }, -+ /* x^229376 mod p(x)` << 1, x^229440 mod p(x)` << 1 */ -+ { 0x000000009cde8348, 0x000000000a8de642 }, -+ /* x^228352 mod p(x)` << 1, x^228416 mod p(x)` << 1 */ -+ { 0x0000000038d3c2a6, 0x0000000062ea130c }, -+ /* x^227328 mod p(x)` << 1, x^227392 mod p(x)` << 1 */ -+ { 0x000000011b25f260, 0x00000001eb31cbb2 }, -+ /* x^226304 mod p(x)` << 1, x^226368 mod p(x)` << 1 */ -+ { 0x000000001629e6f0, 0x0000000170783448 }, -+ /* x^225280 mod p(x)` << 1, x^225344 mod p(x)` << 1 */ -+ { 0x0000000160838b4c, 0x00000001a684b4c6 }, -+ /* x^224256 mod p(x)` << 1, x^224320 mod p(x)` << 1 */ -+ { 0x000000007a44011c, 0x00000000253ca5b4 }, -+ /* x^223232 mod p(x)` << 1, x^223296 mod p(x)` << 1 */ -+ { 0x00000000226f417a, 0x0000000057b4b1e2 }, -+ /* x^222208 mod p(x)` << 1, x^222272 mod p(x)` << 1 */ -+ { 0x0000000045eb2eb4, 0x00000000b6bd084c }, -+ /* x^221184 mod p(x)` << 1, x^221248 mod p(x)` << 1 */ -+ { 0x000000014459d70c, 0x0000000123c2d592 }, -+ /* x^220160 mod p(x)` << 1, x^220224 mod p(x)` << 1 */ -+ { 0x00000001d406ed82, 0x00000000159dafce }, -+ /* x^219136 mod p(x)` << 1, x^219200 mod p(x)` << 1 */ -+ { 0x0000000160c8e1a8, 0x0000000127e1a64e }, -+ /* x^218112 mod p(x)` << 1, x^218176 mod p(x)` << 1 */ -+ { 0x0000000027ba8098, 0x0000000056860754 }, -+ /* x^217088 mod p(x)` << 1, x^217152 mod p(x)` << 1 */ -+ { 0x000000006d92d018, 0x00000001e661aae8 }, -+ /* x^216064 mod p(x)` << 1, x^216128 mod p(x)` << 1 */ -+ { 0x000000012ed7e3f2, 0x00000000f82c6166 }, -+ /* x^215040 mod p(x)` << 1, x^215104 mod p(x)` << 1 */ -+ { 0x000000002dc87788, 0x00000000c4f9c7ae }, -+ /* x^214016 mod p(x)` << 1, x^214080 mod p(x)` << 1 */ -+ { 0x0000000018240bb8, 0x0000000074203d20 }, -+ /* x^212992 mod p(x)` << 1, x^213056 mod p(x)` << 1 */ -+ { 0x000000001ad38158, 0x0000000198173052 }, -+ /* x^211968 mod p(x)` << 1, x^212032 mod p(x)` << 1 */ -+ { 0x00000001396b78f2, 0x00000001ce8aba54 }, -+ /* x^210944 mod p(x)` << 1, x^211008 mod p(x)` << 1 */ -+ { 0x000000011a681334, 0x00000001850d5d94 }, -+ /* x^209920 mod p(x)` << 1, x^209984 mod p(x)` << 1 */ -+ { 0x000000012104732e, 0x00000001d609239c }, -+ /* x^208896 mod p(x)` << 1, x^208960 mod p(x)` << 1 */ -+ { 0x00000000a140d90c, 0x000000001595f048 }, -+ /* x^207872 mod p(x)` << 1, x^207936 mod p(x)` << 1 */ -+ { 0x00000001b7215eda, 0x0000000042ccee08 }, -+ /* x^206848 mod p(x)` << 1, x^206912 mod p(x)` << 1 */ -+ { 0x00000001aaf1df3c, 0x000000010a389d74 }, -+ /* x^205824 mod p(x)` << 1, x^205888 mod p(x)` << 1 */ -+ { 0x0000000029d15b8a, 0x000000012a840da6 }, -+ /* x^204800 mod p(x)` << 1, x^204864 mod p(x)` << 1 */ -+ { 0x00000000f1a96922, 0x000000001d181c0c }, -+ /* x^203776 mod p(x)` << 1, x^203840 mod p(x)` << 1 */ -+ { 0x00000001ac80d03c, 0x0000000068b7d1f6 }, -+ /* x^202752 mod p(x)` << 1, x^202816 mod p(x)` << 1 */ -+ { 0x000000000f11d56a, 0x000000005b0f14fc }, -+ /* x^201728 mod p(x)` << 1, x^201792 mod p(x)` << 1 */ -+ { 0x00000001f1c022a2, 0x0000000179e9e730 }, -+ /* x^200704 mod p(x)` << 1, x^200768 mod p(x)` << 1 */ -+ { 0x0000000173d00ae2, 0x00000001ce1368d6 }, -+ /* x^199680 mod p(x)` << 1, x^199744 mod p(x)` << 1 */ -+ { 0x00000001d4ffe4ac, 0x0000000112c3a84c }, -+ /* x^198656 mod p(x)` << 1, x^198720 mod p(x)` << 1 */ -+ { 0x000000016edc5ae4, 0x00000000de940fee }, -+ /* x^197632 mod p(x)` << 1, x^197696 mod p(x)` << 1 */ -+ { 0x00000001f1a02140, 0x00000000fe896b7e }, -+ /* x^196608 mod p(x)` << 1, x^196672 mod p(x)` << 1 */ -+ { 0x00000000ca0b28a0, 0x00000001f797431c }, -+ /* x^195584 mod p(x)` << 1, x^195648 mod p(x)` << 1 */ -+ { 0x00000001928e30a2, 0x0000000053e989ba }, -+ /* x^194560 mod p(x)` << 1, x^194624 mod p(x)` << 1 */ -+ { 0x0000000097b1b002, 0x000000003920cd16 }, -+ /* x^193536 mod p(x)` << 1, x^193600 mod p(x)` << 1 */ -+ { 0x00000000b15bf906, 0x00000001e6f579b8 }, -+ /* x^192512 mod p(x)` << 1, x^192576 mod p(x)` << 1 */ -+ { 0x00000000411c5d52, 0x000000007493cb0a }, -+ /* x^191488 mod p(x)` << 1, x^191552 mod p(x)` << 1 */ -+ { 0x00000001c36f3300, 0x00000001bdd376d8 }, -+ /* x^190464 mod p(x)` << 1, x^190528 mod p(x)` << 1 */ -+ { 0x00000001119227e0, 0x000000016badfee6 }, -+ /* x^189440 mod p(x)` << 1, x^189504 mod p(x)` << 1 */ -+ { 0x00000000114d4702, 0x0000000071de5c58 }, -+ /* x^188416 mod p(x)` << 1, x^188480 mod p(x)` << 1 */ -+ { 0x00000000458b5b98, 0x00000000453f317c }, -+ /* x^187392 mod p(x)` << 1, x^187456 mod p(x)` << 1 */ -+ { 0x000000012e31fb8e, 0x0000000121675cce }, -+ /* x^186368 mod p(x)` << 1, x^186432 mod p(x)` << 1 */ -+ { 0x000000005cf619d8, 0x00000001f409ee92 }, -+ /* x^185344 mod p(x)` << 1, x^185408 mod p(x)` << 1 */ -+ { 0x0000000063f4d8b2, 0x00000000f36b9c88 }, -+ /* x^184320 mod p(x)` << 1, x^184384 mod p(x)` << 1 */ -+ { 0x000000004138dc8a, 0x0000000036b398f4 }, -+ /* x^183296 mod p(x)` << 1, x^183360 mod p(x)` << 1 */ -+ { 0x00000001d29ee8e0, 0x00000001748f9adc }, -+ /* x^182272 mod p(x)` << 1, x^182336 mod p(x)` << 1 */ -+ { 0x000000006a08ace8, 0x00000001be94ec00 }, -+ /* x^181248 mod p(x)` << 1, x^181312 mod p(x)` << 1 */ -+ { 0x0000000127d42010, 0x00000000b74370d6 }, -+ /* x^180224 mod p(x)` << 1, x^180288 mod p(x)` << 1 */ -+ { 0x0000000019d76b62, 0x00000001174d0b98 }, -+ /* x^179200 mod p(x)` << 1, x^179264 mod p(x)` << 1 */ -+ { 0x00000001b1471f6e, 0x00000000befc06a4 }, -+ /* x^178176 mod p(x)` << 1, x^178240 mod p(x)` << 1 */ -+ { 0x00000001f64c19cc, 0x00000001ae125288 }, -+ /* x^177152 mod p(x)` << 1, x^177216 mod p(x)` << 1 */ -+ { 0x00000000003c0ea0, 0x0000000095c19b34 }, -+ /* x^176128 mod p(x)` << 1, x^176192 mod p(x)` << 1 */ -+ { 0x000000014d73abf6, 0x00000001a78496f2 }, -+ /* x^175104 mod p(x)` << 1, x^175168 mod p(x)` << 1 */ -+ { 0x00000001620eb844, 0x00000001ac5390a0 }, -+ /* x^174080 mod p(x)` << 1, x^174144 mod p(x)` << 1 */ -+ { 0x0000000147655048, 0x000000002a80ed6e }, -+ /* x^173056 mod p(x)` << 1, x^173120 mod p(x)` << 1 */ -+ { 0x0000000067b5077e, 0x00000001fa9b0128 }, -+ /* x^172032 mod p(x)` << 1, x^172096 mod p(x)` << 1 */ -+ { 0x0000000010ffe206, 0x00000001ea94929e }, -+ /* x^171008 mod p(x)` << 1, x^171072 mod p(x)` << 1 */ -+ { 0x000000000fee8f1e, 0x0000000125f4305c }, -+ /* x^169984 mod p(x)` << 1, x^170048 mod p(x)` << 1 */ -+ { 0x00000001da26fbae, 0x00000001471e2002 }, -+ /* x^168960 mod p(x)` << 1, x^169024 mod p(x)` << 1 */ -+ { 0x00000001b3a8bd88, 0x0000000132d2253a }, -+ /* x^167936 mod p(x)` << 1, x^168000 mod p(x)` << 1 */ -+ { 0x00000000e8f3898e, 0x00000000f26b3592 }, -+ /* x^166912 mod p(x)` << 1, x^166976 mod p(x)` << 1 */ -+ { 0x00000000b0d0d28c, 0x00000000bc8b67b0 }, -+ /* x^165888 mod p(x)` << 1, x^165952 mod p(x)` << 1 */ -+ { 0x0000000030f2a798, 0x000000013a826ef2 }, -+ /* x^164864 mod p(x)` << 1, x^164928 mod p(x)` << 1 */ -+ { 0x000000000fba1002, 0x0000000081482c84 }, -+ /* x^163840 mod p(x)` << 1, x^163904 mod p(x)` << 1 */ -+ { 0x00000000bdb9bd72, 0x00000000e77307c2 }, -+ /* x^162816 mod p(x)` << 1, x^162880 mod p(x)` << 1 */ -+ { 0x0000000075d3bf5a, 0x00000000d4a07ec8 }, -+ /* x^161792 mod p(x)` << 1, x^161856 mod p(x)` << 1 */ -+ { 0x00000000ef1f98a0, 0x0000000017102100 }, -+ /* x^160768 mod p(x)` << 1, x^160832 mod p(x)` << 1 */ -+ { 0x00000000689c7602, 0x00000000db406486 }, -+ /* x^159744 mod p(x)` << 1, x^159808 mod p(x)` << 1 */ -+ { 0x000000016d5fa5fe, 0x0000000192db7f88 }, -+ /* x^158720 mod p(x)` << 1, x^158784 mod p(x)` << 1 */ -+ { 0x00000001d0d2b9ca, 0x000000018bf67b1e }, -+ /* x^157696 mod p(x)` << 1, x^157760 mod p(x)` << 1 */ -+ { 0x0000000041e7b470, 0x000000007c09163e }, -+ /* x^156672 mod p(x)` << 1, x^156736 mod p(x)` << 1 */ -+ { 0x00000001cbb6495e, 0x000000000adac060 }, -+ /* x^155648 mod p(x)` << 1, x^155712 mod p(x)` << 1 */ -+ { 0x000000010052a0b0, 0x00000000bd8316ae }, -+ /* x^154624 mod p(x)` << 1, x^154688 mod p(x)` << 1 */ -+ { 0x00000001d8effb5c, 0x000000019f09ab54 }, -+ /* x^153600 mod p(x)` << 1, x^153664 mod p(x)` << 1 */ -+ { 0x00000001d969853c, 0x0000000125155542 }, -+ /* x^152576 mod p(x)` << 1, x^152640 mod p(x)` << 1 */ -+ { 0x00000000523ccce2, 0x000000018fdb5882 }, -+ /* x^151552 mod p(x)` << 1, x^151616 mod p(x)` << 1 */ -+ { 0x000000001e2436bc, 0x00000000e794b3f4 }, -+ /* x^150528 mod p(x)` << 1, x^150592 mod p(x)` << 1 */ -+ { 0x00000000ddd1c3a2, 0x000000016f9bb022 }, -+ /* x^149504 mod p(x)` << 1, x^149568 mod p(x)` << 1 */ -+ { 0x0000000019fcfe38, 0x00000000290c9978 }, -+ /* x^148480 mod p(x)` << 1, x^148544 mod p(x)` << 1 */ -+ { 0x00000001ce95db64, 0x0000000083c0f350 }, -+ /* x^147456 mod p(x)` << 1, x^147520 mod p(x)` << 1 */ -+ { 0x00000000af582806, 0x0000000173ea6628 }, -+ /* x^146432 mod p(x)` << 1, x^146496 mod p(x)` << 1 */ -+ { 0x00000001006388f6, 0x00000001c8b4e00a }, -+ /* x^145408 mod p(x)` << 1, x^145472 mod p(x)` << 1 */ -+ { 0x0000000179eca00a, 0x00000000de95d6aa }, -+ /* x^144384 mod p(x)` << 1, x^144448 mod p(x)` << 1 */ -+ { 0x0000000122410a6a, 0x000000010b7f7248 }, -+ /* x^143360 mod p(x)` << 1, x^143424 mod p(x)` << 1 */ -+ { 0x000000004288e87c, 0x00000001326e3a06 }, -+ /* x^142336 mod p(x)` << 1, x^142400 mod p(x)` << 1 */ -+ { 0x000000016c5490da, 0x00000000bb62c2e6 }, -+ /* x^141312 mod p(x)` << 1, x^141376 mod p(x)` << 1 */ -+ { 0x00000000d1c71f6e, 0x0000000156a4b2c2 }, -+ /* x^140288 mod p(x)` << 1, x^140352 mod p(x)` << 1 */ -+ { 0x00000001b4ce08a6, 0x000000011dfe763a }, -+ /* x^139264 mod p(x)` << 1, x^139328 mod p(x)` << 1 */ -+ { 0x00000001466ba60c, 0x000000007bcca8e2 }, -+ /* x^138240 mod p(x)` << 1, x^138304 mod p(x)` << 1 */ -+ { 0x00000001f6c488a4, 0x0000000186118faa }, -+ /* x^137216 mod p(x)` << 1, x^137280 mod p(x)` << 1 */ -+ { 0x000000013bfb0682, 0x0000000111a65a88 }, -+ /* x^136192 mod p(x)` << 1, x^136256 mod p(x)` << 1 */ -+ { 0x00000000690e9e54, 0x000000003565e1c4 }, -+ /* x^135168 mod p(x)` << 1, x^135232 mod p(x)` << 1 */ -+ { 0x00000000281346b6, 0x000000012ed02a82 }, -+ /* x^134144 mod p(x)` << 1, x^134208 mod p(x)` << 1 */ -+ { 0x0000000156464024, 0x00000000c486ecfc }, -+ /* x^133120 mod p(x)` << 1, x^133184 mod p(x)` << 1 */ -+ { 0x000000016063a8dc, 0x0000000001b951b2 }, -+ /* x^132096 mod p(x)` << 1, x^132160 mod p(x)` << 1 */ -+ { 0x0000000116a66362, 0x0000000048143916 }, -+ /* x^131072 mod p(x)` << 1, x^131136 mod p(x)` << 1 */ -+ { 0x000000017e8aa4d2, 0x00000001dc2ae124 }, -+ /* x^130048 mod p(x)` << 1, x^130112 mod p(x)` << 1 */ -+ { 0x00000001728eb10c, 0x00000001416c58d6 }, -+ /* x^129024 mod p(x)` << 1, x^129088 mod p(x)` << 1 */ -+ { 0x00000001b08fd7fa, 0x00000000a479744a }, -+ /* x^128000 mod p(x)` << 1, x^128064 mod p(x)` << 1 */ -+ { 0x00000001092a16e8, 0x0000000096ca3a26 }, -+ /* x^126976 mod p(x)` << 1, x^127040 mod p(x)` << 1 */ -+ { 0x00000000a505637c, 0x00000000ff223d4e }, -+ /* x^125952 mod p(x)` << 1, x^126016 mod p(x)` << 1 */ -+ { 0x00000000d94869b2, 0x000000010e84da42 }, -+ /* x^124928 mod p(x)` << 1, x^124992 mod p(x)` << 1 */ -+ { 0x00000001c8b203ae, 0x00000001b61ba3d0 }, -+ /* x^123904 mod p(x)` << 1, x^123968 mod p(x)` << 1 */ -+ { 0x000000005704aea0, 0x00000000680f2de8 }, -+ /* x^122880 mod p(x)` << 1, x^122944 mod p(x)` << 1 */ -+ { 0x000000012e295fa2, 0x000000008772a9a8 }, -+ /* x^121856 mod p(x)` << 1, x^121920 mod p(x)` << 1 */ -+ { 0x000000011d0908bc, 0x0000000155f295bc }, -+ /* x^120832 mod p(x)` << 1, x^120896 mod p(x)` << 1 */ -+ { 0x0000000193ed97ea, 0x00000000595f9282 }, -+ /* x^119808 mod p(x)` << 1, x^119872 mod p(x)` << 1 */ -+ { 0x000000013a0f1c52, 0x0000000164b1c25a }, -+ /* x^118784 mod p(x)` << 1, x^118848 mod p(x)` << 1 */ -+ { 0x000000010c2c40c0, 0x00000000fbd67c50 }, -+ /* x^117760 mod p(x)` << 1, x^117824 mod p(x)` << 1 */ -+ { 0x00000000ff6fac3e, 0x0000000096076268 }, -+ /* x^116736 mod p(x)` << 1, x^116800 mod p(x)` << 1 */ -+ { 0x000000017b3609c0, 0x00000001d288e4cc }, -+ /* x^115712 mod p(x)` << 1, x^115776 mod p(x)` << 1 */ -+ { 0x0000000088c8c922, 0x00000001eaac1bdc }, -+ /* x^114688 mod p(x)` << 1, x^114752 mod p(x)` << 1 */ -+ { 0x00000001751baae6, 0x00000001f1ea39e2 }, -+ /* x^113664 mod p(x)` << 1, x^113728 mod p(x)` << 1 */ -+ { 0x0000000107952972, 0x00000001eb6506fc }, -+ /* x^112640 mod p(x)` << 1, x^112704 mod p(x)` << 1 */ -+ { 0x0000000162b00abe, 0x000000010f806ffe }, -+ /* x^111616 mod p(x)` << 1, x^111680 mod p(x)` << 1 */ -+ { 0x000000000d7b404c, 0x000000010408481e }, -+ /* x^110592 mod p(x)` << 1, x^110656 mod p(x)` << 1 */ -+ { 0x00000000763b13d4, 0x0000000188260534 }, -+ /* x^109568 mod p(x)` << 1, x^109632 mod p(x)` << 1 */ -+ { 0x00000000f6dc22d8, 0x0000000058fc73e0 }, -+ /* x^108544 mod p(x)` << 1, x^108608 mod p(x)` << 1 */ -+ { 0x000000007daae060, 0x00000000391c59b8 }, -+ /* x^107520 mod p(x)` << 1, x^107584 mod p(x)` << 1 */ -+ { 0x000000013359ab7c, 0x000000018b638400 }, -+ /* x^106496 mod p(x)` << 1, x^106560 mod p(x)` << 1 */ -+ { 0x000000008add438a, 0x000000011738f5c4 }, -+ /* x^105472 mod p(x)` << 1, x^105536 mod p(x)` << 1 */ -+ { 0x00000001edbefdea, 0x000000008cf7c6da }, -+ /* x^104448 mod p(x)` << 1, x^104512 mod p(x)` << 1 */ -+ { 0x000000004104e0f8, 0x00000001ef97fb16 }, -+ /* x^103424 mod p(x)` << 1, x^103488 mod p(x)` << 1 */ -+ { 0x00000000b48a8222, 0x0000000102130e20 }, -+ /* x^102400 mod p(x)` << 1, x^102464 mod p(x)` << 1 */ -+ { 0x00000001bcb46844, 0x00000000db968898 }, -+ /* x^101376 mod p(x)` << 1, x^101440 mod p(x)` << 1 */ -+ { 0x000000013293ce0a, 0x00000000b5047b5e }, -+ /* x^100352 mod p(x)` << 1, x^100416 mod p(x)` << 1 */ -+ { 0x00000001710d0844, 0x000000010b90fdb2 }, -+ /* x^99328 mod p(x)` << 1, x^99392 mod p(x)` << 1 */ -+ { 0x0000000117907f6e, 0x000000004834a32e }, -+ /* x^98304 mod p(x)` << 1, x^98368 mod p(x)` << 1 */ -+ { 0x0000000087ddf93e, 0x0000000059c8f2b0 }, -+ /* x^97280 mod p(x)` << 1, x^97344 mod p(x)` << 1 */ -+ { 0x000000005970e9b0, 0x0000000122cec508 }, -+ /* x^96256 mod p(x)` << 1, x^96320 mod p(x)` << 1 */ -+ { 0x0000000185b2b7d0, 0x000000000a330cda }, -+ /* x^95232 mod p(x)` << 1, x^95296 mod p(x)` << 1 */ -+ { 0x00000001dcee0efc, 0x000000014a47148c }, -+ /* x^94208 mod p(x)` << 1, x^94272 mod p(x)` << 1 */ -+ { 0x0000000030da2722, 0x0000000042c61cb8 }, -+ /* x^93184 mod p(x)` << 1, x^93248 mod p(x)` << 1 */ -+ { 0x000000012f925a18, 0x0000000012fe6960 }, -+ /* x^92160 mod p(x)` << 1, x^92224 mod p(x)` << 1 */ -+ { 0x00000000dd2e357c, 0x00000000dbda2c20 }, -+ /* x^91136 mod p(x)` << 1, x^91200 mod p(x)` << 1 */ -+ { 0x00000000071c80de, 0x000000011122410c }, -+ /* x^90112 mod p(x)` << 1, x^90176 mod p(x)` << 1 */ -+ { 0x000000011513140a, 0x00000000977b2070 }, -+ /* x^89088 mod p(x)` << 1, x^89152 mod p(x)` << 1 */ -+ { 0x00000001df876e8e, 0x000000014050438e }, -+ /* x^88064 mod p(x)` << 1, x^88128 mod p(x)` << 1 */ -+ { 0x000000015f81d6ce, 0x0000000147c840e8 }, -+ /* x^87040 mod p(x)` << 1, x^87104 mod p(x)` << 1 */ -+ { 0x000000019dd94dbe, 0x00000001cc7c88ce }, -+ /* x^86016 mod p(x)` << 1, x^86080 mod p(x)` << 1 */ -+ { 0x00000001373d206e, 0x00000001476b35a4 }, -+ /* x^84992 mod p(x)` << 1, x^85056 mod p(x)` << 1 */ -+ { 0x00000000668ccade, 0x000000013d52d508 }, -+ /* x^83968 mod p(x)` << 1, x^84032 mod p(x)` << 1 */ -+ { 0x00000001b192d268, 0x000000008e4be32e }, -+ /* x^82944 mod p(x)` << 1, x^83008 mod p(x)` << 1 */ -+ { 0x00000000e30f3a78, 0x00000000024120fe }, -+ /* x^81920 mod p(x)` << 1, x^81984 mod p(x)` << 1 */ -+ { 0x000000010ef1f7bc, 0x00000000ddecddb4 }, -+ /* x^80896 mod p(x)` << 1, x^80960 mod p(x)` << 1 */ -+ { 0x00000001f5ac7380, 0x00000000d4d403bc }, -+ /* x^79872 mod p(x)` << 1, x^79936 mod p(x)` << 1 */ -+ { 0x000000011822ea70, 0x00000001734b89aa }, -+ /* x^78848 mod p(x)` << 1, x^78912 mod p(x)` << 1 */ -+ { 0x00000000c3a33848, 0x000000010e7a58d6 }, -+ /* x^77824 mod p(x)` << 1, x^77888 mod p(x)` << 1 */ -+ { 0x00000001bd151c24, 0x00000001f9f04e9c }, -+ /* x^76800 mod p(x)` << 1, x^76864 mod p(x)` << 1 */ -+ { 0x0000000056002d76, 0x00000000b692225e }, -+ /* x^75776 mod p(x)` << 1, x^75840 mod p(x)` << 1 */ -+ { 0x000000014657c4f4, 0x000000019b8d3f3e }, -+ /* x^74752 mod p(x)` << 1, x^74816 mod p(x)` << 1 */ -+ { 0x0000000113742d7c, 0x00000001a874f11e }, -+ /* x^73728 mod p(x)` << 1, x^73792 mod p(x)` << 1 */ -+ { 0x000000019c5920ba, 0x000000010d5a4254 }, -+ /* x^72704 mod p(x)` << 1, x^72768 mod p(x)` << 1 */ -+ { 0x000000005216d2d6, 0x00000000bbb2f5d6 }, -+ /* x^71680 mod p(x)` << 1, x^71744 mod p(x)` << 1 */ -+ { 0x0000000136f5ad8a, 0x0000000179cc0e36 }, -+ /* x^70656 mod p(x)` << 1, x^70720 mod p(x)` << 1 */ -+ { 0x000000018b07beb6, 0x00000001dca1da4a }, -+ /* x^69632 mod p(x)` << 1, x^69696 mod p(x)` << 1 */ -+ { 0x00000000db1e93b0, 0x00000000feb1a192 }, -+ /* x^68608 mod p(x)` << 1, x^68672 mod p(x)` << 1 */ -+ { 0x000000000b96fa3a, 0x00000000d1eeedd6 }, -+ /* x^67584 mod p(x)` << 1, x^67648 mod p(x)` << 1 */ -+ { 0x00000001d9968af0, 0x000000008fad9bb4 }, -+ /* x^66560 mod p(x)` << 1, x^66624 mod p(x)` << 1 */ -+ { 0x000000000e4a77a2, 0x00000001884938e4 }, -+ /* x^65536 mod p(x)` << 1, x^65600 mod p(x)` << 1 */ -+ { 0x00000000508c2ac8, 0x00000001bc2e9bc0 }, -+ /* x^64512 mod p(x)` << 1, x^64576 mod p(x)` << 1 */ -+ { 0x0000000021572a80, 0x00000001f9658a68 }, -+ /* x^63488 mod p(x)` << 1, x^63552 mod p(x)` << 1 */ -+ { 0x00000001b859daf2, 0x000000001b9224fc }, -+ /* x^62464 mod p(x)` << 1, x^62528 mod p(x)` << 1 */ -+ { 0x000000016f788474, 0x0000000055b2fb84 }, -+ /* x^61440 mod p(x)` << 1, x^61504 mod p(x)` << 1 */ -+ { 0x00000001b438810e, 0x000000018b090348 }, -+ /* x^60416 mod p(x)` << 1, x^60480 mod p(x)` << 1 */ -+ { 0x0000000095ddc6f2, 0x000000011ccbd5ea }, -+ /* x^59392 mod p(x)` << 1, x^59456 mod p(x)` << 1 */ -+ { 0x00000001d977c20c, 0x0000000007ae47f8 }, -+ /* x^58368 mod p(x)` << 1, x^58432 mod p(x)` << 1 */ -+ { 0x00000000ebedb99a, 0x0000000172acbec0 }, -+ /* x^57344 mod p(x)` << 1, x^57408 mod p(x)` << 1 */ -+ { 0x00000001df9e9e92, 0x00000001c6e3ff20 }, -+ /* x^56320 mod p(x)` << 1, x^56384 mod p(x)` << 1 */ -+ { 0x00000001a4a3f952, 0x00000000e1b38744 }, -+ /* x^55296 mod p(x)` << 1, x^55360 mod p(x)` << 1 */ -+ { 0x00000000e2f51220, 0x00000000791585b2 }, -+ /* x^54272 mod p(x)` << 1, x^54336 mod p(x)` << 1 */ -+ { 0x000000004aa01f3e, 0x00000000ac53b894 }, -+ /* x^53248 mod p(x)` << 1, x^53312 mod p(x)` << 1 */ -+ { 0x00000000b3e90a58, 0x00000001ed5f2cf4 }, -+ /* x^52224 mod p(x)` << 1, x^52288 mod p(x)` << 1 */ -+ { 0x000000000c9ca2aa, 0x00000001df48b2e0 }, -+ /* x^51200 mod p(x)` << 1, x^51264 mod p(x)` << 1 */ -+ { 0x0000000151682316, 0x00000000049c1c62 }, -+ /* x^50176 mod p(x)` << 1, x^50240 mod p(x)` << 1 */ -+ { 0x0000000036fce78c, 0x000000017c460c12 }, -+ /* x^49152 mod p(x)` << 1, x^49216 mod p(x)` << 1 */ -+ { 0x000000009037dc10, 0x000000015be4da7e }, -+ /* x^48128 mod p(x)` << 1, x^48192 mod p(x)` << 1 */ -+ { 0x00000000d3298582, 0x000000010f38f668 }, -+ /* x^47104 mod p(x)` << 1, x^47168 mod p(x)` << 1 */ -+ { 0x00000001b42e8ad6, 0x0000000039f40a00 }, -+ /* x^46080 mod p(x)` << 1, x^46144 mod p(x)` << 1 */ -+ { 0x00000000142a9838, 0x00000000bd4c10c4 }, -+ /* x^45056 mod p(x)` << 1, x^45120 mod p(x)` << 1 */ -+ { 0x0000000109c7f190, 0x0000000042db1d98 }, -+ /* x^44032 mod p(x)` << 1, x^44096 mod p(x)` << 1 */ -+ { 0x0000000056ff9310, 0x00000001c905bae6 }, -+ /* x^43008 mod p(x)` << 1, x^43072 mod p(x)` << 1 */ -+ { 0x00000001594513aa, 0x00000000069d40ea }, -+ /* x^41984 mod p(x)` << 1, x^42048 mod p(x)` << 1 */ -+ { 0x00000001e3b5b1e8, 0x000000008e4fbad0 }, -+ /* x^40960 mod p(x)` << 1, x^41024 mod p(x)` << 1 */ -+ { 0x000000011dd5fc08, 0x0000000047bedd46 }, -+ /* x^39936 mod p(x)` << 1, x^40000 mod p(x)` << 1 */ -+ { 0x00000001675f0cc2, 0x0000000026396bf8 }, -+ /* x^38912 mod p(x)` << 1, x^38976 mod p(x)` << 1 */ -+ { 0x00000000d1c8dd44, 0x00000000379beb92 }, -+ /* x^37888 mod p(x)` << 1, x^37952 mod p(x)` << 1 */ -+ { 0x0000000115ebd3d8, 0x000000000abae54a }, -+ /* x^36864 mod p(x)` << 1, x^36928 mod p(x)` << 1 */ -+ { 0x00000001ecbd0dac, 0x0000000007e6a128 }, -+ /* x^35840 mod p(x)` << 1, x^35904 mod p(x)` << 1 */ -+ { 0x00000000cdf67af2, 0x000000000ade29d2 }, -+ /* x^34816 mod p(x)` << 1, x^34880 mod p(x)` << 1 */ -+ { 0x000000004c01ff4c, 0x00000000f974c45c }, -+ /* x^33792 mod p(x)` << 1, x^33856 mod p(x)` << 1 */ -+ { 0x00000000f2d8657e, 0x00000000e77ac60a }, -+ /* x^32768 mod p(x)` << 1, x^32832 mod p(x)` << 1 */ -+ { 0x000000006bae74c4, 0x0000000145895816 }, -+ /* x^31744 mod p(x)` << 1, x^31808 mod p(x)` << 1 */ -+ { 0x0000000152af8aa0, 0x0000000038e362be }, -+ /* x^30720 mod p(x)` << 1, x^30784 mod p(x)` << 1 */ -+ { 0x0000000004663802, 0x000000007f991a64 }, -+ /* x^29696 mod p(x)` << 1, x^29760 mod p(x)` << 1 */ -+ { 0x00000001ab2f5afc, 0x00000000fa366d3a }, -+ /* x^28672 mod p(x)` << 1, x^28736 mod p(x)` << 1 */ -+ { 0x0000000074a4ebd4, 0x00000001a2bb34f0 }, -+ /* x^27648 mod p(x)` << 1, x^27712 mod p(x)` << 1 */ -+ { 0x00000001d7ab3a4c, 0x0000000028a9981e }, -+ /* x^26624 mod p(x)` << 1, x^26688 mod p(x)` << 1 */ -+ { 0x00000001a8da60c6, 0x00000001dbc672be }, -+ /* x^25600 mod p(x)` << 1, x^25664 mod p(x)` << 1 */ -+ { 0x000000013cf63820, 0x00000000b04d77f6 }, -+ /* x^24576 mod p(x)` << 1, x^24640 mod p(x)` << 1 */ -+ { 0x00000000bec12e1e, 0x0000000124400d96 }, -+ /* x^23552 mod p(x)` << 1, x^23616 mod p(x)` << 1 */ -+ { 0x00000001c6368010, 0x000000014ca4b414 }, -+ /* x^22528 mod p(x)` << 1, x^22592 mod p(x)` << 1 */ -+ { 0x00000001e6e78758, 0x000000012fe2c938 }, -+ /* x^21504 mod p(x)` << 1, x^21568 mod p(x)` << 1 */ -+ { 0x000000008d7f2b3c, 0x00000001faed01e6 }, -+ /* x^20480 mod p(x)` << 1, x^20544 mod p(x)` << 1 */ -+ { 0x000000016b4a156e, 0x000000007e80ecfe }, -+ /* x^19456 mod p(x)` << 1, x^19520 mod p(x)` << 1 */ -+ { 0x00000001c63cfeb6, 0x0000000098daee94 }, -+ /* x^18432 mod p(x)` << 1, x^18496 mod p(x)` << 1 */ -+ { 0x000000015f902670, 0x000000010a04edea }, -+ /* x^17408 mod p(x)` << 1, x^17472 mod p(x)` << 1 */ -+ { 0x00000001cd5de11e, 0x00000001c00b4524 }, -+ /* x^16384 mod p(x)` << 1, x^16448 mod p(x)` << 1 */ -+ { 0x000000001acaec54, 0x0000000170296550 }, -+ /* x^15360 mod p(x)` << 1, x^15424 mod p(x)` << 1 */ -+ { 0x000000002bd0ca78, 0x0000000181afaa48 }, -+ /* x^14336 mod p(x)` << 1, x^14400 mod p(x)` << 1 */ -+ { 0x0000000032d63d5c, 0x0000000185a31ffa }, -+ /* x^13312 mod p(x)` << 1, x^13376 mod p(x)` << 1 */ -+ { 0x000000001c6d4e4c, 0x000000002469f608 }, -+ /* x^12288 mod p(x)` << 1, x^12352 mod p(x)` << 1 */ -+ { 0x0000000106a60b92, 0x000000006980102a }, -+ /* x^11264 mod p(x)` << 1, x^11328 mod p(x)` << 1 */ -+ { 0x00000000d3855e12, 0x0000000111ea9ca8 }, -+ /* x^10240 mod p(x)` << 1, x^10304 mod p(x)` << 1 */ -+ { 0x00000000e3125636, 0x00000001bd1d29ce }, -+ /* x^9216 mod p(x)` << 1, x^9280 mod p(x)` << 1 */ -+ { 0x000000009e8f7ea4, 0x00000001b34b9580 }, -+ /* x^8192 mod p(x)` << 1, x^8256 mod p(x)` << 1 */ -+ { 0x00000001c82e562c, 0x000000003076054e }, -+ /* x^7168 mod p(x)` << 1, x^7232 mod p(x)` << 1 */ -+ { 0x00000000ca9f09ce, 0x000000012a608ea4 }, -+ /* x^6144 mod p(x)` << 1, x^6208 mod p(x)` << 1 */ -+ { 0x00000000c63764e6, 0x00000000784d05fe }, -+ /* x^5120 mod p(x)` << 1, x^5184 mod p(x)` << 1 */ -+ { 0x0000000168d2e49e, 0x000000016ef0d82a }, -+ /* x^4096 mod p(x)` << 1, x^4160 mod p(x)` << 1 */ -+ { 0x00000000e986c148, 0x0000000075bda454 }, -+ /* x^3072 mod p(x)` << 1, x^3136 mod p(x)` << 1 */ -+ { 0x00000000cfb65894, 0x000000003dc0a1c4 }, -+ /* x^2048 mod p(x)` << 1, x^2112 mod p(x)` << 1 */ -+ { 0x0000000111cadee4, 0x00000000e9a5d8be }, -+ /* x^1024 mod p(x)` << 1, x^1088 mod p(x)` << 1 */ -+ { 0x0000000171fb63ce, 0x00000001609bc4b4 } -+#endif /* __LITTLE_ENDIAN__ */ -+ }; -+ -+/* Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the trailing 32 bits of zeros */ -+ -+static const __vector unsigned long long vcrc_short_const[16] -+ __attribute__((aligned (16))) = { -+#ifdef __LITTLE_ENDIAN__ -+ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ -+ { 0x5cf015c388e56f72, 0x7fec2963e5bf8048 }, -+ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ -+ { 0x963a18920246e2e6, 0x38e888d4844752a9 }, -+ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ -+ { 0x419a441956993a31, 0x42316c00730206ad }, -+ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ -+ { 0x924752ba2b830011, 0x543d5c543e65ddf9 }, -+ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ -+ { 0x55bd7f9518e4a304, 0x78e87aaf56767c92 }, -+ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ -+ { 0x6d76739fe0553f1e, 0x8f68fcec1903da7f }, -+ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ -+ { 0xc133722b1fe0b5c3, 0x3f4840246791d588 }, -+ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ -+ { 0x64b67ee0e55ef1f3, 0x34c96751b04de25a }, -+ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ -+ { 0x069db049b8fdb1e7, 0x156c8e180b4a395b }, -+ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ -+ { 0xa11bfaf3c9e90b9e, 0xe0b99ccbe661f7be }, -+ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ -+ { 0x817cdc5119b29a35, 0x041d37768cd75659 }, -+ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ -+ { 0x1ce9d94b36c41f1c, 0x3a0777818cfaa965 }, -+ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ -+ { 0x4f256efcb82be955, 0x0e148e8252377a55 }, -+ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ -+ { 0xec1631edb2dea967, 0x9c25531d19e65dde }, -+ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ -+ { 0x5d27e147510ac59a, 0x790606ff9957c0a6 }, -+ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ -+ { 0xa66805eb18b8ea18, 0x82f63b786ea2d55c } -+#else /* __LITTLE_ENDIAN__ */ -+ /* x^1952 mod p(x) , x^1984 mod p(x) , x^2016 mod p(x) , x^2048 mod p(x) */ -+ { 0x7fec2963e5bf8048, 0x5cf015c388e56f72 }, -+ /* x^1824 mod p(x) , x^1856 mod p(x) , x^1888 mod p(x) , x^1920 mod p(x) */ -+ { 0x38e888d4844752a9, 0x963a18920246e2e6 }, -+ /* x^1696 mod p(x) , x^1728 mod p(x) , x^1760 mod p(x) , x^1792 mod p(x) */ -+ { 0x42316c00730206ad, 0x419a441956993a31 }, -+ /* x^1568 mod p(x) , x^1600 mod p(x) , x^1632 mod p(x) , x^1664 mod p(x) */ -+ { 0x543d5c543e65ddf9, 0x924752ba2b830011 }, -+ /* x^1440 mod p(x) , x^1472 mod p(x) , x^1504 mod p(x) , x^1536 mod p(x) */ -+ { 0x78e87aaf56767c92, 0x55bd7f9518e4a304 }, -+ /* x^1312 mod p(x) , x^1344 mod p(x) , x^1376 mod p(x) , x^1408 mod p(x) */ -+ { 0x8f68fcec1903da7f, 0x6d76739fe0553f1e }, -+ /* x^1184 mod p(x) , x^1216 mod p(x) , x^1248 mod p(x) , x^1280 mod p(x) */ -+ { 0x3f4840246791d588, 0xc133722b1fe0b5c3 }, -+ /* x^1056 mod p(x) , x^1088 mod p(x) , x^1120 mod p(x) , x^1152 mod p(x) */ -+ { 0x34c96751b04de25a, 0x64b67ee0e55ef1f3 }, -+ /* x^928 mod p(x) , x^960 mod p(x) , x^992 mod p(x) , x^1024 mod p(x) */ -+ { 0x156c8e180b4a395b, 0x069db049b8fdb1e7 }, -+ /* x^800 mod p(x) , x^832 mod p(x) , x^864 mod p(x) , x^896 mod p(x) */ -+ { 0xe0b99ccbe661f7be, 0xa11bfaf3c9e90b9e }, -+ /* x^672 mod p(x) , x^704 mod p(x) , x^736 mod p(x) , x^768 mod p(x) */ -+ { 0x041d37768cd75659, 0x817cdc5119b29a35 }, -+ /* x^544 mod p(x) , x^576 mod p(x) , x^608 mod p(x) , x^640 mod p(x) */ -+ { 0x3a0777818cfaa965, 0x1ce9d94b36c41f1c }, -+ /* x^416 mod p(x) , x^448 mod p(x) , x^480 mod p(x) , x^512 mod p(x) */ -+ { 0x0e148e8252377a55, 0x4f256efcb82be955 }, -+ /* x^288 mod p(x) , x^320 mod p(x) , x^352 mod p(x) , x^384 mod p(x) */ -+ { 0x9c25531d19e65dde, 0xec1631edb2dea967 }, -+ /* x^160 mod p(x) , x^192 mod p(x) , x^224 mod p(x) , x^256 mod p(x) */ -+ { 0x790606ff9957c0a6, 0x5d27e147510ac59a }, -+ /* x^32 mod p(x) , x^64 mod p(x) , x^96 mod p(x) , x^128 mod p(x) */ -+ { 0x82f63b786ea2d55c, 0xa66805eb18b8ea18 } -+#endif /* __LITTLE_ENDIAN__ */ -+ }; -+ -+/* Barrett constants */ -+/* 33 bit reflected Barrett constant m - (4^32)/n */ -+ -+static const __vector unsigned long long v_Barrett_const[2] -+ __attribute__((aligned (16))) = { -+ /* x^64 div p(x) */ -+#ifdef __LITTLE_ENDIAN__ -+ { 0x00000000dea713f1, 0x0000000000000000 }, -+ { 0x0000000105ec76f1, 0x0000000000000000 } -+#else /* __LITTLE_ENDIAN__ */ -+ { 0x0000000000000000, 0x00000000dea713f1 }, -+ { 0x0000000000000000, 0x0000000105ec76f1 } -+#endif /* __LITTLE_ENDIAN__ */ -+ }; -+#endif /* POWER8_INTRINSICS */ -diff --git a/util/crc32c_test.cc b/util/crc32c_test.cc -index 3e4f7396e7..6fd7d34876 100644 ---- a/util/crc32c_test.cc -+++ b/util/crc32c_test.cc -@@ -108,6 +108,9 @@ TEST(CRC, StandardResults) { - EXPECT_EQ(~expected.crc32c, result); - } - -+ // NULL buffer -+ EXPECT_EQ((uint32_t) 0, Value(NULL, 0)); -+ - // Test 2: stitching two computations - for (auto expected : expectedResults) { - size_t partialLength = expected.length / 2; diff --git a/buildroot/package/rocksdb/rocksdb.hash b/buildroot/package/rocksdb/rocksdb.hash index d40448832..35c4a702b 100644 --- a/buildroot/package/rocksdb/rocksdb.hash +++ b/buildroot/package/rocksdb/rocksdb.hash @@ -1,8 +1,8 @@ # Locally computed: -sha256 d573d2f15cdda883714f7e0bc87b814a8d4a53a82edde558f08f940e905541ee rocksdb-6.10.1.tar.gz +sha256 b86741983c5842716128efc2eecc1a2f3bc86ba5125cf3111fb58d26fb195ff0 rocksdb-6.13.3.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb -sha256 054f4b04473dd7003fcd9e48b75c61fd257e50beb418c501099c651c0356a556 README.md +sha256 5791f5e0a4569112a97183581a8550e18db9fdf666479485fb98be10489ed5ca README.md diff --git a/buildroot/package/rocksdb/rocksdb.mk b/buildroot/package/rocksdb/rocksdb.mk index 2288c406a..3b8583131 100644 --- a/buildroot/package/rocksdb/rocksdb.mk +++ b/buildroot/package/rocksdb/rocksdb.mk @@ -4,13 +4,15 @@ # ################################################################################ -ROCKSDB_VERSION = 6.10.1 +ROCKSDB_VERSION = 6.13.3 ROCKSDB_SITE = $(call github,facebook,rocksdb,v$(ROCKSDB_VERSION)) ROCKSDB_LICENSE = GPL-2.0 or Apache-2.0 ROCKSDB_LICENSE_FILES = COPYING LICENSE.Apache LICENSE.leveldb README.md ROCKSDB_INSTALL_STAGING = YES -ROCKSDB_MAKE_OPTS = PORTABLE=1 +ROCKSDB_MAKE_OPTS = \ + PORTABLE=1 \ + PREFIX=/usr # Internal error, aborting at dwarf2cfi.c:2802 in connect_traces # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 @@ -67,6 +69,12 @@ else ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZSTD=1 endif +ifeq ($(BR2_GCC_ENABLE_LTO),y) +ROCKSDB_MAKE_OPTS += USE_LTO=1 +else +ROCKSDB_MAKE_OPTS += USE_LTO=0 +endif + ifeq ($(BR2_STATIC_LIBS),y) ROCKSDB_BUILD_TARGETS += static_lib ROCKSDB_INSTALL_TARGETS += install-static @@ -88,12 +96,12 @@ endef define ROCKSDB_INSTALL_STAGING_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ - INSTALL_PATH=$(STAGING_DIR) $(ROCKSDB_INSTALL_TARGETS) + DESTDIR=$(STAGING_DIR) $(ROCKSDB_INSTALL_TARGETS) endef define ROCKSDB_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ - INSTALL_PATH=$(TARGET_DIR) $(ROCKSDB_INSTALL_TARGETS) + DESTDIR=$(TARGET_DIR) $(ROCKSDB_INSTALL_TARGETS) endef $(eval $(generic-package)) diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash index 6e8855254..543c73748 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-bt-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk index 785f007cc..02754c0b4 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 +RPI_BT_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-firmware/Config.in b/buildroot/package/rpi-firmware/Config.in index f5a25c568..ce31ad46d 100644 --- a/buildroot/package/rpi-firmware/Config.in +++ b/buildroot/package/rpi-firmware/Config.in @@ -58,8 +58,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD The cut-down firmware, for emergency situations, with only features required to boot a Linux kernel. +config BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST + bool "deploy firmware files from list" + help + Deploy firmware files as listed. + endchoice +config BR2_PACKAGE_RPI_FIRMWARE_LIST + string + default "start.elf start_x.elf start_cd.elf fixup.dat fixup_x.dat fixup_cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + default "start4.elf start4x.elf start4cd.elf fixup4.dat fixup4x.dat fixup4cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + config BR2_PACKAGE_RPI_FIRMWARE_BOOT string default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI diff --git a/buildroot/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash index 4b930088e..691b20025 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.hash +++ b/buildroot/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243 rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz +sha256 ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697 rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk index a3f8d8dd2..58085a8ca 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b +RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom @@ -48,11 +48,24 @@ define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN endef endif +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST),y) +define RPI_FIRMWARE_INSTALL_FIRMWARE + $(foreach firmware,$(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_LIST)), \ + $(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware) + ) +endef +else +define RPI_FIRMWARE_INSTALL_FIRMWARE + $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat +endef +endif + + define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat + $(RPI_FIRMWARE_INSTALL_FIRMWARE) $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) diff --git a/buildroot/package/rpi-userland/rpi-userland.hash b/buildroot/package/rpi-userland/rpi-userland.hash index 83d7fce54..63b1bb0f4 100644 --- a/buildroot/package/rpi-userland/rpi-userland.hash +++ b/buildroot/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 024cafd2f4428e96bff1d29a782db1d484d4f1835f64097ca1bd0dc38f75e84f rpi-userland-f73fca015d421b763936667a0b58fe5024d59921.tar.gz +sha256 b23fc0849d282a8ba27b821cb8f63fa2ebc2ae8aa3cba0664ce3809ea814507b rpi-userland-093b30bbc2fd083d68cc3ee07e6e555c6e592d11.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk index 4cfd5cb83..0118da565 100644 --- a/buildroot/package/rpi-userland/rpi-userland.mk +++ b/buildroot/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = f73fca015d421b763936667a0b58fe5024d59921 +RPI_USERLAND_VERSION = 093b30bbc2fd083d68cc3ee07e6e555c6e592d11 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE diff --git a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 68e33debb..71e323e80 100644 --- a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87 rpi-wifi-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 0c697bddb..24ba5941b 100644 --- a/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,14 +4,14 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639 -RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) +RPI_WIFI_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9 +RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm endef $(eval $(generic-package)) diff --git a/buildroot/package/rsyslog/rsyslog.hash b/buildroot/package/rsyslog/rsyslog.hash index 50edaa64c..f40409843 100644 --- a/buildroot/package/rsyslog/rsyslog.hash +++ b/buildroot/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9 rsyslog-8.2004.0.tar.gz +sha256 19b232f765c4ba7a35b91ef1f5f9af775f6ff78ef56bb7737a2ce79ccbb32b98 rsyslog-8.2010.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/buildroot/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk index 50f332849..d20a13dbd 100644 --- a/buildroot/package/rsyslog/rsyslog.mk +++ b/buildroot/package/rsyslog/rsyslog.mk @@ -4,10 +4,11 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2004.0 +RSYSLOG_VERSION = 8.2010.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 +RSYSLOG_CPE_ID_VENDOR = rsyslog RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ @@ -29,6 +30,8 @@ RSYSLOG_CONF_OPTS += --disable-elasticsearch \ --disable-omhttp \ --disable-fmhttp \ --disable-imdocker \ + --disable-imhttp \ + --disable-impcap \ --disable-omhttpfs \ --disable-mmkubernetes diff --git a/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch b/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch deleted file mode 100644 index 96b36d60d..000000000 --- a/buildroot/package/rt-tests/0002-rt-tests-oslat-Allow-build-for-not-supported-archs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001 -From: Peter Xu -Date: Thu, 1 Oct 2020 14:47:26 -0400 -Subject: [PATCH] rt-tests: oslat: Allow build for not supported archs - -Now rt-tests won't build for archs other than x86/i386/ppc64 after oslat is -merged. Instead of failing the build, let's make it pass. However, whenever -oslat is executed, instead of running the real program, dump an error message, -so that people can try to implement the frc() function for it when there's a -real need for the new arch. - -Signed-off-by: Peter Xu -Signed-off-by: John Kacur - -[Taken from: -https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/src/oslat/oslat.c?h=unstable/devel/latest&id=165b597e3003c6870f5980e8902014d9344e6cf3] -Signed-off-by: Heiko Thiery ---- - src/oslat/oslat.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c -index f1a82f2..a8b6155 100644 ---- a/src/oslat/oslat.c -+++ b/src/oslat/oslat.c -@@ -69,7 +69,9 @@ static inline void frc(uint64_t *pval) - __asm__ __volatile__("mfspr %0, 268\n" : "=r" (*pval)); - } - # else --# error Need frc() for this platform. -+# define relax() do { } while (0) -+# define frc(x) -+# define FRC_MISSING - # endif - #else - # error Need to add support for this compiler. -@@ -810,6 +812,12 @@ int main(int argc, char *argv[]) - int i, n_cores; - cpu_set_t cpu_set; - -+#ifdef FRC_MISSING -+ printf("This architecture is not yet supported. " -+ "Please implement frc() function first for %s.\n", argv[0]); -+ return 0; -+#endif -+ - CPU_ZERO(&cpu_set); - - g.app_name = argv[0]; --- -2.20.1 - diff --git a/buildroot/package/rt-tests/rt-tests.hash b/buildroot/package/rt-tests/rt-tests.hash index 66834006d..f56500c26 100644 --- a/buildroot/package/rt-tests/rt-tests.hash +++ b/buildroot/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 611c5a2b02964ab778e037ae16402e8d1cb8456628c7ca38d85a7548f33e52e3 rt-tests-1.9.tar.xz +sha256 3740ad97b164a1cd77d9ee32bba23a4a0b2495a76468bcf40ff60b55c2a3a709 rt-tests-1.10.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/rt-tests/rt-tests.mk b/buildroot/package/rt-tests/rt-tests.mk index 26c257213..0d959bda3 100644 --- a/buildroot/package/rt-tests/rt-tests.mk +++ b/buildroot/package/rt-tests/rt-tests.mk @@ -6,10 +6,12 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 1.9 +RT_TESTS_VERSION = 1.10 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING + RT_TESTS_DEPENDENCIES = numactl +RT_TESTS_CPE_ID_VENDOR = kernel define RT_TESTS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ diff --git a/buildroot/package/rtc-tools/rtc-tools.hash b/buildroot/package/rtc-tools/rtc-tools.hash index 81be1afe4..a14dcb3e6 100644 --- a/buildroot/package/rtc-tools/rtc-tools.hash +++ b/buildroot/package/rtc-tools/rtc-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 152d8455bae5ad672e99bb91dfbed5b8b4bd8b0325146d1cf1c4d80b6e0d8a16 rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7.tar.gz -sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING +sha256 8614e140b04da3dbb787760bdb0fe2ac5fe8907f5d3e9a74c6713e3d17fc3650 rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7-br1.tar.gz +sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING diff --git a/buildroot/package/rtl8188eu/rtl8188eu.hash b/buildroot/package/rtl8188eu/rtl8188eu.hash index b16986176..37767f5d1 100644 --- a/buildroot/package/rtl8188eu/rtl8188eu.hash +++ b/buildroot/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 24656123468506760974edf4a9087f6c77d13228fa6b6ce899c12c359a5dc1e7 rtl8188eu-0924dc8fe0845358ed5b3c4c673126069469b3fc.tar.gz +sha256 b2b06c842bccd730d68a26b1c1b5a24f18373401e907147bf5e775fa42a36bbb rtl8188eu-60cb0b5a3cfc95e3f2e6fc294a28d987096b0559.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/buildroot/package/rtl8188eu/rtl8188eu.mk b/buildroot/package/rtl8188eu/rtl8188eu.mk index 686b2ea9d..b2066080f 100644 --- a/buildroot/package/rtl8188eu/rtl8188eu.mk +++ b/buildroot/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 0924dc8fe0845358ed5b3c4c673126069469b3fc +RTL8188EU_VERSION = 60cb0b5a3cfc95e3f2e6fc294a28d987096b0559 RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING diff --git a/buildroot/package/rtl8723bu/rtl8723bu.hash b/buildroot/package/rtl8723bu/rtl8723bu.hash index 0d06fff22..04bc776a0 100644 --- a/buildroot/package/rtl8723bu/rtl8723bu.hash +++ b/buildroot/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 19dae2b8b2c14b1f428c34ddb343fa41ddf9ae79bdefcb7c5baa65d357ca5a45 rtl8723bu-c9549d172a4f9d6ccf6d528682640246a41c2f0c.tar.gz +sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz diff --git a/buildroot/package/rtl8723bu/rtl8723bu.mk b/buildroot/package/rtl8723bu/rtl8723bu.mk index c54b2ef0d..c35fad583 100644 --- a/buildroot/package/rtl8723bu/rtl8723bu.mk +++ b/buildroot/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = c9549d172a4f9d6ccf6d528682640246a41c2f0c +RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) diff --git a/buildroot/package/rtmpdump/rtmpdump.hash b/buildroot/package/rtmpdump/rtmpdump.hash index 6e85a5841..54dbbc35d 100644 --- a/buildroot/package/rtmpdump/rtmpdump.hash +++ b/buildroot/package/rtmpdump/rtmpdump.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b98fceba5155c5a1ee3f26550ea94144c72d8b8c5a050c213bb55dab330ad6ff rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz -sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING +sha256 e362202d94b92632b17abc7ef909afc56de06a2cb40e308edfad901d799bbd9c rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3-br1.tar.gz +sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING diff --git a/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch b/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch deleted file mode 100644 index b7275462a..000000000 --- a/buildroot/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0982308255dd3fd70e7b93aa88a8f3c5b9c1b845 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 30 Aug 2020 21:15:06 +0200 -Subject: [PATCH] src/CMakeLists.txt: fix build with mbedtls but without zlib - -Building with mbedtls but without zlib will result in the following -build failure: - --- Found MbedTLS: /home/peko/autobuild/instance-0/output-1/per-package/rtty/host/powerpc64-buildroot-linux-gnu/sysroot/usr/lib/libmbedtls.so (found version "2.16.7") --- Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR) --- Select MbedTLS(PolarSSL) as the SSL backend -CMake Error: The following variables are used in this project, but they are set to NOTFOUND. -Please set them or make sure they are set and tested correctly in the CMake files: -ZLIB_LIBRARY - linked by target "rtty" in directory /home/peko/autobuild/instance-0/output-1/build/rtty-7.1.4/src - --- Configuring incomplete, errors occurred! - -Fixes: - - http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/rtty/pull/77] ---- - src/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 10f6626..d09e848 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -77,7 +77,11 @@ else() - elseif(RTTY_USE_MBEDTLS) - set(SSL_NAME "MbedTLS(PolarSSL)") - set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) -- set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) -+ if(ZLIB_FOUND) -+ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) -+ else() -+ set(SSL_LIB ${MBEDTLS_LIBRARIES}) -+ endif() - set(RTTY_HAVE_MBEDTLS_CONFIG 1) - endif() - --- -2.28.0 - diff --git a/buildroot/package/rtty/rtty.hash b/buildroot/package/rtty/rtty.hash index b49004ca1..283a5d1da 100644 --- a/buildroot/package/rtty/rtty.hash +++ b/buildroot/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 f0b8cf4c4d3d4b34d10097fe430d32ab1576edbf41131d27b6b964e078be1716 rtty-7.1.4.tar.gz +sha256 4c60eacd7a653988a1907284de2ecf360c74f55ef9e21c40b9ebd87af6570908 rtty-7.3.2.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/buildroot/package/rtty/rtty.mk b/buildroot/package/rtty/rtty.mk index b0efda047..dc9144528 100644 --- a/buildroot/package/rtty/rtty.mk +++ b/buildroot/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.1.4 +RTTY_VERSION = 7.3.2 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index 45fe1442a..c0de2783e 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -4,10 +4,13 @@ # ################################################################################ -RUNC_VERSION = 1.0.0-rc92 +RUNC_VERSION = $(RUNC_CPE_ID_VERSION)-$(RUNC_CPE_ID_UPDATE) RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE +RUNC_CPE_ID_VENDOR = linuxfoundation +RUNC_CPE_ID_VERSION = 1.0.0 +RUNC_CPE_ID_UPDATE = rc92 RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build diff --git a/buildroot/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash index dd81edd58..cc3ea89b1 100644 --- a/buildroot/package/rust-bin/rust-bin.hash +++ b/buildroot/package/rust-bin/rust-bin.hash @@ -1,48 +1,48 @@ -# From https://static.rust-lang.org/dist/rust-1.45.2-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.45.2-i686-unknown-linux-gnu.tar.xz.asc -sha256 42c25bea5c6dc35e89c65217477880aa52ee95b85271192f7e6833c80f3761f0 rust-1.45.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 39455d1ebd6f386e50748f566e1b37780f236c1f3cbc869690653662beca1ea9 rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d0006b1ec413cd0f698195584cc478d3ceb44ea4232fe1971970be22f1470e1d rust-std-1.45.2-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 68ec96eadf94aa409a74e1ac1cf56c578c539cae8c238664b1805374037ac1b3 rust-std-1.45.2-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 63d539b8ec09d6f555106a41278456dc443a88259eb4693f1c834b3dc2529616 rust-std-1.45.2-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 f60ddfcbc6e7292b1b2a5145c93463cdc0e0811c95e3b426f629fcab9e24588b rust-std-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz.asc -sha256 05474dbec0385c8dcfd940e6f8954d4f8284745a4fbcf57932022b1593829463 rust-std-1.45.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz.asc -sha256 6add56f405fac0306b7d966b842dfe6d6beb4eaa93492eac7ac74015ceaeba7e rust-std-1.45.2-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 107931f34646486211dcc582b6c4c58b17379025969b4d0f17c52d219483e66f rust-std-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 6f7dbbc7098c1a5af5e6490c8335eb8f8b8a53de9773199ac65c02e099956d58 rust-std-1.45.2-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 6e7638cd370e0e5aa455d325a5f66b20c677fa3abb24bbf2519fc97ba3ac78ba rust-std-1.45.2-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 c6ad70fc0b052ceba0f886d2431dbd23fd444ad307c0f2f4932ccc7af246bd73 rust-std-1.45.2-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 11edc189ea6544018ee74df7996d2ee8877a0d8b719a31b7e7a33d71bba9013c rust-std-1.45.2-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 0a000c2e047c675bee27c2287b2e03fe21148ead95c35b884846a8dc7c3c162d rust-std-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 02309322467af8e37256ccf1f064f5233c7fca4423dffde0bd5eb32cde46942a rust-std-1.45.2-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.48.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.48.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 ddbfb5af1cd2cb6ae79d6f3f95cf29c0057e6387eada8b3975e7d7658e315aae rust-1.48.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 58270d8e10f72e1712ba08db6b8f8ffca64a63d1a7b220688b59fb05655b3843 rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 3a50eeb64a63a09f79bee49e01f72410d455b9ae1c7f07ebdb6dc0d40e9aa0bc rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 f512696b54142abda3d68b2ba213ae115d5e898952a50a1fa3d1fe6b4ef71d3c rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 5bc6c5dfcc9c345c3f7af519df8ac77c2b0938ea32aa7949f589bec2c7cd3a22 rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 da71ec82973eb6fdf67de25b5a39d9cb4b943ec2c43de570f4785a3a79036430 rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 d4ea5ca6f9c8f9092b50c879f1d9a2620486f08020fa4cac227743a19f6e8cdf rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 5c4d49cbd16ac89e39c3cbfae127961289af3419435f2b90e1732a97d9326b35 rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 3fd7194abb8f51c3caf09c222c12700cddef73449d38953c6b1adb04a89dcc31 rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 9200f952416488bc68857989bc10239e59b44a6c55153cb063fa03f28f5016f8 rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 792008f6c9ea68db39e59312fc372bf649980cf676c01a71da7db399de49966c rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 58d0da369bfd71a17d27807ef7c052556a771cf209bee068d44504f554bf2a8c rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 10346635487b14aa4b82baeae02ee5a4bffe930090c6c551083262e9811755f0 rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 e42b64c5710d3982f22ed744ea21ef2f0196df908c6a673b6df550904583b1c3 rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 1c00a6a0dabbf6290728b09f9307d9fa6cc985487f727075c68acd4a600ef3f8 rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated -sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust-bin/rust-bin.mk b/buildroot/package/rust-bin/rust-bin.mk index 36557048c..28901e0cf 100644 --- a/buildroot/package/rust-bin/rust-bin.mk +++ b/buildroot/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.45.2 +RUST_BIN_VERSION = 1.48.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/buildroot/package/rust/rust.hash b/buildroot/package/rust/rust.hash index e2d3a48e4..1c993b933 100644 --- a/buildroot/package/rust/rust.hash +++ b/buildroot/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.xz.asc -sha256 f8412adac2f5d974b2f06c5bd4be7361084d18a678d098bf05de5ccfa57b74a9 rustc-1.45.2-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz.asc +sha256 ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908 rustc-1.48.0-src.tar.xz # Locally generated -sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust/rust.mk b/buildroot/package/rust/rust.mk index d62f7b7be..a38a3d64f 100644 --- a/buildroot/package/rust/rust.mk +++ b/buildroot/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.45.2 +RUST_VERSION = 1.48.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -65,6 +65,8 @@ define HOST_RUST_CONFIGURE_CMDS echo 'channel = "stable"'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ + echo '[llvm]'; \ + echo 'ninja = false'; \ ) > $(@D)/config.toml endef diff --git a/buildroot/package/samba4/0005-nsswitch-nsstest-c-Avoid-nss-function-conflicts-with-glibc-nss-h.patch b/buildroot/package/samba4/0005-nsswitch-nsstest-c-Avoid-nss-function-conflicts-with-glibc-nss-h.patch new file mode 100644 index 000000000..c5e0b55de --- /dev/null +++ b/buildroot/package/samba4/0005-nsswitch-nsstest-c-Avoid-nss-function-conflicts-with-glibc-nss-h.patch @@ -0,0 +1,104 @@ +From 6e496aa3635557b59792e469f7c7f8eccd822322 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Jul 2020 22:42:09 -0700 +Subject: [PATCH] nsswitch/nsstest.c: Avoid nss function conflicts with glibc + nss.h + +glibc 2.32 will define these varibles [1] which results in conflicts +with these static function names, therefore prefix these function names +with samba_ to avoid it + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d + +Signed-off-by: Khem Raj +Reviewed-by: Volker Lendecke +Reviewed-by: Noel Power + +Autobuild-User(master): Noel Power +Autobuild-Date(master): Tue Jul 28 10:52:00 UTC 2020 on sn-devel-184 + +[Retrieved from: +https://gitlab.com/samba-team/samba/-/commit/6e496aa3635557b59792e469f7c7f8eccd822322] +Signed-off-by: Fabrice Fontaine +--- + nsswitch/nsstest.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c +index e8c4306441d..e2ee9fbf3af 100644 +--- a/nsswitch/nsstest.c ++++ b/nsswitch/nsstest.c +@@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid) + return &pwd; + } + +-static void nss_setpwent(void) ++static void samba_nss_setpwent(void) + { + NSS_STATUS (*_nss_setpwent)(void) = + (NSS_STATUS(*)(void))find_fn("setpwent"); +@@ -152,7 +152,7 @@ static void nss_setpwent(void) + } + } + +-static void nss_endpwent(void) ++static void samba_nss_endpwent(void) + { + NSS_STATUS (*_nss_endpwent)(void) = + (NSS_STATUS (*)(void))find_fn("endpwent"); +@@ -290,7 +290,7 @@ again: + return &grp; + } + +-static void nss_setgrent(void) ++static void samba_nss_setgrent(void) + { + NSS_STATUS (*_nss_setgrent)(void) = + (NSS_STATUS (*)(void))find_fn("setgrent"); +@@ -305,7 +305,7 @@ static void nss_setgrent(void) + } + } + +-static void nss_endgrent(void) ++static void samba_nss_endgrent(void) + { + NSS_STATUS (*_nss_endgrent)(void) = + (NSS_STATUS (*)(void))find_fn("endgrent"); +@@ -402,7 +402,7 @@ static void nss_test_users(void) + { + struct passwd *pwd; + +- nss_setpwent(); ++ samba_nss_setpwent(); + /* loop over all users */ + while ((pwd = nss_getpwent())) { + printf("Testing user %s\n", pwd->pw_name); +@@ -424,14 +424,14 @@ static void nss_test_users(void) + printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid); + printf("\n"); + } +- nss_endpwent(); ++ samba_nss_endpwent(); + } + + static void nss_test_groups(void) + { + struct group *grp; + +- nss_setgrent(); ++ samba_nss_setgrent(); + /* loop over all groups */ + while ((grp = nss_getgrent())) { + printf("Testing group %s\n", grp->gr_name); +@@ -452,7 +452,7 @@ static void nss_test_groups(void) + printf("getgrgid: "); print_group(grp); + printf("\n"); + } +- nss_endgrent(); ++ samba_nss_endgrent(); + } + + static void nss_test_errors(void) +-- +GitLab + diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 0ce22a852..44fbc495c 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.11.15.tar.asc -sha256 922d461bb2e6e490cf7708b297a9312ea6cda1edc7bdfea4ee665f45ff99038a samba-4.11.15.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.11.17.tar.asc +sha256 15167da19922c7be210ecf8149b73abcb7c2be051de05b756f7f24e7ec9e5b04 samba-4.11.17.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index 51ee2c9c3..61d819012 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,12 +4,14 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.15 +SAMBA4_VERSION = 4.11.17 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES SAMBA4_LICENSE = GPL-3.0+ SAMBA4_LICENSE_FILES = COPYING +SAMBA4_CPE_ID_VENDOR = samba +SAMBA4_CPE_ID_PRODUCT = samba SAMBA4_DEPENDENCIES = \ host-e2fsprogs host-heimdal host-nfs-utils host-python3 \ cmocka e2fsprogs gnutls popt zlib \ diff --git a/buildroot/package/screen/0008_CVE-2021-26937.patch b/buildroot/package/screen/0008_CVE-2021-26937.patch new file mode 100644 index 000000000..df7efa029 --- /dev/null +++ b/buildroot/package/screen/0008_CVE-2021-26937.patch @@ -0,0 +1,68 @@ +Description: [CVE-2021-26937] Fix out of bounds array access +Author: Michael Schröder +Bug-Debian: https://bugs.debian.org/982435 +Bug: https://savannah.gnu.org/bugs/?60030 +Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html +Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 +Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html + +Downloaded from Debian: +https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch + +Signed-off-by: Peter Korsgaard +--- a/encoding.c ++++ b/encoding.c +@@ -43,7 +43,7 @@ + # ifdef UTF8 + static int recode_char __P((int, int, int)); + static int recode_char_to_encoding __P((int, int)); +-static void comb_tofront __P((int, int)); ++static void comb_tofront __P((int)); + # ifdef DW_CHARS + static int recode_char_dw __P((int, int *, int, int)); + static int recode_char_dw_to_encoding __P((int, int *, int)); +@@ -1263,6 +1263,8 @@ + {0x30000, 0x3FFFD}, + }; + ++ if (c >= 0xdf00 && c <= 0xdfff) ++ return 1; /* dw combining sequence */ + return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || + (cjkwidth && + bisearch(c, ambiguous, +@@ -1330,11 +1332,12 @@ + } + + static void +-comb_tofront(root, i) +-int root, i; ++comb_tofront(i) ++int i; + { + for (;;) + { ++ int root = i >= 0x700 ? 0x801 : 0x800; + debug1("bring to front: %x\n", i); + combchars[combchars[i]->prev]->next = combchars[i]->next; + combchars[combchars[i]->next]->prev = combchars[i]->prev; +@@ -1396,9 +1399,9 @@ + { + /* full, recycle old entry */ + if (c1 >= 0xd800 && c1 < 0xe000) +- comb_tofront(root, c1 - 0xd800); ++ comb_tofront(c1 - 0xd800); + i = combchars[root]->prev; +- if (c1 == i + 0xd800) ++ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) + { + /* completely full, can't recycle */ + debug("utf8_handle_comp: completely full!\n"); +@@ -1422,7 +1425,7 @@ + mc->font = (i >> 8) + 0xd8; + mc->fontx = 0; + debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); +- comb_tofront(root, i); ++ comb_tofront(i); + } + + #else /* !UTF8 */ diff --git a/buildroot/package/screen/screen.mk b/buildroot/package/screen/screen.mk index c1705f742..f75f92cb4 100644 --- a/buildroot/package/screen/screen.mk +++ b/buildroot/package/screen/screen.mk @@ -8,12 +8,16 @@ SCREEN_VERSION = 4.8.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING +SCREEN_CPE_ID_VENDOR = gnu SCREEN_DEPENDENCIES = ncurses SCREEN_AUTORECONF = YES SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin +# 0008_CVE-2021-26937.patch +SCREEN_IGNORE_CVES += CVE-2021-26937 + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam diff --git a/buildroot/package/screenfetch/Config.in b/buildroot/package/screenfetch/Config.in new file mode 100644 index 000000000..c0e7100f3 --- /dev/null +++ b/buildroot/package/screenfetch/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SCREENFETCH + bool "screenfetch" + depends on BR2_USE_MMU # bash + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_BASH # runtime dependency + help + screenFetch is a bash script to display distro info. + + https://github.com/KittyKatt/screenFetch diff --git a/buildroot/package/screenfetch/screenfetch.hash b/buildroot/package/screenfetch/screenfetch.hash new file mode 100644 index 000000000..4f16c616c --- /dev/null +++ b/buildroot/package/screenfetch/screenfetch.hash @@ -0,0 +1,2 @@ +sha256 aa97dcd2a8576ae18de6c16c19744aae1573a3da7541af4b98a91930a30a3178 screenfetch-3.9.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/screenfetch/screenfetch.mk b/buildroot/package/screenfetch/screenfetch.mk new file mode 100644 index 000000000..d1315d24e --- /dev/null +++ b/buildroot/package/screenfetch/screenfetch.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# screenfetch +# +################################################################################ + +SCREENFETCH_VERSION = 3.9.1 +SCREENFETCH_SITE = $(call github,KittyKatt,screenFetch,v$(SCREENFETCH_VERSION)) +SCREENFETCH_LICENSE = GPL-3.0+ +SCREENFETCH_LICENSE_FILES = COPYING + +define SCREENFETCH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/screenfetch-dev \ + $(TARGET_DIR)/usr/bin/screenfetch +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch b/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch deleted file mode 100644 index 2fbad9740..000000000 --- a/buildroot/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7c6d466d98910a2896680351cc5cea1b7fb37ab9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 24 Mar 2020 13:33:40 +0100 -Subject: [PATCH] src/video/directfb/SDL_DirectFB_render.c: fix build - -Build with directfb is broken due to a spurious '}' and a missing 'E' -since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb: - -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode': -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:202:9: error: case label not within a switch statement - 202 | case SDL_BLENDMODE_MUL: - | ^~~~ - -/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:205:67: error: 'DSBF_DSTCOLOR' undeclared (first use in this function); did you mean 'DSBF_DESTCOLOR'? - 205 | SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); - | ^~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://hg.libsdl.org/SDL/rev/769f80095217] ---- - src/video/directfb/SDL_DirectFB_render.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c -index 618009850..cc31fb8f4 100644 ---- a/src/video/directfb/SDL_DirectFB_render.c -+++ b/src/video/directfb/SDL_DirectFB_render.c -@@ -198,11 +198,10 @@ SetBlendMode(DirectFB_RenderData * data, int blendMode, - SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR)); - - break; -- } - case SDL_BLENDMODE_MUL: - data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL; - data->drawFlags = DSDRAW_BLEND; -- SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); -+ SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR)); - SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA)); - - break; --- -2.25.1 - diff --git a/buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch b/buildroot/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch similarity index 57% rename from buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch rename to buildroot/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch index 89ca220ad..47a13300e 100644 --- a/buildroot/package/sdl2/0002-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch +++ b/buildroot/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch @@ -15,25 +15,25 @@ Fixes: - http://autobuild.buildroot.org/results/fafd20a01591032662f9ca025fcea3478239cf3c Signed-off-by: Fabrice Fontaine -[Upstream: https://hg.libsdl.org/SDL/rev/389ce8cfa2a3] ---- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 2 ++ - 1 file changed, 2 insertions(+) -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index 216c45dab..459f96537 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -391,7 +391,9 @@ KMSDRM_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; +[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 - if (!KMSDRM_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) { - SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway."); --- -2.25.1 - + int ret = 0; + diff --git a/buildroot/package/sdl2/sdl2.hash b/buildroot/package/sdl2/sdl2.hash index b72ae4bfc..6b818fb00 100644 --- a/buildroot/package/sdl2/sdl2.hash +++ b/buildroot/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.12.tar.gz.sig -sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 SDL2-2.0.12.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.14.tar.gz.sig +sha256 d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc SDL2-2.0.14.tar.gz # Locally calculated sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk index 6ef530fb4..dfe5ec880 100644 --- a/buildroot/package/sdl2/sdl2.mk +++ b/buildroot/package/sdl2/sdl2.mk @@ -4,11 +4,13 @@ # ################################################################################ -SDL2_VERSION = 2.0.12 +SDL2_VERSION = 2.0.14 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib SDL2_LICENSE_FILES = COPYING.txt +SDL2_CPE_ID_VENDOR = libsdl +SDL2_CPE_ID_PRODUCT = sdl SDL2_INSTALL_STAGING = YES SDL2_CONFIG_SCRIPTS = sdl2-config diff --git a/buildroot/package/sdl_ttf/sdl_ttf.hash b/buildroot/package/sdl_ttf/sdl_ttf.hash index 86a15d6dd..97416c18c 100644 --- a/buildroot/package/sdl_ttf/sdl_ttf.hash +++ b/buildroot/package/sdl_ttf/sdl_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 SDL_ttf-2.0.11.tar.gz +sha256 f7bf5f6a4a21542a6ce5440dc0d81f3a26d029ee689e1fade62925b1e6667bd9 de50cffd41e6.tar.gz sha256 b609721d3d4ac67facaf86f068c8b311b6c5f6cef89b6d84268aa38b7867ab7b COPYING diff --git a/buildroot/package/sdl_ttf/sdl_ttf.mk b/buildroot/package/sdl_ttf/sdl_ttf.mk index 1d94c6c5c..9ac12ef5b 100644 --- a/buildroot/package/sdl_ttf/sdl_ttf.mk +++ b/buildroot/package/sdl_ttf/sdl_ttf.mk @@ -4,9 +4,18 @@ # ################################################################################ -SDL_TTF_VERSION = 2.0.11 -SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz -SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release +# There is unlikely to be a new SDL_ttf release for the foreseeable future: +# https://bugzilla.libsdl.org/show_bug.cgi?id=5344#c1 +# +# The unreleased version from HEAD as of 2020-11-09 has several bugfixes +# and DPI scaling support: +# https://hg.libsdl.org/SDL_ttf/rev/7dbd7cd826d6 +# +# DPI scaling is used for rendering on HiDPI displays and displays +# with non-square pixels. +SDL_TTF_VERSION = de50cffd41e6 +SDL_TTF_SOURCE = $(SDL_TTF_VERSION).tar.gz +SDL_TTF_SITE = https://hg.libsdl.org/SDL_ttf/archive SDL_TTF_LICENSE = Zlib SDL_TTF_LICENSE_FILES = COPYING diff --git a/buildroot/package/sed/sed.mk b/buildroot/package/sed/sed.mk index 6bb322055..64fb2035b 100644 --- a/buildroot/package/sed/sed.mk +++ b/buildroot/package/sed/sed.mk @@ -9,6 +9,7 @@ SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 SED_LICENSE_FILES = COPYING +SED_CPE_ID_VENDOR = gnu SED_CONF_OPTS = \ --bindir=/bin \ diff --git a/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch b/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch deleted file mode 100644 index daf537243..000000000 --- a/buildroot/package/ser2net/0001-port.h-include-sys-time.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 021543b02b6fdb78c9217757736eabac90a647eb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 26 Sep 2020 12:37:38 +0200 -Subject: [PATCH] port.h: include - -Include to avoid the following build failure on musl: - -port.h:361:29: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration - const char *str, struct timeval *tv, - ^~~~~~~ -portconfig.c: In function 'myconfig': -portconfig.c:586:9: error: variable 'tv' has initializer but incomplete type - struct timeval tv = { 0, 0 }; - ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/4c0b238186cb2fb2d81807ce006945594f92b2cd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/cminyard/ser2net/pull/34] ---- - port.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/port.h b/port.h -index 048c5bd..86c3b1d 100644 ---- a/port.h -+++ b/port.h -@@ -9,6 +9,7 @@ - #define PORT - - #include -+#include - #include "gbuf.h" - #include "absout.h" - --- -2.28.0 - diff --git a/buildroot/package/ser2net/ser2net.hash b/buildroot/package/ser2net/ser2net.hash index fd2761075..32783213c 100644 --- a/buildroot/package/ser2net/ser2net.hash +++ b/buildroot/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 7c0a47bd9b405aedac136c4e290ebfeb ser2net-4.2.2.tar.gz -sha1 64e77d3194bbbac6e7e9d5810d06b6ade7bfdcf4 ser2net-4.2.2.tar.gz +md5 ee74b7db3bdca09c18a4d0a5ef060c9c ser2net-4.3.2.tar.gz +sha1 196e954be4086d322ec9312c018cd2155ee601b8 ser2net-4.3.2.tar.gz # Locally computed: -sha256 60e2aab04c4a346447a7e58e308a830fb74bac208a021229c113fc8ccc7bdfe6 ser2net-4.2.2.tar.gz +sha256 39d93bbaf53ae23c85ceef918b176b89c20b417c95c1797a5554f441334c42bf ser2net-4.3.2.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/buildroot/package/ser2net/ser2net.mk b/buildroot/package/ser2net/ser2net.mk index 868d7f3a1..bf743239e 100644 --- a/buildroot/package/ser2net/ser2net.mk +++ b/buildroot/package/ser2net/ser2net.mk @@ -4,8 +4,8 @@ # ################################################################################ -SER2NET_VERSION = 4.2.2 -SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net +SER2NET_VERSION = 4.3.2 +SER2NET_SITE = https://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING SER2NET_DEPENDENCIES = gensio libyaml diff --git a/buildroot/package/setools/setools.mk b/buildroot/package/setools/setools.mk index c1a3a909c..a07b1367a 100644 --- a/buildroot/package/setools/setools.mk +++ b/buildroot/package/setools/setools.mk @@ -10,6 +10,7 @@ SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-fle SETOOLS_INSTALL_STAGING = YES SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL +SETOOLS_CPE_ID_VENDOR = selinuxproject SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python3-cython host-libselinux host-libsepol host-python-networkx HOST_SETOOLS_NEEDS_HOST_PYTHON = python3 diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash index cc7993a54..4f1d6d2fa 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fce47a956fad0c30def9c71821bcec450a40d3f881548e31e66cedf262b89eb1 shadowsocks-libev-3.3.4.tar.gz +sha256 cfc8eded35360f4b67e18dc447b0c00cddb29cc57a3cec48b135e5fb87433488 shadowsocks-libev-3.3.5.tar.gz # License files, locally calculated sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk index d69a37785..c76983ce5 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk @@ -4,10 +4,11 @@ # ################################################################################ -SHADOWSOCKS_LIBEV_VERSION = 3.3.4 +SHADOWSOCKS_LIBEV_VERSION = 3.3.5 SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset) SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING +SHADOWSOCKS_LIBEV_CPE_ID_VENDOR = shadowsocks SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES # We're patching configure.ac diff --git a/buildroot/package/shairport-sync/shairport-sync.hash b/buildroot/package/shairport-sync/shairport-sync.hash index 280090cc4..c451edb93 100644 --- a/buildroot/package/shairport-sync/shairport-sync.hash +++ b/buildroot/package/shairport-sync/shairport-sync.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8382affd25c473fa38ead5690148c6c3902098f359f9c881eefe139e1f49f49 shairport-sync-3.3.6.tar.gz +sha256 7f8d4ecec53f2f681a962467bf09205568fc936c8c31a9ee07b1bd72d3d95b12 shairport-sync-3.3.7.tar.gz sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/buildroot/package/shairport-sync/shairport-sync.mk b/buildroot/package/shairport-sync/shairport-sync.mk index 10348d7b5..1a02186dc 100644 --- a/buildroot/package/shairport-sync/shairport-sync.mk +++ b/buildroot/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.3.6 +SHAIRPORT_SYNC_VERSION = 3.3.7 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause diff --git a/buildroot/package/sigrok-cli/sigrok-cli.hash b/buildroot/package/sigrok-cli/sigrok-cli.hash index 63a3dd80a..3231bf82c 100644 --- a/buildroot/package/sigrok-cli/sigrok-cli.hash +++ b/buildroot/package/sigrok-cli/sigrok-cli.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c sigrok-cli-0.7.0.tar.gz +sha256 f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797 sigrok-cli-0.7.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/sigrok-cli/sigrok-cli.mk b/buildroot/package/sigrok-cli/sigrok-cli.mk index 1e017d69b..3d1e18788 100644 --- a/buildroot/package/sigrok-cli/sigrok-cli.mk +++ b/buildroot/package/sigrok-cli/sigrok-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -SIGROK_CLI_VERSION = 0.7.0 +SIGROK_CLI_VERSION = 0.7.1 SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli SIGROK_CLI_LICENSE = GPL-3.0+ SIGROK_CLI_LICENSE_FILES = COPYING diff --git a/buildroot/package/sispmctl/Config.in b/buildroot/package/sispmctl/Config.in index 6066dc051..b08116e84 100644 --- a/buildroot/package/sispmctl/Config.in +++ b/buildroot/package/sispmctl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SISPMCTL bool "sispmctl" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUSB @@ -13,6 +14,7 @@ config BR2_PACKAGE_SISPMCTL http://sispmctl.sourceforge.net/ -comment "sispmctl needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "sispmctl needs a toolchain w/ threads, wchar, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU diff --git a/buildroot/package/slirp/slirp.mk b/buildroot/package/slirp/slirp.mk index 33c568c05..ff92c6051 100644 --- a/buildroot/package/slirp/slirp.mk +++ b/buildroot/package/slirp/slirp.mk @@ -11,6 +11,8 @@ SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz SLIRP_SITE = https://elmarco.fedorapeople.org SLIRP_LICENSE = BSD-3-Clause SLIRP_LICENSE_FILES = COPYRIGHT +SLIRP_CPE_ID_VENDOR = libslirp_project +SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 diff --git a/buildroot/package/smartmontools/smartmontools.mk b/buildroot/package/smartmontools/smartmontools.mk index 9dc2f789c..1f4448cb8 100644 --- a/buildroot/package/smartmontools/smartmontools.mk +++ b/buildroot/package/smartmontools/smartmontools.mk @@ -8,6 +8,7 @@ SMARTMONTOOLS_VERSION = 7.1 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING +SMARTMONTOOLS_CPE_ID_VENDOR = smartmontools # We're patching configure.ac SMARTMONTOOLS_AUTORECONF = YES diff --git a/buildroot/package/smcroute/smcroute.mk b/buildroot/package/smcroute/smcroute.mk index 1a36c75d4..0db0e084f 100644 --- a/buildroot/package/smcroute/smcroute.mk +++ b/buildroot/package/smcroute/smcroute.mk @@ -9,6 +9,7 @@ SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING +SMCROUTE_CPE_ID_VENDOR = troglobit SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes #BUG:The package Makefile uses CC?= even though the package is autotools based diff --git a/buildroot/package/snappy/snappy.mk b/buildroot/package/snappy/snappy.mk index b764a0e4d..e1fa28fbc 100644 --- a/buildroot/package/snappy/snappy.mk +++ b/buildroot/package/snappy/snappy.mk @@ -8,6 +8,7 @@ SNAPPY_VERSION = 1.1.8 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3-Clause SNAPPY_LICENSE_FILES = COPYING +SNAPPY_CPE_ID_VENDOR = google SNAPPY_INSTALL_STAGING = YES SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF diff --git a/buildroot/package/snort/snort.hash b/buildroot/package/snort/snort.hash index 733cf605a..1103152ea 100644 --- a/buildroot/package/snort/snort.hash +++ b/buildroot/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 ec148a494cde9095fb590a51efa306de snort-2.9.16.1.tar.gz +md5 3fe89f22def4e9ffda01f07f816e666d snort-2.9.17.tar.gz # Locally computed: -sha256 e3ac45a1a3cc2c997d52d19cd92f1adf5641c3a919387adab47a4d13a9dc9f8e snort-2.9.16.1.tar.gz +sha256 c3b234c3922a09b0368b847ddb8d1fa371b741f032f42aa9ab53d67b428dc648 snort-2.9.17.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/buildroot/package/snort/snort.mk b/buildroot/package/snort/snort.mk index 794bd1f67..412c69f83 100644 --- a/buildroot/package/snort/snort.mk +++ b/buildroot/package/snort/snort.mk @@ -4,10 +4,11 @@ # ################################################################################ -SNORT_VERSION = 2.9.16.1 +SNORT_VERSION = 2.9.17 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING +SNORT_CPE_ID_VENDOR = snort SNORT_DEPENDENCIES = libpcap libdnet daq pcre zlib host-pkgconf diff --git a/buildroot/package/socat/socat.mk b/buildroot/package/socat/socat.mk index ad450727e..61c985256 100644 --- a/buildroot/package/socat/socat.mk +++ b/buildroot/package/socat/socat.mk @@ -9,6 +9,7 @@ SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL +SOCAT_CPE_ID_VENDOR = dest-unreach ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ diff --git a/buildroot/package/sox/0002-configure.ac-put-back-disable-stack-protector.patch b/buildroot/package/sox/0002-configure.ac-put-back-disable-stack-protector.patch new file mode 100644 index 000000000..28e2871f5 --- /dev/null +++ b/buildroot/package/sox/0002-configure.ac-put-back-disable-stack-protector.patch @@ -0,0 +1,45 @@ +From 18ace560a15207503805d4df25b90c7a756bcbf6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Feb 2021 23:53:39 +0100 +Subject: [PATCH] configure.ac: put back --disable-stack-protector + +Put back --disable-stack-protector which has been removed by commit +70c85915eace83142b84e4f65f5db421cf0c09e3. This will allow the user to +disable it or to let a higher buildsystem such as buildroot to finely +configure it. + +Indeed, without this patch, build can fail as some compilers (such as +uclibc) could missed the needed library (-lssp or -lssp_nonshared) at +linking step: + + CCLD libsox.la +/home/fabrice/br-test-pkg/br-arm-full/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared +/home/fabrice/br-test-pkg/br-arm-full/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/sox/patches/122/] +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 39306398..a1665467 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,12 @@ AC_PROG_LN_S + PKG_PROG_PKG_CONFIG + PKG_INSTALLDIR + +-AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong]) ++AC_ARG_ENABLE([stack-protector], ++ AS_HELP_STRING([--disable-stack-protector], [Disable -fstack-protector-strong]), ++ [enable_stack_protector=$enableval], [enable_stack_protector=yes]) ++AS_IF([test x"$enable_stack_protector" = "xyes"], ++ [AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong])]) ++ + AX_APPEND_COMPILE_FLAGS([-Wall -Wmissing-prototypes -Wstrict-prototypes]) + AX_APPEND_LINK_FLAGS([-Wl,--as-needed]) + +-- +2.29.2 + diff --git a/buildroot/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch b/buildroot/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch new file mode 100644 index 000000000..32d6f83b0 --- /dev/null +++ b/buildroot/package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch @@ -0,0 +1,47 @@ +From 8df3a56cfb104c84d4701562ae2e3c9dc4686798 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Feb 2021 11:08:45 +0100 +Subject: [PATCH] configure.ac: fix static linking with id3tag + +Put back -lz (i.e. ZLIB_LIBS) when searching for id3tag which was +wrongly removed by commit 6ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This +will fix the following static build failure: + +configure:15290: checking for id3_file_open in -lid3tag +configure:15315: /home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -static -Wall -Wmissing-prototypes -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--as-needed conftest.c -lid3tag >&5 +conftest.c:60:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] + 60 | char id3_file_open (); + | ^~~~ +conftest.c:62:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] + 62 | main () + | ^~~~ +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libid3tag.a(util.o): in function `id3_util_compress': +util.c:(.text+0x1ac): undefined reference to `compress2' +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libid3tag.a(util.o): in function `id3_util_decompress': +util.c:(.text+0x240): undefined reference to `uncompress' + +Fixes: + - http://autobuild.buildroot.org/results/73efdacf237e3d567fa66f3b3f68e624f5e35bc7 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/sox/patches/123] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 39306398..896714f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,7 +83,7 @@ dnl Various libraries + SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open]) + SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress]) + SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS]) +-SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open]) ++SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS]) + SOX_WITH_LIB([libgsm], [gsm/gsm.h gsm.h], [gsm], [gsm_create]) + + dnl Optional formats +-- +2.29.2 + diff --git a/buildroot/package/sox/sox.hash b/buildroot/package/sox/sox.hash index 1a4a7dbf7..d2006e029 100644 --- a/buildroot/package/sox/sox.hash +++ b/buildroot/package/sox/sox.hash @@ -1,6 +1,4 @@ -# From http://sourceforge.net/projects/sox/files/sox/14.4.2/ -md5 ba804bb1ce5c71dd484a102a5b27d0dd sox-14.4.2.tar.bz2 -sha1 dc9668256b9d81ef25d672f14f12ec026b0b4087 sox-14.4.2.tar.bz2 # Locally computed +sha256 3d06ba8fc39ac92f16da73593be48afe0a704fe4dc4f6eca2e5137ef77cd5115 sox-7524160b29a476f7e87bc14fddf12d349f9a3c5e-br1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a LICENSE.LGPL diff --git a/buildroot/package/sox/sox.mk b/buildroot/package/sox/sox.mk index 013ccbbcf..99ba20ac9 100644 --- a/buildroot/package/sox/sox.mk +++ b/buildroot/package/sox/sox.mk @@ -4,107 +4,137 @@ # ################################################################################ -SOX_VERSION = 14.4.2 -SOX_SITE = http://downloads.sourceforge.net/project/sox/sox/$(SOX_VERSION) -SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2 -SOX_DEPENDENCIES = host-pkgconf +SOX_VERSION = 7524160b29a476f7e87bc14fddf12d349f9a3c5e +SOX_SITE = git://git.code.sf.net/p/sox/code +SOX_SITE_METHOD = git +SOX_DEPENDENCIES = host-autoconf-archive host-pkgconf SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries) SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL +SOX_CPE_ID_VENDOR = sound_exchange_project +SOX_CPE_ID_PRODUCT = sound_exchange +# From git and we're patching configure.ac +SOX_AUTORECONF = YES +SOX_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive + +SOX_IGNORE_CVES += CVE-2017-11332 CVE-2017-11358 CVE-2017-11359 \ + CVE-2017-15370 CVE-2017-15371 CVE-2017-15372 CVE-2017-15642 \ + CVE-2017-18189 CVE-2019-8354 CVE-2019-8355 CVE-2019-8356 \ + CVE-2019-8357 CVE-2019-13590 SOX_CONF_OPTS = \ --with-distro="Buildroot" \ - --without-ffmpeg \ - --disable-gomp \ --disable-stack-protector ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) SOX_DEPENDENCIES += alsa-lib +SOX_CONF_OPTS += --enable-alsa else -SOX_CONF_OPTS += --without-alsa +SOX_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_FILE),y) SOX_DEPENDENCIES += file +SOX_CONF_OPTS += --with-magic else SOX_CONF_OPTS += --without-magic endif ifeq ($(BR2_PACKAGE_FLAC),y) SOX_DEPENDENCIES += flac +SOX_CONF_OPTS += --enable-flac else -SOX_CONF_OPTS += --without-flac +SOX_CONF_OPTS += --disable-flac endif ifeq ($(BR2_PACKAGE_LAME),y) SOX_DEPENDENCIES += lame +SOX_CONF_OPTS += --with-lame else SOX_CONF_OPTS += --without-lame endif ifeq ($(BR2_PACKAGE_LIBAO),y) SOX_DEPENDENCIES += libao +SOX_CONF_OPTS += --enable-ao else -SOX_CONF_OPTS += --without-ao +SOX_CONF_OPTS += --disable-ao +endif + +ifeq ($(BR2_PACKAGE_LIBGSM),y) +SOX_DEPENDENCIES += libgsm +SOX_CONF_OPTS += --enable-gsm +else +SOX_CONF_OPTS += --disable-gsm endif ifeq ($(BR2_PACKAGE_LIBID3TAG),y) SOX_DEPENDENCIES += libid3tag +SOX_CONF_OPTS += --with-id3tag else SOX_CONF_OPTS += --without-id3tag endif ifeq ($(BR2_PACKAGE_LIBMAD),y) SOX_DEPENDENCIES += libmad +SOX_CONF_OPTS += --with-mad else SOX_CONF_OPTS += --without-mad endif ifeq ($(BR2_PACKAGE_LIBPNG),y) SOX_DEPENDENCIES += libpng +SOX_CONF_OPTS += --with-png else SOX_CONF_OPTS += --without-png endif ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) SOX_DEPENDENCIES += libsndfile +SOX_CONF_OPTS += --enable-sndfile else -SOX_CONF_OPTS += --without-sndfile +SOX_CONF_OPTS += --disable-sndfile endif ifeq ($(BR2_PACKAGE_LIBVORBIS),y) SOX_DEPENDENCIES += libvorbis +SOX_CONF_OPTS += --enable-oggvorbis else -SOX_CONF_OPTS += --without-oggvorbis +SOX_CONF_OPTS += --disable-oggvorbis endif ifeq ($(BR2_PACKAGE_OPENCORE_AMR),y) SOX_DEPENDENCIES += opencore-amr +SOX_CONF_OPTS += --enable-amrwb --enable-amrnb else -SOX_CONF_OPTS += --without-amrwb --without-amrnb +SOX_CONF_OPTS += --disable-amrwb --disable-amrnb endif ifeq ($(BR2_PACKAGE_OPUSFILE),y) SOX_DEPENDENCIES += opusfile +SOX_CONF_OPTS += --enable-opus else -SOX_CONF_OPTS += --without-opus +SOX_CONF_OPTS += --disable-opus endif ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) SOX_DEPENDENCIES += pulseaudio +SOX_CONF_OPTS += --enable-pulseaudio else -SOX_CONF_OPTS += --without-pulseaudio +SOX_CONF_OPTS += --disable-pulseaudio endif ifeq ($(BR2_PACKAGE_TWOLAME),y) SOX_DEPENDENCIES += twolame +SOX_CONF_OPTS += --with-twolame else SOX_CONF_OPTS += --without-twolame endif ifeq ($(BR2_PACKAGE_WAVPACK),y) SOX_DEPENDENCIES += wavpack +SOX_CONF_OPTS += --enable-wavpack else -SOX_CONF_OPTS += --without-wavpack +SOX_CONF_OPTS += --disable-wavpack endif $(eval $(autotools-package)) diff --git a/buildroot/package/spawn-fcgi/spawn-fcgi.mk b/buildroot/package/spawn-fcgi/spawn-fcgi.mk index ed97d0a7b..8caa1e2b3 100644 --- a/buildroot/package/spawn-fcgi/spawn-fcgi.mk +++ b/buildroot/package/spawn-fcgi/spawn-fcgi.mk @@ -9,5 +9,6 @@ SPAWN_FCGI_SITE = http://www.lighttpd.net/download SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 SPAWN_FCGI_LICENSE = BSD-3-Clause SPAWN_FCGI_LICENSE_FILES = COPYING +SPAWN_FCGI_CPE_ID_VENDOR = lighttpd $(eval $(autotools-package)) diff --git a/buildroot/package/spdlog/Config.in b/buildroot/package/spdlog/Config.in index 4aee1f7dd..877c1b6ab 100644 --- a/buildroot/package/spdlog/Config.in +++ b/buildroot/package/spdlog/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SPDLOG depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_FMT help - Very fast, header only, C++ logging library. + Very fast, header-only/compiled, C++ logging library. https://github.com/gabime/spdlog diff --git a/buildroot/package/spdlog/spdlog.hash b/buildroot/package/spdlog/spdlog.hash index 68dd7f197..da1e0c27a 100644 --- a/buildroot/package/spdlog/spdlog.hash +++ b/buildroot/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e68e9b40cf63bb022a4b18cdc1c9d88eb5d97e4fd64fa981950a9cacf57a4bf spdlog-1.8.0.tar.gz +sha256 e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5 spdlog-1.8.2.tar.gz sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/buildroot/package/spdlog/spdlog.mk b/buildroot/package/spdlog/spdlog.mk index 8d8c3888b..caf30be6d 100644 --- a/buildroot/package/spdlog/spdlog.mk +++ b/buildroot/package/spdlog/spdlog.mk @@ -4,10 +4,11 @@ # ################################################################################ -SPDLOG_VERSION = 1.8.0 +SPDLOG_VERSION = 1.8.2 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE +SPDLOG_INSTALL_STAGING = YES SPDLOG_DEPENDENCIES = fmt SPDLOG_CONF_OPTS += \ -DSPDLOG_BUILD_TESTS=OFF \ @@ -15,8 +16,10 @@ SPDLOG_CONF_OPTS += \ -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_FMT_EXTERNAL=ON -# Header-only library -SPDLOG_INSTALL_STAGING = YES -SPDLOG_INSTALL_TARGET = NO +ifeq ($(BR2_STATIC_LIBS),y) +SPDLOG_CONF_OPTS += -DSPDLOG_BUILD_SHARED=OFF +else +SPDLOG_CONF_OPTS += -DSPDLOG_BUILD_SHARED=ON +endif $(eval $(cmake-package)) diff --git a/buildroot/package/speexdsp/speexdsp.hash b/buildroot/package/speexdsp/speexdsp.hash index 955c4c0a0..fd9870dc5 100644 --- a/buildroot/package/speexdsp/speexdsp.hash +++ b/buildroot/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f3997997f3af3e7382b44abc9d2a55db5bd8754b22e798e2d16ac309cd6474a speexdsp-SpeexDSP-1.2.0.tar.gz -sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING +sha256 c92c7e428cb5ca11b4e6f13118ff288332f330b6fefc93cb39bf7b43b13cb1f7 speexdsp-SpeexDSP-1.2.0-br1.tar.gz +sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/buildroot/package/spi-tools/spi-tools.hash b/buildroot/package/spi-tools/spi-tools.hash index 8b7590b33..771f86e4c 100644 --- a/buildroot/package/spi-tools/spi-tools.hash +++ b/buildroot/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 a1846bf3b4d38fc419f8efe4555242aa581358fdca28452b3ca11f74e3572e33 spi-tools-0.8.5.tar.gz +sha256 319ad6ab296111109ea4a820e216cef392429295de7e10e76f7146677337cf09 spi-tools-0.8.6.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/buildroot/package/spi-tools/spi-tools.mk b/buildroot/package/spi-tools/spi-tools.mk index 1af74c7a1..b2dd4db3f 100644 --- a/buildroot/package/spi-tools/spi-tools.mk +++ b/buildroot/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 0.8.5 +SPI_TOOLS_VERSION = 0.8.6 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES diff --git a/buildroot/package/spice/spice.mk b/buildroot/package/spice/spice.mk index 78d397bdc..db05bd67f 100644 --- a/buildroot/package/spice/spice.mk +++ b/buildroot/package/spice/spice.mk @@ -9,6 +9,7 @@ SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING +SPICE_CPE_ID_VALID = YES SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/sqlcipher/sqlcipher.mk b/buildroot/package/sqlcipher/sqlcipher.mk index 5a9a77c1e..393d50b20 100644 --- a/buildroot/package/sqlcipher/sqlcipher.mk +++ b/buildroot/package/sqlcipher/sqlcipher.mk @@ -8,6 +8,7 @@ SQLCIPHER_VERSION = 4.4.2 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE +SQLCIPHER_CPE_ID_VENDOR = zetetic SQLCIPHER_DEPENDENCIES = host-pkgconf openssl host-tcl SQLCIPHER_INSTALL_STAGING = YES diff --git a/buildroot/package/sqlite/sqlite.hash b/buildroot/package/sqlite/sqlite.hash index 162b52d60..02b0e7132 100644 --- a/buildroot/package/sqlite/sqlite.hash +++ b/buildroot/package/sqlite/sqlite.hash @@ -1,8 +1,3 @@ -# From https://www.sqlite.org/download.html -sha1 ea14ef2dc4cc7fcbc5ebbb018d3a03faa3a41cb4 sqlite-autoconf-3320300.tar.gz - -# Calculated based on the hash above -sha256 a31507123c1c2e3a210afec19525fd7b5bb1e19a6a34ae5b998fbd7302568b66 sqlite-autoconf-3320300.tar.gz - -# Locally calculated +# Locally computed +sha256 2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89 sqlite-autoconf-3340100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/buildroot/package/sqlite/sqlite.mk b/buildroot/package/sqlite/sqlite.mk index c8b9ba315..2c2928f27 100644 --- a/buildroot/package/sqlite/sqlite.mk +++ b/buildroot/package/sqlite/sqlite.mk @@ -4,11 +4,13 @@ # ################################################################################ -SQLITE_VERSION = 3320300 +SQLITE_VERSION = 3340100 +SQLITE_CPE_ID_VERSION = 3.34.1 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2020 +SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms +SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_SQLITE_STAT4),y) diff --git a/buildroot/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk index 15707e198..026c0a46c 100644 --- a/buildroot/package/squashfs/squashfs.mk +++ b/buildroot/package/squashfs/squashfs.mk @@ -8,6 +8,7 @@ SQUASHFS_VERSION = 4.4 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING +SQUASHFS_CPE_ID_VALID = YES SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index 1ba375e54..473af2ac1 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -9,6 +9,7 @@ SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING +SQUID_CPE_ID_VENDOR = squid-cache SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \ diff --git a/buildroot/package/ssdp-responder/Config.in b/buildroot/package/ssdp-responder/Config.in new file mode 100644 index 000000000..df57546ee --- /dev/null +++ b/buildroot/package/ssdp-responder/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SSDP_RESPONDER + bool "ssdp-responder" + depends on BR2_USE_MMU + help + Simple Service Discovery Protocol daemon (SSDP) for networked + Linux and UNIX devices. Useful in any setup, big or small, but + targeted more at embedded systems that need to announce + themselves to Windows systems. + + ssdpd is a stand-alone UNIX, no external dependencies but the + standard C library. It has a built-in web server for serving + the UPnP XML description which Windows use to present the + icon, by default an InternetGatewayDevice is announced. + + Also included is ssdp-scan, a tool similar to mdns-scan, which + continuously scans for SSDP capable hosts on the network. + Take care only to use for debugging since it scans the network + quite aggressively. + + https://github.com/troglobit/ssdp-responder/ diff --git a/buildroot/package/ssdp-responder/S50ssdpd b/buildroot/package/ssdp-responder/S50ssdpd new file mode 100755 index 000000000..e33992be9 --- /dev/null +++ b/buildroot/package/ssdp-responder/S50ssdpd @@ -0,0 +1,42 @@ +#!/bin/sh + +NAME=ssdpd +PIDFILE=/var/run/$NAME.pid +DAEMON=/usr/sbin/$NAME +CFGFILE=/etc/default/$NAME + +DAEMON_ARGS="" + +# Read configuration variable file if it is present +[ -f $CFGFILE ] && . $CFGFILE + +start() { + printf 'Starting %s: ' "$NAME" + start-stop-daemon -S -q -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + printf 'Stopping %s: ' "$NAME" + start-stop-daemon -K -q -p $PIDFILE -x $DAEMON + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1" + ;; + reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/buildroot/package/ssdp-responder/ssdp-responder.hash b/buildroot/package/ssdp-responder/ssdp-responder.hash new file mode 100644 index 000000000..e8cbbb4a1 --- /dev/null +++ b/buildroot/package/ssdp-responder/ssdp-responder.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7ae49229e7c7a55fed9e36598b12e2173eecef0fffe0a386b6a10fad30f3c79f ssdp-responder-1.8.tar.gz +sha256 e17dc0bc91bf499d8cca5e016c22c6d2a4770e3cc1a43756a7973375a83ddb90 LICENSE diff --git a/buildroot/package/ssdp-responder/ssdp-responder.mk b/buildroot/package/ssdp-responder/ssdp-responder.mk new file mode 100644 index 000000000..3fee4c200 --- /dev/null +++ b/buildroot/package/ssdp-responder/ssdp-responder.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# ssdp-responder +# +################################################################################ + +SSDP_RESPONDER_VERSION = 1.8 +SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) +SSDP_RESPONDER_LICENSE = ISC +SSDP_RESPONDER_LICENSE_FILES = LICENSE +SSDP_RESPONDER_CPE_ID_VENDOR = \ + simple_service_discovery_protocol_responder_project +SSDP_RESPONDER_CPE_ID_PRODUCT = simple_service_discovery_protocol_responder +SSDP_RESPONDER_DEPENDENCIES = host-pkgconf + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SSDP_RESPONDER_DEPENDENCIES += systemd +SSDP_RESPONDER_CONF_OPTS += --with-systemd +else +SSDP_RESPONDER_CONF_OPTS += --without-systemd +endif + +define SSDP_RESPONDER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/ssdp-responder/S50ssdpd \ + $(TARGET_DIR)/etc/init.d/S50ssdpd +endef + +define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ + $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch b/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 312985d8d..000000000 --- a/buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 35ff9ed71b89f34e5462de1ee63f88edf98aeb69 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 31 Oct 2020 21:08:53 +0100 -Subject: [PATCH] sshfs.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8: - -../sshfs.c:1092:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < sshfs.max_conns; i++) { - ^ - -This build failure has been added with -https://github.com/libfuse/sshfs/commit/8822b60d9dbd9907065e7999f616b11ddce6d584 - -Fixes: - - http://autobuild.buildroot.org/results/2dbdc579c55543175716d5f739cabe2ad0864ed6 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/libfuse/sshfs/pull/233] ---- - sshfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sshfs.c b/sshfs.c -index d5f2ff7..2c2db42 100644 ---- a/sshfs.c -+++ b/sshfs.c -@@ -1068,6 +1068,7 @@ static struct conn* get_conn(const struct sshfs_file *sf, - const char *path) - { - struct conntab_entry *ce; -+ int i; - - if (sshfs.max_conns == 1) - return &sshfs.conns[0]; -@@ -1089,7 +1090,7 @@ static struct conn* get_conn(const struct sshfs_file *sf, - - int best_index = 0; - uint64_t best_score = ~0ULL; /* smaller is better */ -- for (int i = 0; i < sshfs.max_conns; i++) { -+ for (i = 0; i < sshfs.max_conns; i++) { - uint64_t score = ((uint64_t) sshfs.conns[i].req_count << 43) + - ((uint64_t) sshfs.conns[i].dir_count << 22) + - ((uint64_t) sshfs.conns[i].file_count << 1) + --- -2.28.0 - diff --git a/buildroot/package/sshfs/sshfs.hash b/buildroot/package/sshfs/sshfs.hash index b8488013a..106f06f09 100644 --- a/buildroot/package/sshfs/sshfs.hash +++ b/buildroot/package/sshfs/sshfs.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 6e7e86831f3066b356e7f16e22f1b8a8f177fda05146f6a5eb821c2fd0541c34 sshfs-3.7.0.tar.xz +sha256 fe5d3436d61b46974889e0c4515899c21a9d67851e3793c209989f72353d7750 sshfs-3.7.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sshfs/sshfs.mk b/buildroot/package/sshfs/sshfs.mk index 70e7feab1..6759f6ab3 100644 --- a/buildroot/package/sshfs/sshfs.mk +++ b/buildroot/package/sshfs/sshfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHFS_VERSION = 3.7.0 +SSHFS_VERSION = 3.7.1 SSHFS_SOURCE = sshfs-$(SSHFS_VERSION).tar.xz SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(SSHFS_VERSION) SSHFS_LICENSE = GPL-2.0 diff --git a/buildroot/package/stella/stella.hash b/buildroot/package/stella/stella.hash index 18e325b1e..c40d96616 100644 --- a/buildroot/package/stella/stella.hash +++ b/buildroot/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 59ee35a3e49f52e64fa15e0217ecda90ccb768dcb075d997e72d5e5a3198f82e stella-6.3-src.tar.xz +sha256 0346900e9ba4b6d532b72d956adc5078502a9bd6bbc1648bb3dd68f5ffd4859b stella-6.4-src.tar.xz sha256 d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/buildroot/package/stella/stella.mk b/buildroot/package/stella/stella.mk index 1e2cbaf9f..2dcfbeacc 100644 --- a/buildroot/package/stella/stella.mk +++ b/buildroot/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.3 +STELLA_VERSION = 6.4 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ diff --git a/buildroot/package/stellarium/stellarium.hash b/buildroot/package/stellarium/stellarium.hash index 4f0ee7e12..fb6d46422 100644 --- a/buildroot/package/stellarium/stellarium.hash +++ b/buildroot/package/stellarium/stellarium.hash @@ -1,5 +1,5 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 a3de40d74b2dcf8c9a7c6220de3d9e951e5b06c8 stellarium-0.20.3.tar.gz -sha256 2781a364d14c203c21a11ef528d541559ed749e1b6c3dbc1187410a6c23ab97c stellarium-0.20.3.tar.gz +sha1 c399f9c785f6a33d04f1a1c4f2db3309ce4781dc stellarium-0.20.4.tar.gz +sha256 63033bb6ad01b5f021689766b2a09a99bcabcfec57a710e46a93c40a32fda388 stellarium-0.20.4.tar.gz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/buildroot/package/stellarium/stellarium.mk b/buildroot/package/stellarium/stellarium.mk index d9ba29c8b..ac0bd4772 100644 --- a/buildroot/package/stellarium/stellarium.mk +++ b/buildroot/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 0.20.3 +STELLARIUM_VERSION = 0.20.4 STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING diff --git a/buildroot/package/stm32flash/stm32flash.hash b/buildroot/package/stm32flash/stm32flash.hash index 3adcb96d3..1b06a8f0f 100644 --- a/buildroot/package/stm32flash/stm32flash.hash +++ b/buildroot/package/stm32flash/stm32flash.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 58788826b80f16f2084632299340f9a3155b326936210e5f7a58f9dbd1b18bdd stm32flash-3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt +sha256 42b7d63f6016bd75911cbb87fe85fbc4f98adf3ceecfe6d91f7956b31d18095f stm32flash-3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650-br1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/buildroot/package/strace/strace.hash b/buildroot/package/strace/strace.hash index 58df21fdd..7b211c78b 100644 --- a/buildroot/package/strace/strace.hash +++ b/buildroot/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.9/strace-5.9.tar.xz.asc -sha256 39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 strace-5.9.tar.xz +# https://strace.io/files/5.10/strace-5.10.tar.xz.asc +sha256 fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c strace-5.10.tar.xz sha256 6370eb67db918210944a8511a6995ebe9567852f26b4f15a01e5c8cf2aef7c46 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/buildroot/package/strace/strace.mk b/buildroot/package/strace/strace.mk index 0bc97b404..646be41e5 100644 --- a/buildroot/package/strace/strace.mk +++ b/buildroot/package/strace/strace.mk @@ -4,11 +4,12 @@ # ################################################################################ -STRACE_VERSION = 5.9 +STRACE_VERSION = 5.10 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later +STRACE_CPE_ID_VALID = YES STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y) diff --git a/buildroot/package/stress-ng/stress-ng.hash b/buildroot/package/stress-ng/stress-ng.hash index 5250a2247..41e280191 100644 --- a/buildroot/package/stress-ng/stress-ng.hash +++ b/buildroot/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 860291dd3a18b985b3483190a627bbede2b5c52113766c1921001b3fb4b83af0 stress-ng-0.11.17.tar.xz +sha256 f847be115f60d3ad7d37c806fd1bfb1412aa3c631fca581d6dc233322f50d6a5 stress-ng-0.12.02.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/stress-ng/stress-ng.mk b/buildroot/package/stress-ng/stress-ng.mk index 4afdb0a32..53d7b7e5b 100644 --- a/buildroot/package/stress-ng/stress-ng.mk +++ b/buildroot/package/stress-ng/stress-ng.mk @@ -4,17 +4,14 @@ # ################################################################################ -STRESS_NG_VERSION = 0.11.17 +STRESS_NG_VERSION = 0.12.02 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz -STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng +STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBBSD):$(BR2_STATIC_LIBS),y:) +ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd -else -STRESS_NG_MAKE_OPTS += HAVE_LIB_BSD=0 HAVE_WCSLCAT=0 \ - HAVE_WCSLCPY=0 HAVE_SETPROCTITLE=0 endif ifeq ($(BR2_PACKAGE_KEYUTILS),y) @@ -22,7 +19,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(STRESS_NG_MAKE_OPTS) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef # Don't use make install otherwise stress-ng will be rebuild without diff --git a/buildroot/package/strongswan/strongswan.hash b/buildroot/package/strongswan/strongswan.hash index aa25d81f4..a19b31145 100644 --- a/buildroot/package/strongswan/strongswan.hash +++ b/buildroot/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.0.tar.bz2.md5 -md5 705628cddd5b7683ef8a688acd9514d8 strongswan-5.9.0.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.1.tar.bz2.md5 +md5 1f4db969d072e120dc12d1c116a0f658 strongswan-5.9.1.tar.bz2 # Calculated based on the hash above -sha256 72b47a385da5d1532b816d9fe04c50d074c29ed42ea3f0878fbd66335917bb66 strongswan-5.9.0.tar.bz2 +sha256 a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb strongswan-5.9.1.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/buildroot/package/strongswan/strongswan.mk b/buildroot/package/strongswan/strongswan.mk index a0290c5bf..322abfbd7 100644 --- a/buildroot/package/strongswan/strongswan.mk +++ b/buildroot/package/strongswan/strongswan.mk @@ -4,11 +4,12 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.0 +STRONGSWAN_VERSION = 5.9.1 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE +STRONGSWAN_CPE_ID_VENDOR = strongswan STRONGSWAN_DEPENDENCIES = host-pkgconf STRONGSWAN_INSTALL_STAGING = YES STRONGSWAN_CONF_OPTS += \ diff --git a/buildroot/package/subversion/subversion.hash b/buildroot/package/subversion/subversion.hash index da0fe9118..534d59651 100644 --- a/buildroot/package/subversion/subversion.hash +++ b/buildroot/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.sha512 -sha512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b subversion-1.14.0.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.sha512 +sha512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd subversion-1.14.1.tar.bz2 # Locally calculated sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/buildroot/package/subversion/subversion.mk b/buildroot/package/subversion/subversion.mk index 83a359b96..d4cc71753 100644 --- a/buildroot/package/subversion/subversion.mk +++ b/buildroot/package/subversion/subversion.mk @@ -4,11 +4,12 @@ # ################################################################################ -SUBVERSION_VERSION = 1.14.0 +SUBVERSION_VERSION = 1.14.1 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 SUBVERSION_LICENSE_FILES = LICENSE +SUBVERSION_CPE_ID_VENDOR = apache SUBVERSION_DEPENDENCIES = \ host-pkgconf \ apr \ diff --git a/buildroot/package/sudo/sudo.mk b/buildroot/package/sudo/sudo.mk index c08cf1c4a..7f57c66b7 100644 --- a/buildroot/package/sudo/sudo.mk +++ b/buildroot/package/sudo/sudo.mk @@ -4,10 +4,13 @@ # ################################################################################ -SUDO_VERSION = 1.9.5p2 +SUDO_VERSION = $(SUDO_CPE_ID_VERSION)$(SUDO_CPE_ID_UPDATE) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE +SUDO_CPE_ID_VALID = YES +SUDO_CPE_ID_VERSION = 1.9.5 +SUDO_CPE_ID_UPDATE = p2 # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ diff --git a/buildroot/package/sunxi-boards/Config.in b/buildroot/package/sunxi-boards/Config.in index d9fd8529f..eaf492f2b 100644 --- a/buildroot/package/sunxi-boards/Config.in +++ b/buildroot/package/sunxi-boards/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SUNXI_BOARDS bool "sunxi script.bin board file" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-sunxi-tools select BR2_PACKAGE_HOST_SUNXI_TOOLS help Sunxi-boards requires a compiled .fex files for hardware @@ -23,3 +24,7 @@ config BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE See inside sys_config/ directory in sunxi-boards source code to see the list of valid .fex files. endif + +comment "sunxi script.bin board file needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/sunxi-mali-mainline-driver/0001-mali-support-building-against-5.9.patch b/buildroot/package/sunxi-mali-mainline-driver/0001-mali-support-building-against-5.9.patch deleted file mode 100644 index f4e5386b5..000000000 --- a/buildroot/package/sunxi-mali-mainline-driver/0001-mali-support-building-against-5.9.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 66731b7ec7d36e86d772aee84a84b648f37dbf5d Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Thu, 17 Dec 2020 01:32:21 +0100 -Subject: [PATCH] mali: support building against 5.9 - -Add patches to fix build failure with Linux version 5.9 due to -asm/uaccess.h changes and HAVE_UNLOCKED_IOCTL macro missing in version -r6p0 and r6p2. While for r8p1 and r9p0 patch is the same and is located -in patches/ root and fix HAVE_UNLOCKED_IOCTL issue only. - -Signed-off-by: Giulio Benetti ---- - ...24-mali-support-building-against-5.9.patch | 36 +++++++++ - ...24-mali-support-building-against-5.9.patch | 76 +++++++++++++++++++ - patches/r6p0/series | 1 + - ...24-mali-support-building-against-5.9.patch | 76 +++++++++++++++++++ - patches/r6p2/series | 1 + - patches/r8p1/series | 1 + - patches/r9p0/series | 1 + - 7 files changed, 192 insertions(+) - create mode 100644 patches/0024-mali-support-building-against-5.9.patch - create mode 100644 patches/r6p0/0024-mali-support-building-against-5.9.patch - create mode 100644 patches/r6p2/0024-mali-support-building-against-5.9.patch - -diff --git a/patches/0024-mali-support-building-against-5.9.patch b/patches/0024-mali-support-building-against-5.9.patch -new file mode 100644 -index 0000000..c54dfef ---- /dev/null -+++ b/patches/0024-mali-support-building-against-5.9.patch -@@ -0,0 +1,36 @@ -+From f760b79bc15557a13d9bb68a9a3fb9c8e08dfbae Mon Sep 17 00:00:00 2001 -+From: Giulio Benetti -+Date: Thu, 17 Dec 2020 16:41:49 +0100 -+Subject: [PATCH] mali: support building against 5.9 -+ -+Starting from Linux version 5.9.0 HAVE_UNLOCKED_IOCTL macro has been -+removed making actual code to use .ioctl struct member resulting in a -+build failure, so let's declare locally such macro if Linux -+version >= 5.9.0. -+ -+Signed-off-by: Giulio Benetti -+--- -+ src/devicedrv/mali/linux/mali_kernel_linux.c | 7 +++++++ -+ 1 file changed, 7 insertions(+) -+ -+diff --git a/src/devicedrv/mali/linux/mali_kernel_linux.c b/src/devicedrv/mali/linux/mali_kernel_linux.c -+index d7893a3..9005466 100644 -+--- a/src/devicedrv/mali/linux/mali_kernel_linux.c -++++ b/src/devicedrv/mali/linux/mali_kernel_linux.c -+@@ -65,6 +65,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(mali_hw_counter); -+ EXPORT_TRACEPOINT_SYMBOL_GPL(mali_sw_counters); -+ #endif /* CONFIG_TRACEPOINTS */ -+ -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++/* From Linux version 5.9.0 HAVE_UNLOCKED_IOCTL has been removed -++ * so let's reintroduce it here. -++ */ -++#define HAVE_UNLOCKED_IOCTL -++#endif -++ -+ #ifdef CONFIG_MALI_DEVFREQ -+ #include "mali_devfreq.h" -+ #include "mali_osk_mali.h" -+-- -+2.25.1 -+ -diff --git a/patches/r6p0/0024-mali-support-building-against-5.9.patch b/patches/r6p0/0024-mali-support-building-against-5.9.patch -new file mode 100644 -index 0000000..54b773b ---- /dev/null -+++ b/patches/r6p0/0024-mali-support-building-against-5.9.patch -@@ -0,0 +1,76 @@ -+From 44dbb7d2036ba41d5db46fadb86e0461fce0948f Mon Sep 17 00:00:00 2001 -+From: Giulio Benetti -+Date: Thu, 17 Dec 2020 02:26:49 +0100 -+Subject: [PATCH] mali: support building against 5.9 -+ -+Starting from Linux version 5.9.0 HAVE_UNLOCKED_IOCTL macro has been -+removed making actual code to use .ioctl struct member resulting in a -+build failure, so let's declare locally such macro if Linux -+version >= 5.9.0. -+ -+Starting from Linux version 5.9.0 also part of has been -+moved to so let's include if Linux -+version >= 5.9.0. -+ -+Signed-off-by: Giulio Benetti -+--- -+ src/devicedrv/mali/linux/mali_kernel_linux.c | 7 +++++++ -+ src/devicedrv/mali/linux/mali_osk_mali.c | 5 +++++ -+ src/devicedrv/mali/linux/mali_osk_misc.c | 5 +++++ -+ 3 files changed, 17 insertions(+) -+ -+diff --git a/src/devicedrv/mali/linux/mali_kernel_linux.c b/src/devicedrv/mali/linux/mali_kernel_linux.c -+index 34cb3d7..c098c77 100755 -+--- a/src/devicedrv/mali/linux/mali_kernel_linux.c -++++ b/src/devicedrv/mali/linux/mali_kernel_linux.c -+@@ -63,6 +63,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(mali_hw_counter); -+ EXPORT_TRACEPOINT_SYMBOL_GPL(mali_sw_counters); -+ #endif /* CONFIG_TRACEPOINTS */ -+ -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++/* From Linux version 5.9.0 HAVE_UNLOCKED_IOCTL has been removed -++ * so let's reintroduce it here. -++ */ -++#define HAVE_UNLOCKED_IOCTL -++#endif -++ -+ /* from the __malidrv_build_info.c file that is generated during build */ -+ extern const char *__malidrv_build_info(void); -+ -+diff --git a/src/devicedrv/mali/linux/mali_osk_mali.c b/src/devicedrv/mali/linux/mali_osk_mali.c -+index ee82b6e..1491d10 100755 -+--- a/src/devicedrv/mali/linux/mali_osk_mali.c -++++ b/src/devicedrv/mali/linux/mali_osk_mali.c -+@@ -13,7 +13,12 @@ -+ * Implementation of the OS abstraction layer which is specific for the Mali kernel device driver -+ */ -+ #include -++#include -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++#include -++#else -+ #include -++#endif -+ #include -+ #include -+ #include -+diff --git a/src/devicedrv/mali/linux/mali_osk_misc.c b/src/devicedrv/mali/linux/mali_osk_misc.c -+index 0a619e3..87ff192 100755 -+--- a/src/devicedrv/mali/linux/mali_osk_misc.c -++++ b/src/devicedrv/mali/linux/mali_osk_misc.c -+@@ -13,7 +13,12 @@ -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ -+ #include -++#include -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++#include -++#else -+ #include -++#endif -+ #include -+ #include -+ #include -+-- -+2.25.1 -+ -diff --git a/patches/r6p0/series b/patches/r6p0/series -index 50e54d6..4074177 100644 ---- a/patches/r6p0/series -+++ b/patches/r6p0/series -@@ -17,3 +17,4 @@ r6p0/0013-mali-support-building-against-4.15.patch - 0021-mali-support-building-against-5.3.patch - r6p0/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch -+r6p0/0024-mali-support-building-against-5.9.patch -diff --git a/patches/r6p2/0024-mali-support-building-against-5.9.patch b/patches/r6p2/0024-mali-support-building-against-5.9.patch -new file mode 100644 -index 0000000..0f9ca40 ---- /dev/null -+++ b/patches/r6p2/0024-mali-support-building-against-5.9.patch -@@ -0,0 +1,76 @@ -+From ebcecb62301c49e0dd67032e7db14c20be2df48b Mon Sep 17 00:00:00 2001 -+From: Giulio Benetti -+Date: Thu, 17 Dec 2020 00:49:45 +0100 -+Subject: [PATCH] mali: support building against 5.9 -+ -+Starting from Linux version 5.9.0 HAVE_UNLOCKED_IOCTL macro has been -+removed making actual code to use .ioctl struct member resulting in a -+build failure, so let's declare locally such macro if Linux -+version >= 5.9.0. -+ -+Starting from Linux version 5.9.0 also part of has been -+moved to so let's include if Linux -+version >= 5.9.0. -+ -+Signed-off-by: Giulio Benetti -+--- -+ src/devicedrv/mali/linux/mali_kernel_linux.c | 7 +++++++ -+ src/devicedrv/mali/linux/mali_osk_mali.c | 5 +++++ -+ src/devicedrv/mali/linux/mali_osk_misc.c | 5 +++++ -+ 3 files changed, 17 insertions(+) -+ -+diff --git a/src/devicedrv/mali/linux/mali_kernel_linux.c b/src/devicedrv/mali/linux/mali_kernel_linux.c -+index 9bfa2bd..51e5012 100755 -+--- a/src/devicedrv/mali/linux/mali_kernel_linux.c -++++ b/src/devicedrv/mali/linux/mali_kernel_linux.c -+@@ -69,6 +69,13 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(mali_sw_counters); -+ #include "mali_devfreq.h" -+ #include "mali_osk_mali.h" -+ -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++/* From Linux version 5.9.0 HAVE_UNLOCKED_IOCTL has been removed -++ * so let's reintroduce it here. -++ */ -++#define HAVE_UNLOCKED_IOCTL -++#endif -++ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) -+ #include -+ #else -+diff --git a/src/devicedrv/mali/linux/mali_osk_mali.c b/src/devicedrv/mali/linux/mali_osk_mali.c -+index 272d196..fdb8952 100755 -+--- a/src/devicedrv/mali/linux/mali_osk_mali.c -++++ b/src/devicedrv/mali/linux/mali_osk_mali.c -+@@ -13,7 +13,12 @@ -+ * Implementation of the OS abstraction layer which is specific for the Mali kernel device driver -+ */ -+ #include -++#include -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++#include -++#else -+ #include -++#endif -+ #include -+ #include -+ #include -+diff --git a/src/devicedrv/mali/linux/mali_osk_misc.c b/src/devicedrv/mali/linux/mali_osk_misc.c -+index 7dda283..58c6a4c 100755 -+--- a/src/devicedrv/mali/linux/mali_osk_misc.c -++++ b/src/devicedrv/mali/linux/mali_osk_misc.c -+@@ -13,7 +13,12 @@ -+ * Implementation of the OS abstraction layer for the kernel device driver -+ */ -+ #include -++#include -++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) -++#include -++#else -+ #include -++#endif -+ #include -+ #include -+ #include -+-- -+2.25.1 -+ -diff --git a/patches/r6p2/series b/patches/r6p2/series -index 4c68a77..775bc6f 100644 ---- a/patches/r6p2/series -+++ b/patches/r6p2/series -@@ -20,3 +20,4 @@ r6p2/0016-mali-support-building-against-4.16.patch - 0021-mali-support-building-against-5.3.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch -+r6p2/0024-mali-support-building-against-5.9.patch -diff --git a/patches/r8p1/series b/patches/r8p1/series -index a49a59b..0f15e40 100644 ---- a/patches/r8p1/series -+++ b/patches/r8p1/series -@@ -15,3 +15,4 @@ r8p1/0017-mali-support-building-against-4.9-later.patch - 0021-mali-support-building-against-5.3.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch -+0024-mali-support-building-against-5.9.patch -diff --git a/patches/r9p0/series b/patches/r9p0/series -index 301177c..866e869 100644 ---- a/patches/r9p0/series -+++ b/patches/r9p0/series -@@ -12,3 +12,4 @@ r6p2/0016-mali-support-building-against-4.16.patch - 0021-mali-support-building-against-5.3.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch -+0024-mali-support-building-against-5.9.patch --- -2.25.1 - diff --git a/buildroot/package/sunxi-mali-mainline-driver/0002-mali-support-building-against-5.10.patch b/buildroot/package/sunxi-mali-mainline-driver/0002-mali-support-building-against-5.10.patch deleted file mode 100644 index d64d3af1e..000000000 --- a/buildroot/package/sunxi-mali-mainline-driver/0002-mali-support-building-against-5.10.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8ea1fb65dd5db556b386a1ed726f7315d3511c2b Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Thu, 17 Dec 2020 01:54:52 +0100 -Subject: [PATCH] mali: support building against 5.10 - -Add patch to fix build failure with Linux version 5.10 due to missing -linux/dma-contiguous.h which content has been moved to -linux/dma-mapping.h - -Signed-off-by: Giulio Benetti ---- - ...5-mali-support-building-against-5.10.patch | 34 +++++++++++++++++++ - patches/r6p0/series | 1 + - patches/r6p2/series | 1 + - patches/r8p1/series | 1 + - patches/r9p0/series | 1 + - 5 files changed, 38 insertions(+) - create mode 100644 patches/0025-mali-support-building-against-5.10.patch - -diff --git a/patches/0025-mali-support-building-against-5.10.patch b/patches/0025-mali-support-building-against-5.10.patch -new file mode 100644 -index 0000000..e9070e7 ---- /dev/null -+++ b/patches/0025-mali-support-building-against-5.10.patch -@@ -0,0 +1,34 @@ -+From 9a6b4558bb7f470152ab00692010f07fd0bfa8f8 Mon Sep 17 00:00:00 2001 -+From: Giulio Benetti -+Date: Thu, 17 Dec 2020 01:19:33 +0100 -+Subject: [PATCH] mali: support building against 5.10 -+ -+Starting from Linux version 5.10.0 has been -+removed and its content moved to and this leads -+to build failure with Linux 5.10. So let's include -+ only if we're building with Linux -+version < 5.10.0. -+ -+Signed-off-by: Giulio Benetti -+--- -+ src/devicedrv/mali/platform/sunxi/sunxi.c | 3 +++ -+ 1 file changed, 3 insertions(+) -+ -+diff --git a/src/devicedrv/mali/platform/sunxi/sunxi.c b/src/devicedrv/mali/platform/sunxi/sunxi.c -+index 74ebe0b..a8df0d9 100644 -+--- a/src/devicedrv/mali/platform/sunxi/sunxi.c -++++ b/src/devicedrv/mali/platform/sunxi/sunxi.c -+@@ -3,7 +3,10 @@ -+ #include -+ #include -+ #include -++#include -++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) -+ #include -++#endif -+ #include -+ #include -+ #include -+-- -+2.25.1 -+ -diff --git a/patches/r6p0/series b/patches/r6p0/series -index 4074177..5d4883f 100644 ---- a/patches/r6p0/series -+++ b/patches/r6p0/series -@@ -18,3 +18,4 @@ r6p0/0013-mali-support-building-against-4.15.patch - r6p0/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch - r6p0/0024-mali-support-building-against-5.9.patch -+0025-mali-support-building-against-5.10.patch -diff --git a/patches/r6p2/series b/patches/r6p2/series -index 775bc6f..e19cf11 100644 ---- a/patches/r6p2/series -+++ b/patches/r6p2/series -@@ -21,3 +21,4 @@ r6p2/0016-mali-support-building-against-4.16.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch - r6p2/0024-mali-support-building-against-5.9.patch -+0025-mali-support-building-against-5.10.patch -diff --git a/patches/r8p1/series b/patches/r8p1/series -index 0f15e40..4ad43c1 100644 ---- a/patches/r8p1/series -+++ b/patches/r8p1/series -@@ -16,3 +16,4 @@ r8p1/0017-mali-support-building-against-4.9-later.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch - 0024-mali-support-building-against-5.9.patch -+0025-mali-support-building-against-5.10.patch -diff --git a/patches/r9p0/series b/patches/r9p0/series -index 866e869..dca4e02 100644 ---- a/patches/r9p0/series -+++ b/patches/r9p0/series -@@ -13,3 +13,4 @@ r6p2/0016-mali-support-building-against-4.16.patch - r6p2/0022-mali-support-building-against-5.6.patch - 0023-mali-support-building-against-5.7.patch - 0024-mali-support-building-against-5.9.patch -+0025-mali-support-building-against-5.10.patch --- -2.25.1 - diff --git a/buildroot/package/sunxi-mali-mainline-driver/Config.in b/buildroot/package/sunxi-mali-mainline-driver/Config.in index 057f20db6..5db66c5bf 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/Config.in +++ b/buildroot/package/sunxi-mali-mainline-driver/Config.in @@ -22,4 +22,8 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - CONFIG_CMA - CONFIG_DMA_CMA + starting from Linux Kernel >= 4.20 following options must be + enabled: + - CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM + https://github.com/mripard/sunxi-mali/blob/master/README.md diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash index 9f4b1a669..f08e80f11 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2bb43ed2e64cb081e3bc814941c4de02e785f9984783061cf486d2b0b92407b sunxi-mali-mainline-driver-a588b22f6b3d40ad18070c699f90f36ed21c9f7d.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index 3bb899041..feffaa7ae 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = a588b22f6b3d40ad18070c699f90f36ed21c9f7d +SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 @@ -35,6 +35,7 @@ endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) endef $(eval $(generic-package)) diff --git a/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash index 978be0102..e1c18fd4f 100644 --- a/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/buildroot/package/sunxi-mali-mainline/sunxi-mali-mainline.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72969ecf470b9e5ce787c2f8f36242926e1e892af0891924ee59a2cd206de39f sunxi-mali-mainline-d691cb93884ca8ac67860502117bbec283dc19aa.tar.gz -sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf +sha256 72969ecf470b9e5ce787c2f8f36242926e1e892af0891924ee59a2cd206de39f sunxi-mali-mainline-d691cb93884ca8ac67860502117bbec283dc19aa.tar.gz +sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/buildroot/package/sunxi-tools/Config.in b/buildroot/package/sunxi-tools/Config.in index 80a7130a9..5f7266728 100644 --- a/buildroot/package/sunxi-tools/Config.in +++ b/buildroot/package/sunxi-tools/Config.in @@ -24,14 +24,16 @@ config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO config BR2_PACKAGE_SUNXI_TOOLS_FEL bool "sunxi-fel" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help The sunxi-fel command can interact with a sunxi device in fel mode. This allows do download code to memory and execute it. -comment "sunxi-fel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "sunxi-fel needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART bool "sunxi-nand-part" diff --git a/buildroot/package/sunxi-tools/Config.in.host b/buildroot/package/sunxi-tools/Config.in.host index 5fab5e6ff..51f13cf62 100644 --- a/buildroot/package/sunxi-tools/Config.in.host +++ b/buildroot/package/sunxi-tools/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS bool "host sunxi-tools" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) based devices. This includes fex2bin which can be used to @@ -10,3 +11,7 @@ config BR2_PACKAGE_HOST_SUNXI_TOOLS mainline Linux kernel version. http://linux-sunxi.org/Sunxi-tools + +comment "host sunxi-tools needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/swupdate/swupdate.sh b/buildroot/package/swupdate/swupdate.sh index 17d99ef0d..31ec53637 100644 --- a/buildroot/package/swupdate/swupdate.sh +++ b/buildroot/package/swupdate/swupdate.sh @@ -5,6 +5,9 @@ # Override these variables in sourced script(s) located # in /usr/lib/swupdate/conf.d or /etc/swupdate/conf.d +# NOTE: There are substrings used in some swupdate commands which will +# need to be wrapped in a script to prevent tokenizing +# ( -p/-P post/pre cmds are good examples) SWUPDATE_ARGS="-v ${SWUPDATE_EXTRA_ARGS}" SWUPDATE_WEBSERVER_ARGS="" SWUPDATE_SURICATTA_ARGS="" diff --git a/buildroot/package/sysklogd/Config.in b/buildroot/package/sysklogd/Config.in index fda58e020..3315a6ddc 100644 --- a/buildroot/package/sysklogd/Config.in +++ b/buildroot/package/sysklogd/Config.in @@ -1,8 +1,48 @@ config BR2_PACKAGE_SYSKLOGD - bool "syslogd & klogd" + bool "sysklogd" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - System log daemons syslogd and klogd. + The continuation of the original sysklogd package, based on + the original Berkeley syslog daemon. Now with kernel + logging, and log rotation built-in. It can both receive from + and send to remote syslog servers. The v2.x series include + extended support for RFC5424 with an alt. syslogp() API for + clients. https://github.com/troglobit/sysklogd/ + +if BR2_PACKAGE_SYSKLOGD + +config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY + int "Retry delay (sec)" + default "180" + help + Retry delay (seconds) for sending to remote syslog servers. + + When set up to forward logs to a remote syslog server, the + network may not always be available. E.g., default interface + down, or no route to the remote server. This setting controls + the back-off time before retrying. + + Default: 180 seconds + +config BR2_PACKAGE_SYSKLOGD_LOGGER + bool "logger tool" + help + Generate log messages from scripts or from the command line. + + This version of logger is receommended for use with sysklogd. + It makes use of the new syslogp() API for RFC5424 style logs, + e.g. MSGID, strucutred data (SD), etc. + + The BusyBox, or util-linux, logger tools can also be used, but + are limited to RFC3164 style messages. + +endif + +comment "sysklogd needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/buildroot/package/sysklogd/klogd.service b/buildroot/package/sysklogd/klogd.service deleted file mode 100644 index b5dbb93d7..000000000 --- a/buildroot/package/sysklogd/klogd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Kernel Log Daemon - -[Service] -ExecStart=/sbin/klogd -n -StandardOutput=null -Restart=on-failure - -[Install] -WantedBy=multi-user.target -WantedBy=syslogd.service diff --git a/buildroot/package/sysklogd/sysklogd.hash b/buildroot/package/sysklogd/sysklogd.hash index 6f7ab6ece..ec14363d9 100644 --- a/buildroot/package/sysklogd/sysklogd.hash +++ b/buildroot/package/sysklogd/sysklogd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 a93b7ad6a615336f030d8a3257544cff1644908af6a12c65f65482f27bd39ca9 sysklogd-2.2.1.tar.gz +sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/buildroot/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk index 7a25d0eb6..ff181372b 100644 --- a/buildroot/package/sysklogd/sysklogd.mk +++ b/buildroot/package/sysklogd/sysklogd.mk @@ -4,16 +4,28 @@ # ################################################################################ -SYSKLOGD_VERSION = 1.6 -SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) -SYSKLOGD_LICENSE = GPL-2.0+ -SYSKLOGD_LICENSE_FILES = COPYING -# From git -SYSKLOGD_AUTORECONF = YES -SYSKLOGD_CONF_OPTS = --exec-prefix=/ +SYSKLOGD_VERSION = 2.2.1 +SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) +SYSKLOGD_LICENSE = BSD-3-Clause +SYSKLOGD_LICENSE_FILES = LICENSE +SYSKLOGD_CPE_ID_VALID = YES + +# Busybox install logger in /usr/bin, and syslogd in /sbin, so install in +# the same locations so that busybox does not install its applets in there. +SYSKLOGD_CONF_OPTS = \ + --bindir=/usr/bin \ + --sbindir=/sbin \ + --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) + +# Disable/Enable utilities +ifeq ($(BR2_PACKAGE_SYSKLOGD_LOGGER),y) +SYSKLOGD_CONF_OPTS += --with-logger +else +SYSKLOGD_CONF_OPTS += --without-logger +endif define SYSKLOGD_INSTALL_SAMPLE_CONFIG - $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ + $(INSTALL) -D -m 0644 $(@D)/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf endef @@ -22,15 +34,11 @@ SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG define SYSKLOGD_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/sysklogd/S01syslogd \ $(TARGET_DIR)/etc/init.d/S01syslogd - $(INSTALL) -m 755 -D package/sysklogd/S02klogd \ - $(TARGET_DIR)/etc/init.d/S02klogd endef define SYSKLOGD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/syslogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service - $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/klogd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/sysklogd/syslog.conf b/buildroot/package/sysklogd/syslog.conf deleted file mode 100644 index 318413905..000000000 --- a/buildroot/package/sysklogd/syslog.conf +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/syslog.conf - Configuration file for syslogd - -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none /var/log/messages -user.* /var/log/user.log - -*.emerg * diff --git a/buildroot/package/sysklogd/syslogd.service b/buildroot/package/sysklogd/syslogd.service index adaac679f..c7e724e13 100644 --- a/buildroot/package/sysklogd/syslogd.service +++ b/buildroot/package/sysklogd/syslogd.service @@ -1,10 +1,10 @@ [Unit] Description=System Logging Service Requires=syslog.socket -Wants=klogd.service [Service] -ExecStart=/sbin/syslogd -m 0 -n +EnvironmentFile=-/etc/default/syslogd +ExecStart=/sbin/syslogd -m 0 -F $SYSLOGD_ARGS StandardOutput=null Restart=on-failure diff --git a/buildroot/package/syslog-ng/syslog-ng.conf b/buildroot/package/syslog-ng/syslog-ng.conf index 99f4ea9d6..1cb2ecc36 100644 --- a/buildroot/package/syslog-ng/syslog-ng.conf +++ b/buildroot/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.29 +@version: 3.30 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/buildroot/package/syslog-ng/syslog-ng.hash b/buildroot/package/syslog-ng/syslog-ng.hash index e4c8f26f8..60ea6b3c6 100644 --- a/buildroot/package/syslog-ng/syslog-ng.hash +++ b/buildroot/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5cd6b65466671ec5b793fc703a515e07e0da39b79190b2a3c89af176d07e89fd syslog-ng-3.29.1.tar.gz +sha256 44e54a6186af14d01affa06bf7391cfe8fc2460bd4ba211aab5469d8b1ca5b4b syslog-ng-3.30.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/buildroot/package/syslog-ng/syslog-ng.mk b/buildroot/package/syslog-ng/syslog-ng.mk index 31608f3a0..14888d2ae 100644 --- a/buildroot/package/syslog-ng/syslog-ng.mk +++ b/buildroot/package/syslog-ng/syslog-ng.mk @@ -6,10 +6,11 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.29.1 +SYSLOG_NG_VERSION = 3.30.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt +SYSLOG_NG_CPE_ID_VENDOR = oneidentity SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ libglib2 openssl pcre # We're patching configure.ac diff --git a/buildroot/package/sysrepo/sysrepo.hash b/buildroot/package/sysrepo/sysrepo.hash index cdd2f7e47..d0b3c82ad 100644 --- a/buildroot/package/sysrepo/sysrepo.hash +++ b/buildroot/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0f894d4ed98ce9d20fda219378b844731d796e95115c07f4c067d853e20ca36 sysrepo-1.4.70.tar.gz +sha256 635f68ad5f8cb5ea3bd7c3081963f1a9a79ee0d6570facb1f3bcbf3b640446a4 sysrepo-1.4.104.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/buildroot/package/sysrepo/sysrepo.mk b/buildroot/package/sysrepo/sysrepo.mk index 8a2e56bd6..e4d553cdb 100644 --- a/buildroot/package/sysrepo/sysrepo.mk +++ b/buildroot/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 1.4.70 +SYSREPO_VERSION = 1.4.104 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = Apache-2.0 diff --git a/buildroot/package/sysstat/sysstat.hash b/buildroot/package/sysstat/sysstat.hash index 57fc8f181..b573f312c 100644 --- a/buildroot/package/sysstat/sysstat.hash +++ b/buildroot/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 4da5a48d0152eba5b34d94bf28dcb08fc48fb32b sysstat-12.2.1.tar.xz +sha1 1e38bc029979def730ae1fb1e39f631bd1a3bc73 sysstat-12.4.2.tar.xz # Locally calculated -sha256 8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732 sysstat-12.2.1.tar.xz +sha256 3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f sysstat-12.4.2.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/buildroot/package/sysstat/sysstat.mk b/buildroot/package/sysstat/sysstat.mk index f994ad6e3..7d254d664 100644 --- a/buildroot/package/sysstat/sysstat.mk +++ b/buildroot/package/sysstat/sysstat.mk @@ -4,13 +4,19 @@ # ################################################################################ -SYSSTAT_VERSION = 12.2.1 +SYSSTAT_VERSION = 12.4.2 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard -SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors +SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING -SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" + +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +SYSSTAT_DEPENDENCIES += lm-sensors +SYSSTAT_CONF_OPTS += --enable-sensors +else +SYSSTAT_CONF_OPTS += --disable-sensors +endif $(eval $(autotools-package)) diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in index ec34478e3..fbe1a4081 100644 --- a/buildroot/package/systemd/Config.in +++ b/buildroot/package/systemd/Config.in @@ -343,6 +343,24 @@ comment "polkit support needs a toolchain with C++, wchar, NPTL, gcc >= 4.9" !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_USE_WCHAR +config BR2_PACKAGE_SYSTEMD_PORTABLED + bool "enable portable services" + help + Portable services are systemd services that can be dynamically + attached and detached from the system. + + These services must come with their own root directory which + they are bound to through an automatically generated drop-in. + + They also have restrictions applied by the host system in the + form of profiles. + + This functionality is provided by the system service + systemd-portabled along with the corresponding CLI + portablectl. + + https://systemd.io/PORTABLE_SERVICES/ + config BR2_PACKAGE_SYSTEMD_QUOTACHECK bool "enable quotacheck tools" help diff --git a/buildroot/package/systemd/systemd.hash b/buildroot/package/systemd/systemd.hash index 0c2ba1e1c..20cd92225 100644 --- a/buildroot/package/systemd/systemd.hash +++ b/buildroot/package/systemd/systemd.hash @@ -1,6 +1,6 @@ # sha256 locally computed -sha256 3a972d287edd864e0b33321bc74dfe6083d390306461fa7e958895eaa4be6b67 systemd-246.10.tar.gz +sha256 2869986e219a8dfc96cc0dffac66e0c13bb70a89e16b85a3948876c146cfa3e0 systemd-247.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README +sha256 6f22d19d35b00f35e0444e0bc9139e6d3bdf7277978f89c4e175e37b18c43f3d README sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index 51a316005..64f23c38a 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 246.10 +SYSTEMD_VERSION = 247.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE @@ -32,8 +32,8 @@ SYSTEMD_CONF_OPTS += \ -Dloadkeys-path=/usr/bin/loadkeys \ -Dman=false \ -Dmount-path=/usr/bin/mount \ + -Dmode=release \ -Dnss-systemd=true \ - -Dportabled=false \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ -Drootlibdir='/usr/lib' \ @@ -417,6 +417,12 @@ else SYSTEMD_CONF_OPTS += -Dpolkit=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_PORTABLED),y) +SYSTEMD_CONF_OPTS += -Dportabled=true +else +SYSTEMD_CONF_OPTS += -Dportabled=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management @@ -643,6 +649,7 @@ HOST_SYSTEMD_CONF_OPTS = \ --libdir=lib \ --sysconfdir=/etc \ --localstatedir=/var \ + -Dmode=release \ -Dutmp=false \ -Dhibernate=false \ -Dldconfig=false \ diff --git a/buildroot/package/sysvinit/sysvinit.hash b/buildroot/package/sysvinit/sysvinit.hash index c1d9f9446..24e5333d2 100644 --- a/buildroot/package/sysvinit/sysvinit.hash +++ b/buildroot/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587 sysvinit-2.96.tar.xz +sha256 7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc sysvinit-2.98.tar.xz # Hash for license files: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/sysvinit/sysvinit.mk b/buildroot/package/sysvinit/sysvinit.mk index c778a9cde..c7ddf67c2 100644 --- a/buildroot/package/sysvinit/sysvinit.mk +++ b/buildroot/package/sysvinit/sysvinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSVINIT_VERSION = 2.96 +SYSVINIT_VERSION = 2.98 SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ diff --git a/buildroot/package/taglib/Config.in b/buildroot/package/taglib/Config.in index 9e6bb707f..6a87a1321 100644 --- a/buildroot/package/taglib/Config.in +++ b/buildroot/package/taglib/Config.in @@ -11,15 +11,5 @@ config BR2_PACKAGE_TAGLIB http://taglib.org/ -if BR2_PACKAGE_TAGLIB - -config BR2_PACKAGE_TAGLIB_MP4 - bool "taglib mp4 support" - -config BR2_PACKAGE_TAGLIB_ASF - bool "taglib wma support" - -endif - comment "taglib needs a toolchain w/ C++, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/buildroot/package/taglib/taglib.mk b/buildroot/package/taglib/taglib.mk index 9381e1667..738be3575 100644 --- a/buildroot/package/taglib/taglib.mk +++ b/buildroot/package/taglib/taglib.mk @@ -20,14 +20,6 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) TAGLIB_DEPENDENCIES += zlib endif -ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y) -TAGLIB_CONF_OPTS += -DWITH_ASF=ON -endif - -ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y) -TAGLIB_CONF_OPTS += -DWITH_MP4=ON -endif - define TAGLIB_REMOVE_DEVFILE rm -f $(TARGET_DIR)/usr/bin/taglib-config endef diff --git a/buildroot/package/tar/tar.hash b/buildroot/package/tar/tar.hash index 90beb2609..72f0cd6fc 100644 --- a/buildroot/package/tar/tar.hash +++ b/buildroot/package/tar/tar.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -sha256 d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 tar-1.32.tar.xz -sha256 9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1 tar-1.29.cpio.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 tar-1.32.tar.xz +sha256 9fbfba0cba05233421dd619b8825e1ceb7c144e433c15ae48b68f17ede8d404a tar-1.32.cpio.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/tar/tar.mk b/buildroot/package/tar/tar.mk index 9e0a40e56..2da731f80 100644 --- a/buildroot/package/tar/tar.mk +++ b/buildroot/package/tar/tar.mk @@ -12,6 +12,7 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING +TAR_CPE_ID_VENDOR = gnu ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl @@ -29,14 +30,10 @@ endif $(eval $(autotools-package)) -# host-tar is used to create the archives in the VCS download backends and tar -# 1.30 and forward have changed the archive format. So archives generated with -# earlier versions are not bit-for-bit reproducible and the hashes would not -# match. Hence host-tar must be kept at version 1.29. -HOST_TAR_VERSION = 1.29 # host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem # of needing tar to build tar. -HOST_TAR_SOURCE = tar-$(HOST_TAR_VERSION).cpio.gz +HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz + define HOST_TAR_EXTRACT_CMDS mkdir -p $(@D) cd $(@D) && \ diff --git a/buildroot/package/tcl/tcl.mk b/buildroot/package/tcl/tcl.mk index 6d750b3cd..7c456e89b 100644 --- a/buildroot/package/tcl/tcl.mk +++ b/buildroot/package/tcl/tcl.mk @@ -10,6 +10,7 @@ TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL TCL_LICENSE_FILES = license.terms +TCL_CPE_ID_VENDOR = tcl TCL_SUBDIR = unix TCL_INSTALL_STAGING = YES TCL_AUTORECONF = YES diff --git a/buildroot/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch b/buildroot/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch deleted file mode 100644 index 9e8674ac9..000000000 --- a/buildroot/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) - -[Retrieved from: -https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231] -Signed-off-by: Fabrice Fontaine ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 891761728..33fb03412 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo, - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; diff --git a/buildroot/package/tcpdump/tcpdump.hash b/buildroot/package/tcpdump/tcpdump.hash index da5c9aa74..4aea5b7cb 100644 --- a/buildroot/package/tcpdump/tcpdump.hash +++ b/buildroot/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# http://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.0.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410 tcpdump-4.9.3.tar.gz -sha256 9b03d5d13e66d6de02a4bb2d0dd1cb9f41808d045962cdcc42350d5291b141a1 LICENSE +sha256 8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842 tcpdump-4.99.0.tar.gz +sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/buildroot/package/tcpdump/tcpdump.mk b/buildroot/package/tcpdump/tcpdump.mk index 8db35694e..c562034a4 100644 --- a/buildroot/package/tcpdump/tcpdump.mk +++ b/buildroot/package/tcpdump/tcpdump.mk @@ -4,30 +4,25 @@ # ################################################################################ -TCPDUMP_VERSION = 4.9.3 -TCPDUMP_SITE = http://www.tcpdump.org/release +TCPDUMP_VERSION = 4.99.0 +TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE +TCPDUMP_CPE_ID_VENDOR = tcpdump TCPDUMP_CONF_ENV = \ ac_cv_linux_vers=2 \ td_cv_buggygetaddrinfo=no \ PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config TCPDUMP_CONF_OPTS = \ --without-crypto \ - --with-system-libpcap \ + --disable-local-libpcap \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = libpcap - -# 0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch -TCPDUMP_IGNORE_CVES += CVE-2020-8037 - -ifeq ($(BR2_STATIC_LIBS),y) -TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif +TCPDUMP_DEPENDENCIES = libpcap host-pkgconf +TCPDUMP_SELINUX_MODULES = netutils # make install installs an unneeded extra copy of the tcpdump binary define TCPDUMP_REMOVE_DUPLICATED_BINARY - rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION) + rm -f $(TARGET_DIR)/usr/bin/tcpdump.$(TCPDUMP_VERSION) endef TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY diff --git a/buildroot/package/tcpreplay/tcpreplay.mk b/buildroot/package/tcpreplay/tcpreplay.mk index 8b395b496..9208cb817 100644 --- a/buildroot/package/tcpreplay/tcpreplay.mk +++ b/buildroot/package/tcpreplay/tcpreplay.mk @@ -9,6 +9,7 @@ TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPRE TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 TCPREPLAY_LICENSE_FILES = docs/LICENSE +TCPREPLAY_CPE_ID_VENDOR = tcpreplay TCPREPLAY_CONF_ENV = \ ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ diff --git a/buildroot/package/tegrarcm/Config.in.host b/buildroot/package/tegrarcm/Config.in.host index d8cbb947d..937d81bd5 100644 --- a/buildroot/package/tegrarcm/Config.in.host +++ b/buildroot/package/tegrarcm/Config.in.host @@ -1,8 +1,13 @@ config BR2_PACKAGE_HOST_TEGRARCM bool "host tegrarcm" depends on BR2_arm || BR2_armeb + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb help This program is used to send code to a Tegra device in recovery mode. https://github.com/NVIDIA/tegrarcm + +comment "host tegrarcm needs a toolchain w/ host gcc >= 4.9" + depends on BR2_arm || BR2_armeb + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/tftpd/tftpd.mk b/buildroot/package/tftpd/tftpd.mk index 57905fda0..494e963d6 100644 --- a/buildroot/package/tftpd/tftpd.mk +++ b/buildroot/package/tftpd/tftpd.mk @@ -10,6 +10,8 @@ TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa TFTPD_CONF_OPTS = --without-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c +TFTPD_CPE_ID_VENDOR = tftpd-hpa_project +TFTPD_CPE_ID_PRODUCT = tftpd-hpa define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp diff --git a/buildroot/package/thrift/thrift.mk b/buildroot/package/thrift/thrift.mk index 8ad37b6b2..0f2a8eb07 100644 --- a/buildroot/package/thrift/thrift.mk +++ b/buildroot/package/thrift/thrift.mk @@ -8,6 +8,7 @@ THRIFT_VERSION = 0.13.0 THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) THRIFT_LICENSE = Apache-2.0 THRIFT_LICENSE_FILES = LICENSE +THRIFT_CPE_ID_VENDOR = apache THRIFT_DEPENDENCIES = host-pkgconf host-thrift boost \ libevent openssl zlib diff --git a/buildroot/package/thttpd/thttpd.mk b/buildroot/package/thttpd/thttpd.mk index fe96f7df6..3815705b5 100644 --- a/buildroot/package/thttpd/thttpd.mk +++ b/buildroot/package/thttpd/thttpd.mk @@ -8,6 +8,7 @@ THTTPD_VERSION = 2.29 THTTPD_SITE = https://acme.com/software/thttpd THTTPD_LICENSE = BSD-2-Clause THTTPD_LICENSE_FILES = thttpd.c +THTTPD_CPE_ID_VENDOR = acme THTTPD_MAKE = $(MAKE1) diff --git a/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash b/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash index 31044e9e3..e5631c963 100644 --- a/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash +++ b/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz -sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt +sha256 5564741d7669b6303e52f4c0d1eaa04aa2633c0c6ad8ff7c5295b7ef3764c719 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287-br1.tar.gz +sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt diff --git a/buildroot/package/ti-sgx-km/ti-sgx-km.hash b/buildroot/package/ti-sgx-km/ti-sgx-km.hash index 1fd07d746..c7030b222 100644 --- a/buildroot/package/ti-sgx-km/ti-sgx-km.hash +++ b/buildroot/package/ti-sgx-km/ti-sgx-km.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz -sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING +sha256 213b4ff3893c74f026a06404dca185216809d062e54d17c2302d56ff7ede5181 ti-sgx-km-cf7f48cb30abfd5df7a60c9bf4bbb1dde0d496d9-br1.tar.gz +sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING diff --git a/buildroot/package/ti-sgx-km/ti-sgx-km.mk b/buildroot/package/ti-sgx-km/ti-sgx-km.mk index d5fd3b470..8ca6dbde2 100644 --- a/buildroot/package/ti-sgx-km/ti-sgx-km.mk +++ b/buildroot/package/ti-sgx-km/ti-sgx-km.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This corresponds to SDK 06.00.00.07 -TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d +# This corresponds to SDK 06.01.00.08 +TI_SGX_KM_VERSION = cf7f48cb30abfd5df7a60c9bf4bbb1dde0d496d9 TI_SGX_KM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_SITE_METHOD = git TI_SGX_KM_LICENSE = GPL-2.0 diff --git a/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch b/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch deleted file mode 100644 index 2863c93be..000000000 --- a/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e3a3f3655956265eb4f3b866d445a9d19e613594 Mon Sep 17 00:00:00 2001 -From: Lothar Felten -Date: Thu, 14 Nov 2019 23:37:07 -0300 -Subject: [PATCH] Add missing sys/sysmacros.h include - -Signed-off-by: Lothar Felten ---- - gbm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gbm.c b/gbm.c -index 7bc5880..e360da7 100644 ---- a/gbm.c -+++ b/gbm.c -@@ -36,6 +36,7 @@ - - #include - #include -+#include - #include - #include - --- -2.18.1 - diff --git a/buildroot/package/ti-sgx-libgbm/Config.in b/buildroot/package/ti-sgx-libgbm/Config.in deleted file mode 100644 index 2c679e204..000000000 --- a/buildroot/package/ti-sgx-libgbm/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TI_SGX_LIBGBM - bool "ti-sgx-libgbm" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBDRM - help - TI SGX libgbm variant. - - https://git.ti.com/cgit/glsdk/libgbm - -comment "ti-sgx-libgbm needs udev and a toolchain w/ threads" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash deleted file mode 100644 index 32af5ad5a..000000000 --- a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 85e3eafcd06caccd8c4cea3081b1406ae51c07e19541ac19b9c33a5b41fec82d ti-sgx-libgbm-c5ddc6a37bb78ac753b317b17d890d1f7338dea6.tar.gz -sha256 58fe00de76ae5d533e1c562950e1848682c03155a653d76870cf0a3c59be8b4c gbm.h diff --git a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk deleted file mode 100644 index 00a0716e2..000000000 --- a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# ti-sgx-libgbm -# -################################################################################ - -# This correpsonds to SDK 06.00.00.07 -TI_SGX_LIBGBM_VERSION = c5ddc6a37bb78ac753b317b17d890d1f7338dea6 -TI_SGX_LIBGBM_SITE = http://git.ti.com/git/glsdk/libgbm.git -TI_SGX_LIBGBM_SITE_METHOD = git -TI_SGX_LIBGBM_LICENSE = MIT -TI_SGX_LIBGBM_LICENSE_FILES = gbm.h -TI_SGX_LIBGBM_INSTALL_STAGING = YES -TI_SGX_LIBGBM_AUTORECONF = YES - -TI_SGX_LIBGBM_DEPENDENCIES = libdrm udev - -define TI_SGX_LIBGBM_INSTALL_TARGET_OPTS - PREFIX=/usr \ - STRIP=/bin/true \ - DESTDIR=$(TARGET_DIR) \ - install -endef - -define TI_SGX_LIBGBM_INSTALL_STAGING_OPTS - PREFIX=/usr \ - STRIP=/bin/true \ - DESTDIR=$(STAGING_DIR) \ - install -endef - -$(eval $(autotools-package)) diff --git a/buildroot/package/ti-sgx-um/Config.in b/buildroot/package/ti-sgx-um/Config.in index ee87d46aa..b97469a36 100644 --- a/buildroot/package/ti-sgx-um/Config.in +++ b/buildroot/package/ti-sgx-um/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_TI_SGX_UM bool "ti-sgx-um" depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm - depends on BR2_PACKAGE_HAS_UDEV # ti-sgx-libgbm + depends on BR2_PACKAGE_HAS_UDEV # pre-built binaries depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBDRM @@ -17,7 +17,6 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR - select BR2_PACKAGE_TI_SGX_LIBGBM select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_WAYLAND help diff --git a/buildroot/package/ti-sgx-um/ti-sgx-um.hash b/buildroot/package/ti-sgx-um/ti-sgx-um.hash index ff54ecbd6..109b2e9e5 100644 --- a/buildroot/package/ti-sgx-um/ti-sgx-um.hash +++ b/buildroot/package/ti-sgx-um/ti-sgx-um.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz -sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc +sha256 e52c743194516fcc92d570bc5a26dfaa26d18c13d92d41640019f544ef25be3a ti-sgx-um-909e237baf47d0bde006ff25552f5403fd7e359d-br1.tar.gz +sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc diff --git a/buildroot/package/ti-sgx-um/ti-sgx-um.mk b/buildroot/package/ti-sgx-um/ti-sgx-um.mk index bf7d22563..83dbc6804 100644 --- a/buildroot/package/ti-sgx-um/ti-sgx-um.mk +++ b/buildroot/package/ti-sgx-um/ti-sgx-um.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This corresponds to SDK 06.00.00.07 plus one pull request -TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 +# This corresponds to SDK 06.01.00.08 +TI_SGX_UM_VERSION = 909e237baf47d0bde006ff25552f5403fd7e359d TI_SGX_UM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License diff --git a/buildroot/package/tiff/tiff.hash b/buildroot/package/tiff/tiff.hash index 36f30c441..472ec40e5 100644 --- a/buildroot/package/tiff/tiff.hash +++ b/buildroot/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634 tiff-4.1.0.tar.gz +sha256 eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb tiff-4.2.0.tar.gz sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT diff --git a/buildroot/package/tiff/tiff.mk b/buildroot/package/tiff/tiff.mk index b26900ac7..7568215f9 100644 --- a/buildroot/package/tiff/tiff.mk +++ b/buildroot/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.1.0 +TIFF_VERSION = 4.2.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/timescaledb/0001-Allow-building-against-PG13-source.patch b/buildroot/package/timescaledb/0001-Allow-building-against-PG13-source.patch new file mode 100644 index 000000000..96de99144 --- /dev/null +++ b/buildroot/package/timescaledb/0001-Allow-building-against-PG13-source.patch @@ -0,0 +1,85 @@ +From 64c17f08c4a78cf6063651632d95906ab3bcb41b Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 19 Sep 2020 17:43:52 +0200 +Subject: [PATCH] Allow building against PG13 source + +This patch adjusts the version checks to allow building against +postgres 13. It also adjusts the cmake version check to allow +building against RC and devel versions. + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/21dc9b9c1a307e46eda5fa621488ebeb6ee9636c.patch +--- + CMakeLists.txt | 18 ++++++++---------- + src/compat.h | 7 ++++++- + 2 files changed, 14 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8288b444..ce6e9d48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -221,27 +221,25 @@ execute_process( + OUTPUT_VARIABLE PG_VERSION_STRING + OUTPUT_STRIP_TRAILING_WHITESPACE) + +-if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)\\.([0-9]+)(\\.([0-9]+))*") ++if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)(\\.([0-9]+)|devel|rc[0-9]+)") + message(FATAL_ERROR "Could not parse PostgreSQL version ${PG_VERSION_STRING}") + endif () + + set(PG_VERSION_MAJOR ${CMAKE_MATCH_1}) +-set(PG_VERSION_MINOR ${CMAKE_MATCH_2}) +-set(PG_VERSION_PATCH ${CMAKE_MATCH_4}) +- +-if (NOT ${PG_VERSION_PATCH} OR ${PG_VERSION_PATCH} EQUAL "") +- set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}") +-else () +- set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}.${PG_VERSION_PATCH}") ++if (${CMAKE_MATCH_COUNT} GREATER "2" ) ++ set(PG_VERSION_MINOR ${CMAKE_MATCH_3}) ++else() ++ set(PG_VERSION_MINOR 0) + endif () ++set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}") + + message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}") + + # Ensure that PostgreSQL version is supported and consistent + # with src/compat.h version check + if ((${PG_VERSION_MAJOR} LESS "11") OR +- (${PG_VERSION_MAJOR} GREATER "12")) +- message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 11 and 12") ++ (${PG_VERSION_MAJOR} GREATER "13")) ++ message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 11, 12 and 13") + endif() + + # Get PostgreSQL configuration from pg_config +diff --git a/src/compat.h b/src/compat.h +index 475217c6..267bb09a 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -24,15 +24,20 @@ + + #define is_supported_pg_version_11(version) ((version >= 110000) && (version < 120000)) + #define is_supported_pg_version_12(version) ((version >= 120000) && (version < 130000)) ++#define is_supported_pg_version_13(version) ((version >= 130000) && (version < 140000)) + + #define is_supported_pg_version(version) \ +- (is_supported_pg_version_11(version) || is_supported_pg_version_12(version)) ++ (is_supported_pg_version_11(version) || is_supported_pg_version_12(version) || \ ++ is_supported_pg_version_13(version)) + + #define PG11 is_supported_pg_version_11(PG_VERSION_NUM) + #define PG12 is_supported_pg_version_12(PG_VERSION_NUM) ++#define PG13 is_supported_pg_version_13(PG_VERSION_NUM) + + #define PG12_LT PG11 + #define PG12_GE !(PG12_LT) ++#define PG13_LT !(PG13) ++#define PG13_GE PG13 + + #if !(is_supported_pg_version(PG_VERSION_NUM)) + #error "Unsupported PostgreSQL version" +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch b/buildroot/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch new file mode 100644 index 000000000..d54b49ef2 --- /dev/null +++ b/buildroot/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch @@ -0,0 +1,73 @@ +From b020863a3ea18488448bc09234a4e3b26b68058d Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 19 Sep 2020 19:17:38 +0200 +Subject: [PATCH] Add compatibilty wrapper functions for base64 + encoding/decoding + +PG13 adds a destination length 4th argument to pg_b64_decode and +pg_b64_encode functions so this patch adds a macro that translates +to the 3 argument and 4 argument calls depending on postgres version. +This patch also adds checking of return values for those functions. + +https://github.com/postgres/postgres/commit/cfc40d384a + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/002510cb01e1d09767a526560f89c1857c1738a2.patch +--- + src/compat.h | 11 +++++++++++ + tsl/src/compression/compression.c | 12 ++++++++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/src/compat.h b/src/compat.h +index 267bb09a..d84f8754 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -347,4 +347,15 @@ get_vacuum_options(const VacuumStmt *stmt) + #endif + } + ++/* PG13 added a dstlen parameter to pg_b64_decode and pg_b64_encode */ ++#if PG13_LT ++#define pg_b64_encode_compat(src, srclen, dst, dstlen) pg_b64_encode((src), (srclen), (dst)) ++#define pg_b64_decode_compat(src, srclen, dst, dstlen) pg_b64_decode((src), (srclen), (dst)) ++#else ++#define pg_b64_encode_compat(src, srclen, dst, dstlen) \ ++ pg_b64_encode((src), (srclen), (dst), (dstlen)) ++#define pg_b64_decode_compat(src, srclen, dst, dstlen) \ ++ pg_b64_decode((src), (srclen), (dst), (dstlen)) ++#endif ++ + #endif /* TIMESCALEDB_COMPAT_H */ +diff --git a/tsl/src/compression/compression.c b/tsl/src/compression/compression.c +index 470ec4b9..169f74e9 100644 +--- a/tsl/src/compression/compression.c ++++ b/tsl/src/compression/compression.c +@@ -1424,7 +1424,11 @@ tsl_compressed_data_in(PG_FUNCTION_ARGS) + + decoded_len = pg_b64_dec_len(input_len); + decoded = palloc(decoded_len + 1); +- decoded_len = pg_b64_decode(input, input_len, decoded); ++ decoded_len = pg_b64_decode_compat(input, input_len, decoded, decoded_len); ++ ++ if (decoded_len < 0) ++ elog(ERROR, "could not decode base64-encoded compressed data"); ++ + decoded[decoded_len] = '\0'; + data = (StringInfoData){ + .data = decoded, +@@ -1446,7 +1450,11 @@ tsl_compressed_data_out(PG_FUNCTION_ARGS) + const char *raw_data = VARDATA(bytes); + int encoded_len = pg_b64_enc_len(raw_len); + char *encoded = palloc(encoded_len + 1); +- encoded_len = pg_b64_encode(raw_data, raw_len, encoded); ++ encoded_len = pg_b64_encode_compat(raw_data, raw_len, encoded, encoded_len); ++ ++ if (encoded_len < 0) ++ elog(ERROR, "could not base64-encode compressed data"); ++ + encoded[encoded_len] = '\0'; + + PG_RETURN_CSTRING(encoded); +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch b/buildroot/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch new file mode 100644 index 000000000..382c4e925 --- /dev/null +++ b/buildroot/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch @@ -0,0 +1,149 @@ +From e68915d0aad6760c1feebb04219af9bfbccd71d7 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 26 Sep 2020 13:58:17 +0200 +Subject: [PATCH] Add missing utils/acl.h includes + +PG13 removed acl.h from objectaddress.h so the places that need it +need to now include it explicitly if they got it indirectly this +way previously. + +https://github.com/postgres/postgres/commit/3c173a53a8 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/be8dd086a089f7419824bbc3b77182b95d0bbba7.patch +--- + src/bgw/job.c | 1 + + src/bgw/scheduler.c | 1 + + src/chunk.c | 1 + + src/chunk_adaptive.c | 1 + + src/extension_utils.c | 1 + + src/license_guc.c | 1 + + src/process_utility.c | 1 + + tsl/src/bgw_policy/continuous_aggregate_api.c | 1 + + tsl/src/bgw_policy/job_api.c | 1 + + tsl/src/continuous_aggs/refresh.c | 1 + + 10 files changed, 10 insertions(+) + +diff --git a/src/bgw/job.c b/src/bgw/job.c +index 313caa94..3ae8c9f7 100644 +--- a/src/bgw/job.c ++++ b/src/bgw/job.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c +index 2d024317..7a7e360c 100644 +--- a/src/bgw/scheduler.c ++++ b/src/bgw/scheduler.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/chunk.c b/src/chunk.c +index c2671885..e5ffc3fa 100644 +--- a/src/chunk.c ++++ b/src/chunk.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/chunk_adaptive.c b/src/chunk_adaptive.c +index 470248ed..88e2910b 100644 +--- a/src/chunk_adaptive.c ++++ b/src/chunk_adaptive.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/extension_utils.c b/src/extension_utils.c +index 3fac177b..3d72c5f0 100644 +--- a/src/extension_utils.c ++++ b/src/extension_utils.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/license_guc.c b/src/license_guc.c +index 32629ca9..baa49be5 100644 +--- a/src/license_guc.c ++++ b/src/license_guc.c +@@ -5,6 +5,7 @@ + */ + #include + #include ++#include + #include + #include + #include +diff --git a/src/process_utility.c b/src/process_utility.c +index 3576cb97..8f915113 100644 +--- a/src/process_utility.c ++++ b/src/process_utility.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/tsl/src/bgw_policy/continuous_aggregate_api.c b/tsl/src/bgw_policy/continuous_aggregate_api.c +index 1c18d2e0..596f3bf7 100644 +--- a/tsl/src/bgw_policy/continuous_aggregate_api.c ++++ b/tsl/src/bgw_policy/continuous_aggregate_api.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/tsl/src/bgw_policy/job_api.c b/tsl/src/bgw_policy/job_api.c +index e1c24841..536ce692 100644 +--- a/tsl/src/bgw_policy/job_api.c ++++ b/tsl/src/bgw_policy/job_api.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/tsl/src/continuous_aggs/refresh.c b/tsl/src/continuous_aggs/refresh.c +index 71d5075f..46f83127 100644 +--- a/tsl/src/continuous_aggs/refresh.c ++++ b/tsl/src/continuous_aggs/refresh.c +@@ -4,6 +4,7 @@ + * LICENSE-TIMESCALE for a copy of the license. + */ + #include ++#include + #include + #include + #include +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch b/buildroot/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch new file mode 100644 index 000000000..2412b07d8 --- /dev/null +++ b/buildroot/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch @@ -0,0 +1,473 @@ +From 259ff80eb29c2c70e6afb77d266ce49cccbef223 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 19 Sep 2020 22:20:34 +0200 +Subject: [PATCH] Add support for PG13 List implementation + +PG13 changes the List implementation from a linked list to an array +while most of the API functions did not change a few them have slightly +different signature in PG13, additionally the list_make5 functions +got removed. + +https://github.com/postgres/postgres/commit/1cff1b95ab + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/b1a9c3b7b7d44ee78456931292655d52c252930d.patch +--- + .clang-format | 1 + + src/bgw/scheduler.c | 12 ++++++------ + src/cache.c | 10 ++++++++-- + src/chunk_append/chunk_append.c | 2 +- + src/chunk_append/exec.c | 4 ++-- + src/compat.h | 16 ++++++++++++++++ + src/import/planner.c | 2 +- + src/plan_agg_bookend.c | 7 ++++--- + src/plan_expand_hypertable.c | 13 +++++++++---- + test/src/bgw/test_job_refresh.c | 3 ++- + tsl/src/continuous_aggs/create.c | 2 +- + tsl/src/debug.c | 15 ++++++++++----- + tsl/src/fdw/deparse.c | 6 +++--- + .../nodes/decompress_chunk/decompress_chunk.c | 6 +++--- + tsl/src/nodes/decompress_chunk/exec.c | 3 ++- + tsl/src/nodes/gapfill/planner.c | 11 +++++++---- + 16 files changed, 76 insertions(+), 37 deletions(-) + +diff --git a/.clang-format b/.clang-format +index 5bb275cd..9aac7ef4 100644 +--- a/.clang-format ++++ b/.clang-format +@@ -60,6 +60,7 @@ ForEachMacros: + - foreach + - forboth + - for_each_cell ++ - for_each_cell_compat + - for_both_cell + - forthree + IncludeBlocks: Preserve # separate include blocks will not be merged +diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c +index 7a7e360c..2630ff9f 100644 +--- a/src/bgw/scheduler.c ++++ b/src/bgw/scheduler.c +@@ -456,7 +456,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) + */ + terminate_and_cleanup_job(cur_sjob); + +- cur_ptr = lnext(cur_ptr); ++ cur_ptr = lnext_compat(cur_jobs_list, cur_ptr); + continue; + } + if (cur_sjob->job.fd.id == new_sjob->job.fd.id) +@@ -472,15 +472,15 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) + if (cur_sjob->state == JOB_STATE_SCHEDULED) + scheduled_bgw_job_transition_state_to(new_sjob, JOB_STATE_SCHEDULED); + +- cur_ptr = lnext(cur_ptr); +- new_ptr = lnext(new_ptr); ++ cur_ptr = lnext_compat(cur_jobs_list, cur_ptr); ++ new_ptr = lnext_compat(new_jobs, new_ptr); + } + else if (cur_sjob->job.fd.id > new_sjob->job.fd.id) + { + scheduled_bgw_job_transition_state_to(new_sjob, JOB_STATE_SCHEDULED); + + /* Advance the new_job list until we catch up to cur_list */ +- new_ptr = lnext(new_ptr); ++ new_ptr = lnext_compat(new_jobs, new_ptr); + } + } + +@@ -489,7 +489,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) + { + ListCell *ptr; + +- for_each_cell (ptr, cur_ptr) ++ for_each_cell_compat (ptr, cur_jobs_list, cur_ptr) + terminate_and_cleanup_job(lfirst(ptr)); + } + +@@ -498,7 +498,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) + /* Then there are more new jobs. Initialize all of them. */ + ListCell *ptr; + +- for_each_cell (ptr, new_ptr) ++ for_each_cell_compat (ptr, new_jobs, new_ptr) + scheduled_bgw_job_transition_state_to(lfirst(ptr), JOB_STATE_SCHEDULED); + } + +diff --git a/src/cache.c b/src/cache.c +index cc6b2d07..3b53485a 100644 +--- a/src/cache.c ++++ b/src/cache.c +@@ -7,6 +7,7 @@ + #include + + #include "cache.h" ++#include "compat.h" + + /* List of pinned caches. A cache occurs once in this list for every pin + * taken */ +@@ -105,7 +106,10 @@ ts_cache_pin(Cache *cache) + static void + remove_pin(Cache *cache, SubTransactionId subtxnid) + { +- ListCell *lc, *prev = NULL; ++ ListCell *lc; ++#if PG13_LT ++ ListCell *prev = NULL; ++#endif + + foreach (lc, pinned_caches) + { +@@ -113,12 +117,14 @@ remove_pin(Cache *cache, SubTransactionId subtxnid) + + if (cp->cache == cache && cp->subtxnid == subtxnid) + { +- pinned_caches = list_delete_cell(pinned_caches, lc, prev); ++ pinned_caches = list_delete_cell_compat(pinned_caches, lc, prev); + pfree(cp); + return; + } + ++#if PG13_LT + prev = lc; ++#endif + } + + /* should never reach here: there should always be a pin to remove */ +diff --git a/src/chunk_append/chunk_append.c b/src/chunk_append/chunk_append.c +index fb1c87ff..ed91ff39 100644 +--- a/src/chunk_append/chunk_append.c ++++ b/src/chunk_append/chunk_append.c +@@ -209,7 +209,7 @@ ts_chunk_append_path_create(PlannerInfo *root, RelOptInfo *rel, Hypertable *ht, + if (is_not_pruned) + { + merge_childs = lappend(merge_childs, child); +- flat = lnext(flat); ++ flat = lnext_compat(children, flat); + if (flat == NULL) + break; + } +diff --git a/src/chunk_append/exec.c b/src/chunk_append/exec.c +index 8f4dd5d6..84f79e23 100644 +--- a/src/chunk_append/exec.c ++++ b/src/chunk_append/exec.c +@@ -344,8 +344,8 @@ initialize_runtime_exclusion(ChunkAppendState *state) + state->runtime_number_exclusions++; + } + +- lc_clauses = lnext(lc_clauses); +- lc_constraints = lnext(lc_constraints); ++ lc_clauses = lnext_compat(state->filtered_ri_clauses, lc_clauses); ++ lc_constraints = lnext_compat(state->filtered_constraints, lc_constraints); + } + + state->runtime_initialized = true; +diff --git a/src/compat.h b/src/compat.h +index d84f8754..51c1c181 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -358,4 +358,20 @@ get_vacuum_options(const VacuumStmt *stmt) + pg_b64_decode((src), (srclen), (dst), (dstlen)) + #endif + ++/* PG13 changes the List implementation from a linked list to an array ++ * while most of the API functions did not change a few them have slightly ++ * different signature in PG13, additionally the list_make5 functions ++ * got removed. */ ++#if PG13_LT ++#define lnext_compat(l, lc) lnext((lc)) ++#define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc), (prev)) ++#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (initcell)) ++#else ++#define lnext_compat(l, lc) lnext((l), (lc)) ++#define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc)) ++#define list_make5(x1, x2, x3, x4, x5) lappend(list_make4(x1, x2, x3, x4), x5) ++#define list_make5_oid(x1, x2, x3, x4, x5) lappend_oid(list_make4_oid(x1, x2, x3, x4), x5) ++#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) ++#endif ++ + #endif /* TIMESCALEDB_COMPAT_H */ +diff --git a/src/import/planner.c b/src/import/planner.c +index 31a4889d..b907390d 100644 +--- a/src/import/planner.c ++++ b/src/import/planner.c +@@ -196,7 +196,7 @@ ts_make_partial_grouping_target(struct PlannerInfo *root, PathTarget *grouping_t + struct List *non_group_cols; + struct List *non_group_exprs; + int i; +- struct ListCell *lc; ++ ListCell *lc; + + partial_target = create_empty_pathtarget(); + non_group_cols = NIL; +diff --git a/src/plan_agg_bookend.c b/src/plan_agg_bookend.c +index d4d06f5b..5394cf5d 100644 +--- a/src/plan_agg_bookend.c ++++ b/src/plan_agg_bookend.c +@@ -696,13 +696,14 @@ build_first_last_path(PlannerInfo *root, FirstLastAggInfo *fl_info, Oid eqop, Oi + if (app->parent_reloid == rte->relid) + { + subroot->append_rel_list = +- list_delete_cell(subroot->append_rel_list, next, prev); +- next = prev != NULL ? prev->next : list_head(subroot->append_rel_list); ++ list_delete_cell_compat(subroot->append_rel_list, next, prev); ++ next = prev != NULL ? lnext_compat(subroot->append_rel_list, next) : ++ list_head(subroot->append_rel_list); + } + else + { + prev = next; +- next = next->next; ++ next = lnext_compat(subroot->append_rel_list, next); + } + } + } +diff --git a/src/plan_expand_hypertable.c b/src/plan_expand_hypertable.c +index 37282ce4..2b99c93b 100644 +--- a/src/plan_expand_hypertable.c ++++ b/src/plan_expand_hypertable.c +@@ -581,7 +581,8 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) + ListCell *prev pg_attribute_unused() = NULL; + List *additional_quals = NIL; + +- for (lc = list_head((List *) quals); lc != NULL; prev = lc, lc = lnext(lc)) ++ for (lc = list_head((List *) quals); lc != NULL; ++ prev = lc, lc = lnext_compat((List *) quals, lc)) + { + Expr *qual = lfirst(lc); + Relids relids = pull_varnos((Node *) qual); +@@ -611,7 +612,7 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) + * is called, so we can remove the functions from that directly + */ + #if PG12_LT +- quals = (Node *) list_delete_cell((List *) quals, lc, prev); ++ quals = (Node *) list_delete_cell_compat((List *) quals, lc, prev); + #endif + return quals; + } +@@ -663,7 +664,9 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) + static List * + remove_exclusion_fns(List *restrictinfo) + { ++#if PG13_LT + ListCell *prev = NULL; ++#endif + ListCell *lc = list_head(restrictinfo); + + while (lc != NULL) +@@ -682,11 +685,13 @@ remove_exclusion_fns(List *restrictinfo) + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("first parameter for chunks_in function needs to be record"))); + +- restrictinfo = list_delete_cell((List *) restrictinfo, lc, prev); ++ restrictinfo = list_delete_cell_compat((List *) restrictinfo, lc, prev); + return restrictinfo; + } ++#if PG13_LT + prev = lc; +- lc = lnext(lc); ++#endif ++ lc = lnext_compat(restrictinfo, lc); + } + return restrictinfo; + } +diff --git a/test/src/bgw/test_job_refresh.c b/test/src/bgw/test_job_refresh.c +index 51a3b0d7..d51415d4 100644 +--- a/test/src/bgw/test_job_refresh.c ++++ b/test/src/bgw/test_job_refresh.c +@@ -13,6 +13,7 @@ + #include + #include + ++#include "compat.h" + #include "export.h" + #include "bgw/scheduler.h" + +@@ -70,7 +71,7 @@ ts_test_job_refresh(PG_FUNCTION_ARGS) + memset(nulls, 0, sizeof(*nulls) * funcctx->tuple_desc->natts); + tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls); + +- funcctx->user_fctx = lnext(lc); ++ funcctx->user_fctx = lnext_compat(cur_scheduled_jobs, lc); + SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple)); + } + +diff --git a/tsl/src/continuous_aggs/create.c b/tsl/src/continuous_aggs/create.c +index bdf4470a..f767dabb 100644 +--- a/tsl/src/continuous_aggs/create.c ++++ b/tsl/src/continuous_aggs/create.c +@@ -1566,7 +1566,7 @@ fixup_userview_query_tlist(Query *userquery, List *tlist_aliases) + if (tle->resjunk) + continue; + tle->resname = pstrdup(strVal(lfirst(alist_item))); +- alist_item = lnext(alist_item); ++ alist_item = lnext_compat(tlist_aliases, alist_item); + if (alist_item == NULL) + break; /* done assigning aliases */ + } +diff --git a/tsl/src/debug.c b/tsl/src/debug.c +index 697bfc0b..023097ee 100644 +--- a/tsl/src/debug.c ++++ b/tsl/src/debug.c +@@ -168,7 +168,7 @@ append_func_expr(StringInfo buf, const Node *expr, const List *rtable) + foreach (l, e->args) + { + append_expr(buf, lfirst(l), rtable); +- if (lnext(l)) ++ if (lnext_compat(e->args, l)) + appendStringInfoString(buf, ", "); + } + appendStringInfoChar(buf, ')'); +@@ -217,7 +217,7 @@ append_restrict_clauses(StringInfo buf, PlannerInfo *root, List *clauses) + RestrictInfo *c = lfirst(cell); + + append_expr(buf, (Node *) c->clause, root->parse->rtable); +- if (lnext(cell)) ++ if (lnext_compat(clauses, cell)) + appendStringInfoString(buf, ", "); + } + } +@@ -270,7 +270,7 @@ append_pathkeys(StringInfo buf, const List *pathkeys, const List *rtable) + append_expr(buf, (Node *) mem->em_expr, rtable); + } + appendStringInfoChar(buf, ')'); +- if (lnext(i)) ++ if (lnext_compat(pathkeys, i)) + appendStringInfoString(buf, ", "); + } + appendStringInfoChar(buf, ')'); +@@ -601,7 +601,10 @@ tsl_debug_append_pruned_pathlist(StringInfo buf, PlannerInfo *root, RelOptInfo * + foreach (lc1, rel->pathlist) + { + Path *p1 = (Path *) lfirst(lc1); +- ListCell *lc2, *prev = NULL; ++ ListCell *lc2; ++#if PG13_LT ++ ListCell *prev = NULL; ++#endif + + foreach (lc2, fdw_info->considered_paths) + { +@@ -610,11 +613,13 @@ tsl_debug_append_pruned_pathlist(StringInfo buf, PlannerInfo *root, RelOptInfo * + if (path_is_origin(p1, p2)) + { + fdw_info->considered_paths = +- list_delete_cell(fdw_info->considered_paths, lc2, prev); ++ list_delete_cell_compat(fdw_info->considered_paths, lc2, prev); + fdw_utils_free_path(p2); + break; + } ++#if PG13_LT + prev = lc2; ++#endif + } + } + +diff --git a/tsl/src/fdw/deparse.c b/tsl/src/fdw/deparse.c +index d90636b5..efd7debb 100644 +--- a/tsl/src/fdw/deparse.c ++++ b/tsl/src/fdw/deparse.c +@@ -2211,7 +2211,7 @@ deparseSubscriptingRef(SubscriptingRef *node, deparse_expr_cxt *context) + { + deparseExpr(lfirst(lowlist_item), context); + appendStringInfoChar(buf, ':'); +- lowlist_item = lnext(lowlist_item); ++ lowlist_item = lnext_compat(node->reflowerindexpr, lowlist_item); + } + deparseExpr(lfirst(uplist_item), context); + appendStringInfoChar(buf, ']'); +@@ -2273,7 +2273,7 @@ deparseFuncExpr(FuncExpr *node, deparse_expr_cxt *context) + { + if (!first) + appendStringInfoString(buf, ", "); +- if (use_variadic && lnext(arg) == NULL) ++ if (use_variadic && lnext_compat(node->args, arg) == NULL) + appendStringInfoString(buf, "VARIADIC "); + deparseExpr((Expr *) lfirst(arg), context); + first = false; +@@ -2601,7 +2601,7 @@ deparseAggref(Aggref *node, deparse_expr_cxt *context) + first = false; + + /* Add VARIADIC */ +- if (use_variadic && lnext(arg) == NULL) ++ if (use_variadic && lnext_compat(node->args, arg) == NULL) + appendStringInfoString(buf, "VARIADIC "); + + deparseExpr((Expr *) n, context); +diff --git a/tsl/src/nodes/decompress_chunk/decompress_chunk.c b/tsl/src/nodes/decompress_chunk/decompress_chunk.c +index 90b6c7c3..1e36f5dc 100644 +--- a/tsl/src/nodes/decompress_chunk/decompress_chunk.c ++++ b/tsl/src/nodes/decompress_chunk/decompress_chunk.c +@@ -182,7 +182,7 @@ build_compressed_scan_pathkeys(SortInfo *sort_info, PlannerInfo *root, List *chu + + for (lc = list_head(chunk_pathkeys); + lc != NULL && bms_num_members(segmentby_columns) < info->num_segmentby_columns; +- lc = lnext(lc)) ++ lc = lnext_compat(chunk_pathkeys, lc)) + { + PathKey *pk = lfirst(lc); + var = (Var *) ts_find_em_expr_for_rel(pk->pk_eclass, info->chunk_rel); +@@ -1210,7 +1210,7 @@ build_sortinfo(RelOptInfo *chunk_rel, CompressionInfo *info, List *pathkeys) + * we keep looping even if we found all segmentby columns in case a + * columns appears both in baserestrictinfo and in ORDER BY clause + */ +- for (; lc != NULL; lc = lnext(lc)) ++ for (; lc != NULL; lc = lnext_compat(pathkeys, lc)) + { + Assert(bms_num_members(segmentby_columns) <= info->num_segmentby_columns); + pk = lfirst(lc); +@@ -1250,7 +1250,7 @@ build_sortinfo(RelOptInfo *chunk_rel, CompressionInfo *info, List *pathkeys) + * loop over the rest of pathkeys + * this needs to exactly match the configured compress_orderby + */ +- for (pk_index = 1; lc != NULL; lc = lnext(lc), pk_index++) ++ for (pk_index = 1; lc != NULL; lc = lnext_compat(pathkeys, lc), pk_index++) + { + bool reverse = false; + pk = lfirst(lc); +diff --git a/tsl/src/nodes/decompress_chunk/exec.c b/tsl/src/nodes/decompress_chunk/exec.c +index 035f2de4..f58e6f6c 100644 +--- a/tsl/src/nodes/decompress_chunk/exec.c ++++ b/tsl/src/nodes/decompress_chunk/exec.c +@@ -121,7 +121,8 @@ initialize_column_state(DecompressChunkState *state) + + state->columns = palloc0(state->num_columns * sizeof(DecompressChunkColumnState)); + +- for (i = 0, lc = list_head(state->varattno_map); i < state->num_columns; lc = lnext(lc), i++) ++ for (i = 0, lc = list_head(state->varattno_map); i < state->num_columns; ++ lc = lnext_compat(state->varattno_map, lc), i++) + { + DecompressChunkColumnState *column = &state->columns[i]; + column->attno = lfirst_int(lc); +diff --git a/tsl/src/nodes/gapfill/planner.c b/tsl/src/nodes/gapfill/planner.c +index 56bdffd5..765a14ce 100644 +--- a/tsl/src/nodes/gapfill/planner.c ++++ b/tsl/src/nodes/gapfill/planner.c +@@ -295,8 +295,10 @@ gapfill_build_pathtarget(PathTarget *pt_upper, PathTarget *pt_path, PathTarget * + /* + * check arguments past first argument dont have Vars + */ +- for (lc_arg = lnext(list_head(context.call.window->args)); lc_arg != NULL; +- lc_arg = lnext(lc_arg)) ++ for (lc_arg = lnext_compat(context.call.window->args, ++ list_head(context.call.window->args)); ++ lc_arg != NULL; ++ lc_arg = lnext_compat(context.call.window->args, lc_arg)) + { + if (contain_var_clause(lfirst(lc_arg))) + ereport(ERROR, +@@ -553,9 +555,10 @@ gapfill_adjust_window_targetlist(PlannerInfo *root, RelOptInfo *input_rel, RelOp + /* + * check arguments past first argument dont have Vars + */ +- for (lc_arg = lnext(list_head(context.call.window->args)); ++ for (lc_arg = lnext_compat(context.call.window->args, ++ list_head(context.call.window->args)); + lc_arg != NULL; +- lc_arg = lnext(lc_arg)) ++ lc_arg = lnext_compat(context.call.window->args, lc_arg)) + { + if (contain_var_clause(lfirst(lc_arg))) + ereport(ERROR, +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch b/buildroot/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch new file mode 100644 index 000000000..f92cfc409 --- /dev/null +++ b/buildroot/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch @@ -0,0 +1,59 @@ +From 4a149cb833dbb45507cd52e63707311e9642587c Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 19 Sep 2020 23:20:37 +0200 +Subject: [PATCH] Adjust code to PG13 list sort changes + +PG13 changes the name of the list sorting function from list_qsort +to list_sort. Additionally PG13 does in-place sort. + +https://github.com/postgres/postgres/commit/569ed7f483 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/13d8aac33b6fc5104c8ad1da816dc0d009fc13a7.patch +--- + src/bgw/scheduler.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c +index 2630ff9f..b9d1aa38 100644 +--- a/src/bgw/scheduler.c ++++ b/src/bgw/scheduler.c +@@ -530,10 +530,15 @@ ts_populate_scheduled_job_tuple(ScheduledBgwJob *sjob, Datum *values) + #endif + + static int ++#if PG13_LT + cmp_next_start(const void *left, const void *right) + { + const ListCell *left_cell = *((ListCell **) left); + const ListCell *right_cell = *((ListCell **) right); ++#else ++cmp_next_start(const ListCell *left_cell, const ListCell *right_cell) ++{ ++#endif + ScheduledBgwJob *left_sjob = lfirst(left_cell); + ScheduledBgwJob *right_sjob = lfirst(right_cell); + +@@ -549,10 +554,18 @@ cmp_next_start(const void *left, const void *right) + static void + start_scheduled_jobs(register_background_worker_callback_type bgw_register) + { ++ List *ordered_scheduled_jobs; + ListCell *lc; + Assert(CurrentMemoryContext == scratch_mctx); ++ + /* Order jobs by increasing next_start */ +- List *ordered_scheduled_jobs = list_qsort(scheduled_jobs, cmp_next_start); ++#if PG13_LT ++ ordered_scheduled_jobs = list_qsort(scheduled_jobs, cmp_next_start); ++#else ++ /* PG13 does in-place sort */ ++ ordered_scheduled_jobs = scheduled_jobs; ++ list_sort(ordered_scheduled_jobs, cmp_next_start); ++#endif + + foreach (lc, ordered_scheduled_jobs) + { +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch b/buildroot/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch new file mode 100644 index 000000000..435273e8a --- /dev/null +++ b/buildroot/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch @@ -0,0 +1,37 @@ +From 196943ff91a6a21c575fbca1f047544970ec4c98 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Thu, 24 Sep 2020 16:18:43 +0200 +Subject: [PATCH] Adjust copy code to PG13 addRTEtoQuery changes + +PG13 removes addRTEtoQuery and provides a similar function +addNSItemToQuery which has a different signature. + +https://github.com/postgres/postgres/commit/5815696bc6 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/10d1c2d698c1b7cbf5af86082287adda4f0c6e97.patch +--- + src/copy.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/copy.c b/src/copy.c +index 2e63dc76..c8ce93e6 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -535,7 +535,12 @@ copy_constraints_and_check(ParseState *pstate, Relation rel, List *attnums) + { + ListCell *cur; + char *xactReadOnly; +-#if PG12_GE ++#if PG13_GE ++ ParseNamespaceItem *nsitem = ++ addRangeTableEntryForRelation(pstate, rel, RowExclusiveLock, NULL, false, false); ++ RangeTblEntry *rte = nsitem->p_rte; ++ addNSItemToQuery(pstate, nsitem, true, true, true); ++#elif PG12 + RangeTblEntry *rte = + addRangeTableEntryForRelation(pstate, rel, RowExclusiveLock, NULL, false, false); + addRTEtoQuery(pstate, rte, false, true, true); +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch b/buildroot/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch new file mode 100644 index 000000000..b6a0362f3 --- /dev/null +++ b/buildroot/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch @@ -0,0 +1,65 @@ +From 1c50cdc9a1c06c58f9fa72ab963d595c9a99d3d8 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Thu, 24 Sep 2020 05:33:38 +0200 +Subject: [PATCH] Adjust code to PG13 convert_tuples_by_name signature + change + +PG13 removed the msg parameter from convert_tuples_by_name. + +https://github.com/postgres/postgres/commit/fe66125974 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/968de59f8cd981ba0ca9cca1929d4ba17fbc256f.patch +--- + src/chunk_insert_state.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/src/chunk_insert_state.c b/src/chunk_insert_state.c +index 398a8811..5dc294df 100644 +--- a/src/chunk_insert_state.c ++++ b/src/chunk_insert_state.c +@@ -379,8 +379,11 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu + + if (NULL == chunk_attnos) + chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), +- RelationGetDescr(first_rel), +- gettext_noop("could not convert row type")); ++ RelationGetDescr(first_rel) ++#if PG13_LT ++ , gettext_noop("could not convert row type") ++#endif ++ ); + + onconflset = translate_clause(ts_chunk_dispatch_get_on_conflict_set(dispatch), + chunk_attnos, +@@ -484,8 +487,11 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) + * to work correctly in mapping hypertable attnos->chunk attnos. + */ + chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), +- RelationGetDescr(hyper_rel), +- gettext_noop("could not convert row type")); ++ RelationGetDescr(hyper_rel) ++#if PG13_LT ++ ,gettext_noop("could not convert row type") ++#endif ++ ); + + chunk_rri->ri_projectReturning = + get_adjusted_projection_info_returning(chunk_rri->ri_projectReturning, +@@ -590,8 +596,11 @@ ts_chunk_insert_state_create(Chunk *chunk, ChunkDispatch *dispatch) + if (chunk->relkind != RELKIND_FOREIGN_TABLE) + state->hyper_to_chunk_map = + convert_tuples_by_name(RelationGetDescr(parent_rel), +- RelationGetDescr(rel), +- gettext_noop("could not convert row type")); ++ RelationGetDescr(rel) ++#if PG13_LT ++ ,gettext_noop("could not convert row type") ++#endif ++ ); + + adjust_projections(state, dispatch, RelationGetForm(rel)->reltype); + +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch b/buildroot/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch new file mode 100644 index 000000000..ce00ac34c --- /dev/null +++ b/buildroot/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch @@ -0,0 +1,259 @@ +From 5c17cb0aa7f06bb3ac15d4ca72a37f59a10fa59e Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Thu, 24 Sep 2020 15:21:04 +0200 +Subject: [PATCH] Adjust code to PG13 tuple conversion changes + +PG13 changes the way attribute mappings are done and uses AttrMap +instead of AttrNumber[] in the new function signatures. This patch +changes ChunkInsertState to use TupleConversionMap which abstracts +this change. + +https://github.com/postgres/postgres/commit/e1551f96e6 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/2cb7c41276c8f8112bd225a020fef709a8e776ff.patch +--- + src/chunk_insert_state.c | 92 +++++++++++++++++++++------------------ + src/compat.h | 15 +++++++ + tsl/src/fdw/modify_exec.c | 4 ++ + 3 files changed, 69 insertions(+), 42 deletions(-) + +diff --git a/src/chunk_insert_state.c b/src/chunk_insert_state.c +index 5dc294df..f8200dd8 100644 +--- a/src/chunk_insert_state.c ++++ b/src/chunk_insert_state.c +@@ -120,7 +120,7 @@ create_chunk_result_relation_info(ChunkDispatch *dispatch, Relation rel) + + static ProjectionInfo * + get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_clauses, +- AttrNumber *map, int map_size, Index varno, Oid rowtype, ++ TupleConversionMap *map, Index varno, Oid rowtype, + TupleDesc chunk_desc) + { + bool found_whole_row; +@@ -128,14 +128,15 @@ get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_cla + Assert(returning_clauses != NIL); + + /* map hypertable attnos -> chunk attnos */ +- returning_clauses = castNode(List, +- map_variable_attnos((Node *) returning_clauses, +- varno, +- 0, +- map, +- map_size, +- rowtype, +- &found_whole_row)); ++ if (map != NULL) ++ returning_clauses = castNode(List, ++ map_variable_attnos_compat((Node *) returning_clauses, ++ varno, ++ 0, ++ map->attrMap, ++ map->outdesc->natts, ++ rowtype, ++ &found_whole_row)); + + return ExecBuildProjectionInfo(returning_clauses, + orig->pi_exprContext, +@@ -145,7 +146,7 @@ get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_cla + } + + static List * +-translate_clause(List *inclause, AttrNumber *chunk_attnos, Index varno, Relation hyper_rel, ++translate_clause(List *inclause, TupleConversionMap *chunk_map, Index varno, Relation hyper_rel, + Relation chunk_rel) + { + List *clause = copyObject(inclause); +@@ -153,23 +154,23 @@ translate_clause(List *inclause, AttrNumber *chunk_attnos, Index varno, Relation + + /* map hypertable attnos -> chunk attnos for the "excluded" table */ + clause = castNode(List, +- map_variable_attnos((Node *) clause, +- INNER_VAR, +- 0, +- chunk_attnos, +- RelationGetDescr(hyper_rel)->natts, +- RelationGetForm(chunk_rel)->reltype, +- &found_whole_row)); ++ map_variable_attnos_compat((Node *) clause, ++ INNER_VAR, ++ 0, ++ chunk_map->attrMap, ++ RelationGetDescr(hyper_rel)->natts, ++ RelationGetForm(chunk_rel)->reltype, ++ &found_whole_row)); + + /* map hypertable attnos -> chunk attnos for the hypertable */ + clause = castNode(List, +- map_variable_attnos((Node *) clause, +- varno, +- 0, +- chunk_attnos, +- RelationGetDescr(hyper_rel)->natts, +- RelationGetForm(chunk_rel)->reltype, +- &found_whole_row)); ++ map_variable_attnos_compat((Node *) clause, ++ varno, ++ 0, ++ chunk_map->attrMap, ++ RelationGetDescr(hyper_rel)->natts, ++ RelationGetForm(chunk_rel)->reltype, ++ &found_whole_row)); + + return clause; + } +@@ -193,7 +194,11 @@ adjust_hypertable_tlist(List *tlist, TupleConversionMap *map) + { + List *new_tlist = NIL; + TupleDesc chunk_tupdesc = map->outdesc; ++#if PG13_GE ++ AttrNumber *attrMap = map->attrMap->attnums; ++#else + AttrNumber *attrMap = map->attrMap; ++#endif + AttrNumber chunk_attrno; + + for (chunk_attrno = 1; chunk_attrno <= chunk_tupdesc->natts; chunk_attrno++) +@@ -351,7 +356,8 @@ get_default_existing_slot(ChunkInsertState *state, ChunkDispatch *dispatch) + * columns, etc. + */ + static void +-setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNumber *chunk_attnos) ++setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, ++ TupleConversionMap *chunk_map) + { + TupleConversionMap *map = state->hyper_to_chunk_map; + ResultRelInfo *chunk_rri = get_chunk_rri(state); +@@ -377,16 +383,17 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu + + Assert(map->outdesc == RelationGetDescr(chunk_rel)); + +- if (NULL == chunk_attnos) +- chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), +- RelationGetDescr(first_rel) ++ if (NULL == chunk_map) ++ chunk_map = convert_tuples_by_name(RelationGetDescr(chunk_rel), ++ RelationGetDescr(first_rel) + #if PG13_LT +- , gettext_noop("could not convert row type") ++ , ++ gettext_noop("could not convert row type") + #endif +- ); ++ ); + + onconflset = translate_clause(ts_chunk_dispatch_get_on_conflict_set(dispatch), +- chunk_attnos, ++ chunk_map, + hyper_rri->ri_RangeTableIndex, + hyper_rel, + chunk_rel); +@@ -412,7 +419,7 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu + if (NULL != onconflict_where) + { + List *clause = translate_clause(castNode(List, onconflict_where), +- chunk_attnos, ++ chunk_map, + hyper_rri->ri_RangeTableIndex, + hyper_rel, + chunk_rel); +@@ -476,7 +483,7 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) + ResultRelInfo *chunk_rri = cis->result_relation_info; + Relation hyper_rel = dispatch->hypertable_result_rel_info->ri_RelationDesc; + Relation chunk_rel = cis->rel; +- AttrNumber *chunk_attnos = NULL; ++ TupleConversionMap *chunk_map = NULL; + OnConflictAction onconflict_action = ts_chunk_dispatch_get_on_conflict_action(dispatch); + + if (ts_chunk_dispatch_has_returning(dispatch)) +@@ -486,19 +493,19 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) + * to have the hypertable_desc in the out spot for map_variable_attnos + * to work correctly in mapping hypertable attnos->chunk attnos. + */ +- chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), +- RelationGetDescr(hyper_rel) ++ chunk_map = convert_tuples_by_name(RelationGetDescr(chunk_rel), ++ RelationGetDescr(hyper_rel) + #if PG13_LT +- ,gettext_noop("could not convert row type") ++ , ++ gettext_noop("could not convert row type") + #endif +- ); ++ ); + + chunk_rri->ri_projectReturning = + get_adjusted_projection_info_returning(chunk_rri->ri_projectReturning, + ts_chunk_dispatch_get_returning_clauses( + dispatch), +- chunk_attnos, +- RelationGetDescr(hyper_rel)->natts, ++ chunk_map, + dispatch->hypertable_result_rel_info + ->ri_RangeTableIndex, + rowtype, +@@ -511,7 +518,7 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) + set_arbiter_indexes(cis, dispatch); + + if (onconflict_action == ONCONFLICT_UPDATE) +- setup_on_conflict_state(cis, dispatch, chunk_attnos); ++ setup_on_conflict_state(cis, dispatch, chunk_map); + } + } + +@@ -598,9 +605,10 @@ ts_chunk_insert_state_create(Chunk *chunk, ChunkDispatch *dispatch) + convert_tuples_by_name(RelationGetDescr(parent_rel), + RelationGetDescr(rel) + #if PG13_LT +- ,gettext_noop("could not convert row type") ++ , ++ gettext_noop("could not convert row type") + #endif +- ); ++ ); + + adjust_projections(state, dispatch, RelationGetForm(rel)->reltype); + +diff --git a/src/compat.h b/src/compat.h +index 51c1c181..1b2ed8e5 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -374,4 +374,19 @@ get_vacuum_options(const VacuumStmt *stmt) + #define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) + #endif + ++/* PG13 removes the natts parameter from map_variable_attnos */ ++#if PG13_LT ++#define map_variable_attnos_compat(node, varno, sublevels_up, map, natts, rowtype, found_wholerow) \ ++ map_variable_attnos((node), \ ++ (varno), \ ++ (sublevels_up), \ ++ (map), \ ++ (natts), \ ++ (rowtype), \ ++ (found_wholerow)) ++#else ++#define map_variable_attnos_compat(node, varno, sublevels_up, map, natts, rowtype, found_wholerow) \ ++ map_variable_attnos((node), (varno), (sublevels_up), (map), (rowtype), (found_wholerow)) ++#endif ++ + #endif /* TIMESCALEDB_COMPAT_H */ +diff --git a/tsl/src/fdw/modify_exec.c b/tsl/src/fdw/modify_exec.c +index 38d0e0c6..5307079d 100644 +--- a/tsl/src/fdw/modify_exec.c ++++ b/tsl/src/fdw/modify_exec.c +@@ -202,7 +202,11 @@ convert_attrs(TupleConversionMap *map, List *attrs) + + for (i = 0; i < map->outdesc->natts; i++) + { ++#if PG13_GE ++ if (map->attrMap->attnums[i] == attnum) ++#else + if (map->attrMap[i] == attnum) ++#endif + { + new_attrs = lappend_int(new_attrs, AttrOffsetGetAttrNumber(i)); + break; +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch b/buildroot/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch new file mode 100644 index 000000000..9e615134b --- /dev/null +++ b/buildroot/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch @@ -0,0 +1,88 @@ +From 8cf647f2995afbd594d67abb1e6556b97096a1c6 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Thu, 24 Sep 2020 04:42:45 +0200 +Subject: [PATCH] Adjust hypertable expansion to PG13 changes + +PG13 merges setup_append_rel_array into setup_simple_rel_arrays +which we use to build the append_rel_array. + +https://github.com/postgres/postgres/commit/1661a40505 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2735/commits/e6e2711d8e00958cb0a35c23f4e81a75f273113a.patch +--- + src/plan_expand_hypertable.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +diff --git a/src/plan_expand_hypertable.c b/src/plan_expand_hypertable.c +index 2b99c93b..4baa1b4c 100644 +--- a/src/plan_expand_hypertable.c ++++ b/src/plan_expand_hypertable.c +@@ -95,6 +95,24 @@ is_time_bucket_function(Expr *node) + return false; + } + ++#if PG13_GE ++/* PG13 merged setup_append_rel_array with setup_simple_rel_arrays */ ++static void ++setup_append_rel_array(PlannerInfo *root) ++{ ++ root->append_rel_array = ++ repalloc(root->append_rel_array, root->simple_rel_array_size * sizeof(AppendRelInfo *)); ++ ListCell *lc; ++ foreach (lc, root->append_rel_list) ++ { ++ AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc); ++ int child_relid = appinfo->child_relid; ++ ++ root->append_rel_array[child_relid] = appinfo; ++ } ++} ++#endif ++ + /* + * Pre-check to determine if an expression is eligible for constification. + * A more thorough check is in constify_timestamptz_op_interval. +@@ -1146,7 +1164,6 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * + .join_conditions = NIL, + .propagate_conditions = NIL, + }; +- Size old_rel_array_len; + Index first_chunk_index = 0; + #if PG12_GE + Index i; +@@ -1178,6 +1195,11 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * + propagate_join_quals(root, rel, &ctx); + + inh_oids = get_chunk_oids(&ctx, root, rel, ht); ++ ++ /* nothing to do here if we have no chunks and no data nodes */ ++ if (list_length(inh_oids) + list_length(ht->data_nodes) == 0) ++ return; ++ + oldrelation = table_open(parent_oid, NoLock); + + /* +@@ -1185,7 +1207,10 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * + * children to them. We include potential data node rels we might need to + * create in case of a distributed hypertable. + */ +- old_rel_array_len = root->simple_rel_array_size; ++#if PG12_GE ++ expand_planner_arrays(root, list_length(inh_oids) + list_length(ht->data_nodes)); ++#else ++ Size old_rel_array_len = root->simple_rel_array_size; + root->simple_rel_array_size += (list_length(inh_oids) + list_length(ht->data_nodes)); + root->simple_rel_array = + repalloc(root->simple_rel_array, root->simple_rel_array_size * sizeof(RelOptInfo *)); +@@ -1200,6 +1225,7 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * + memset(root->simple_rte_array + old_rel_array_len, + 0, + list_length(inh_oids) * sizeof(*root->simple_rte_array)); ++#endif + + /* Adding partition info will make PostgreSQL consider the inheritance + * children as part of a partitioned relation. This will enable +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch b/buildroot/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch new file mode 100644 index 000000000..34ecdb433 --- /dev/null +++ b/buildroot/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch @@ -0,0 +1,41 @@ +From d0f82f514eb1f59d63fcbfe71ec99d5d8f82649d Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Fri, 25 Sep 2020 14:23:01 +0200 +Subject: [PATCH] Adjust decompress code to Var field renames + +PG13 renames the varnoold and varoattno field of Var to varnosyn and +varattnosyn. + +https://github.com/postgres/postgres/commit/9ce77d75c5 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2786/commits/d46b5de84b975d6f394a7f1fa94a34c5062f50ca.patch +--- + tsl/src/nodes/decompress_chunk/decompress_chunk.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tsl/src/nodes/decompress_chunk/decompress_chunk.c b/tsl/src/nodes/decompress_chunk/decompress_chunk.c +index 1e36f5dc..4a6fa782 100644 +--- a/tsl/src/nodes/decompress_chunk/decompress_chunk.c ++++ b/tsl/src/nodes/decompress_chunk/decompress_chunk.c +@@ -739,11 +739,15 @@ create_var_for_compressed_equivalence_member(Var *var, const EMCreationContext * + if (var->varlevelsup == 0) + { + var->varno = context->compressed_relid_idx; +- var->varnoold = context->compressed_relid_idx; + var->varattno = + get_attnum(context->compressed_relid, NameStr(context->current_col_info->attname)); +- ++#if PG13_GE ++ var->varnosyn = var->varno; ++ var->varattnosyn = var->varattno; ++#else ++ var->varnoold = var->varno; + var->varoattno = var->varattno; ++#endif + + return (Node *) var; + } +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch b/buildroot/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch new file mode 100644 index 000000000..f117e1505 --- /dev/null +++ b/buildroot/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch @@ -0,0 +1,39 @@ +From aef77c6cf3bac36f93ba44244ecd8a23de701896 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 26 Sep 2020 02:14:28 +0200 +Subject: [PATCH] Adjust jsonb_utils to PG13 changes + +PG13 moved jsonapi.h from utils to common. + +https://github.com/postgres/postgres/commit/beb4699091 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2787/commits/aa1e0c8ac78ca109994269c659d52983fe49db7f.patch +--- + src/jsonb_utils.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/jsonb_utils.c b/src/jsonb_utils.c +index 46173871..dd901a38 100644 +--- a/src/jsonb_utils.c ++++ b/src/jsonb_utils.c +@@ -9,9 +9,15 @@ + #include + #include + #include +-#include + + #include "compat.h" ++ ++#if PG13_LT ++#include ++#else ++#include ++#endif ++ + #include "export.h" + + #include "jsonb_utils.h" +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch b/buildroot/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch new file mode 100644 index 000000000..9a3bb58c7 --- /dev/null +++ b/buildroot/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch @@ -0,0 +1,48 @@ +From 8a2ed03f78601596e1f74fa2e75f9cdf52c4ff83 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Fri, 25 Sep 2020 14:31:55 +0200 +Subject: [PATCH] Handle AT_DropExpression in process_utility + +PG13 adds a new ALTER TABLE subcommand for dropping the generated +property from a column. + +https://github.com/postgres/postgres/commit/f595117e24 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/cdb29e2e61ec3f3b52fb8962d12a15727757e35b.patch +--- + src/process_utility.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/process_utility.c b/src/process_utility.c +index 8f915113..0f76f141 100644 +--- a/src/process_utility.c ++++ b/src/process_utility.c +@@ -3266,6 +3266,9 @@ process_altertable_end_subcmd(Hypertable *ht, Node *parsetree, ObjectAddress *ob + case AT_AddColumnRecurse: + case AT_DropColumn: + case AT_DropColumnRecurse: ++#if PG13_GE ++ case AT_DropExpression: ++#endif + + /* + * adding and dropping columns handled in +@@ -3276,9 +3279,11 @@ process_altertable_end_subcmd(Hypertable *ht, Node *parsetree, ObjectAddress *ob + case AT_DropConstraintRecurse: + /* drop constraints handled by process_ddl_sql_drop */ + break; +- case AT_ProcessedConstraint: /* internal command never hit in our +- * test code, so don't know how to +- * handle */ ++#if PG13_LT ++ case AT_ProcessedConstraint: /* internal command never hit in our ++ * test code, so don't know how to ++ * handle */ ++#endif + case AT_ReAddComment: /* internal command never hit in our test + * code, so don't know how to handle */ + case AT_AddColumnToView: /* only used with views */ +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch b/buildroot/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch new file mode 100644 index 000000000..46686527b --- /dev/null +++ b/buildroot/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch @@ -0,0 +1,34 @@ +From 5cea3a687f7227997deb0eacbb061c586c6713f7 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 26 Sep 2020 02:57:38 +0200 +Subject: [PATCH] Adjust copy code to PG13 changes + +PG13 adds a CmdType argument to ExecComputeStoredGenerated. + +https://github.com/postgres/postgres/commit/c6679e4fca + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/a2d15828cbbbe7570afb03bb930df083ddeafd7a.patch +--- + src/copy.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/copy.c b/src/copy.c +index c8ce93e6..e38ae15e 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -379,7 +379,11 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call + /* Compute stored generated columns */ + if (resultRelInfo->ri_RelationDesc->rd_att->constr && + resultRelInfo->ri_RelationDesc->rd_att->constr->has_generated_stored) ++#if PG13_GE ++ ExecComputeStoredGenerated(estate, myslot, CMD_INSERT); ++#else + ExecComputeStoredGenerated(estate, myslot); ++#endif + #endif + /* + * If the target is a plain table, check the constraints of +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch b/buildroot/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch new file mode 100644 index 000000000..d5331fab1 --- /dev/null +++ b/buildroot/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch @@ -0,0 +1,186 @@ +From 6ef08914041b6166db6f77dd516ae8d66d0ecce6 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Wed, 30 Sep 2020 01:47:01 +0200 +Subject: [PATCH] Adjust code to PG13 command completion tag changes + +PG13 changes the representation of command completion tags to structs. + +https://github.com/postgres/postgres/commit/2f9661311b + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/d37ec4e23bc678bc84f126c5b952fb1707ad7fe4.patch +--- + src/loader/loader.c | 13 +++++++- + src/process_utility.c | 59 +++++++++++++++++++++++++++--------- + src/process_utility.h | 4 +++ + tsl/test/src/test_ddl_hook.c | 4 +++ + 4 files changed, 65 insertions(+), 15 deletions(-) + +diff --git a/src/loader/loader.c b/src/loader/loader.c +index f60f9e77..ed35f288 100644 +--- a/src/loader/loader.c ++++ b/src/loader/loader.c +@@ -464,7 +464,14 @@ post_analyze_hook(ParseState *pstate, Query *query) + static void + loader_process_utility_hook(PlannedStmt *pstmt, const char *query_string, + ProcessUtilityContext context, ParamListInfo params, +- QueryEnvironment *queryEnv, DestReceiver *dest, char *completion_tag) ++ QueryEnvironment *queryEnv, DestReceiver *dest, ++#if PG13_GE ++ QueryCompletion *qc ++#else ++ char *completion_tag ++#endif ++ ++) + { + bool is_distributed_database = false; + char *dist_uuid = NULL; +@@ -500,7 +507,11 @@ loader_process_utility_hook(PlannedStmt *pstmt, const char *query_string, + else + process_utility = standard_ProcessUtility; + ++#if PG13_GE ++ process_utility(pstmt, query_string, context, params, queryEnv, dest, qc); ++#else + process_utility(pstmt, query_string, context, params, queryEnv, dest, completion_tag); ++#endif + + /* + * Show a NOTICE warning message in case of dropping a +diff --git a/src/process_utility.c b/src/process_utility.c +index 0f76f141..d9d7514d 100644 +--- a/src/process_utility.c ++++ b/src/process_utility.c +@@ -91,7 +91,12 @@ prev_ProcessUtility(ProcessUtilityArgs *args) + args->params, + args->queryEnv, + args->dest, +- args->completion_tag); ++#if PG13_GE ++ args->qc ++#else ++ args->completion_tag ++#endif ++ ); + } + else + { +@@ -102,7 +107,12 @@ prev_ProcessUtility(ProcessUtilityArgs *args) + args->params, + args->queryEnv, + args->dest, +- args->completion_tag); ++#if PG13_GE ++ args->qc ++#else ++ args->completion_tag ++#endif ++ ); + } + } + +@@ -493,8 +503,13 @@ process_copy(ProcessUtilityArgs *args) + /* Performs acl check in here inside `copy_security_check` */ + timescaledb_DoCopy(stmt, args->query_string, &processed, ht); + ++#if PG13_GE ++ args->qc->commandTag = CMDTAG_COPY; ++ args->qc->nprocessed = processed; ++#else + if (args->completion_tag) + snprintf(args->completion_tag, COMPLETION_TAG_BUFSIZE, "COPY " UINT64_FORMAT, processed); ++#endif + + process_add_hypertable(args, ht); + +@@ -3646,7 +3661,11 @@ process_ddl_command_start(ProcessUtilityArgs *args) + return false; + + if (check_read_only) ++#if PG13_GE ++ PreventCommandIfReadOnly(CreateCommandName(args->parsetree)); ++#else + PreventCommandIfReadOnly(CreateCommandTag(args->parsetree)); ++#endif + + return handler(args); + } +@@ -3845,18 +3864,30 @@ process_ddl_sql_drop(EventTriggerDropObject *obj) + static void + timescaledb_ddl_command_start(PlannedStmt *pstmt, const char *query_string, + ProcessUtilityContext context, ParamListInfo params, +- QueryEnvironment *queryEnv, DestReceiver *dest, char *completion_tag) +-{ +- ProcessUtilityArgs args = { .query_string = query_string, +- .context = context, +- .params = params, +- .dest = dest, +- .completion_tag = completion_tag, +- .pstmt = pstmt, +- .parsetree = pstmt->utilityStmt, +- .queryEnv = queryEnv, +- .parse_state = make_parsestate(NULL), +- .hypertable_list = NIL }; ++ QueryEnvironment *queryEnv, DestReceiver *dest, ++#if PG13_GE ++ QueryCompletion *qc ++#else ++ char *completion_tag ++#endif ++) ++{ ++ ProcessUtilityArgs args = { ++ .query_string = query_string, ++ .context = context, ++ .params = params, ++ .dest = dest, ++#if PG13_GE ++ .qc = qc, ++#else ++ .completion_tag = completion_tag, ++#endif ++ .pstmt = pstmt, ++ .parsetree = pstmt->utilityStmt, ++ .queryEnv = queryEnv, ++ .parse_state = make_parsestate(NULL), ++ .hypertable_list = NIL ++ }; + + bool altering_timescaledb = false; + DDLResult result; +diff --git a/src/process_utility.h b/src/process_utility.h +index ac5519f4..f66448fb 100644 +--- a/src/process_utility.h ++++ b/src/process_utility.h +@@ -24,7 +24,11 @@ typedef struct ProcessUtilityArgs + ParamListInfo params; + DestReceiver *dest; + List *hypertable_list; ++#if PG13_GE ++ QueryCompletion *qc; ++#else + char *completion_tag; ++#endif + } ProcessUtilityArgs; + + typedef enum +diff --git a/tsl/test/src/test_ddl_hook.c b/tsl/test/src/test_ddl_hook.c +index 4fb58f02..d01e6114 100644 +--- a/tsl/test/src/test_ddl_hook.c ++++ b/tsl/test/src/test_ddl_hook.c +@@ -80,7 +80,11 @@ test_ddl_command_end(EventTriggerData *command) + ListCell *cell; + Hypertable *ht; + ++#if PG13_GE ++ elog(NOTICE, "test_ddl_command_end: %s", GetCommandTagName(command->tag)); ++#else + elog(NOTICE, "test_ddl_command_end: %s", command->tag); ++#endif + + if (tsl_delayed_execution_list == NIL) + return; +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch b/buildroot/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch new file mode 100644 index 000000000..8ce69e17c --- /dev/null +++ b/buildroot/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch @@ -0,0 +1,51 @@ +From 399acf6de6d02b3362faa13379b6bd948b91e20c Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Fri, 2 Oct 2020 00:58:57 +0200 +Subject: [PATCH] Adjust copy to PG13 HEAP_INSERT_SKIP_WAL change + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/446f977be8ead518579b3c5b2458429f27518b48.patch +--- + src/copy.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/copy.c b/src/copy.c +index e38ae15e..1187a696 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -215,8 +216,10 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call + ccstate->rel->rd_newRelfilenodeSubid != InvalidSubTransactionId) + { + ti_options |= HEAP_INSERT_SKIP_FSM; ++#if PG13_LT + if (!XLogIsNeeded()) + ti_options |= HEAP_INSERT_SKIP_WAL; ++#endif + } + + /* +@@ -449,8 +452,13 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call + * If we skipped writing WAL, then we need to sync the heap (but not + * indexes since those use WAL anyway) + */ ++#if PG13_LT + if (ti_options & HEAP_INSERT_SKIP_WAL) + heap_sync(ccstate->rel); ++#else ++ if (!RelationNeedsWAL(ccstate->rel)) ++ smgrimmedsync(ccstate->rel->rd_smgr, MAIN_FORKNUM); ++#endif + + return processed; + } +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch b/buildroot/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch new file mode 100644 index 000000000..130d66b1b --- /dev/null +++ b/buildroot/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch @@ -0,0 +1,58 @@ +From 280db3fdb6c365dd37d82afaeeebd16efa70e965 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Wed, 30 Sep 2020 01:45:29 +0200 +Subject: [PATCH] Adjust planner code to PG13 planner_hook signature + change + +PG13 adds the query string as argument to the planner_hook. + +https://github.com/postgres/postgres/commit/6aba63ef3e + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/90e3eb3df98f3165f08a17bf5548e3a30713de26.patch +--- + src/planner.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/planner.c b/src/planner.c +index b4d4907a..cd40fa84 100644 +--- a/src/planner.c ++++ b/src/planner.c +@@ -278,7 +278,12 @@ preprocess_query(Node *node, Query *rootquery) + } + + static PlannedStmt * ++#if PG13_GE ++timescaledb_planner(Query *parse, const char *query_string, int cursor_opts, ++ ParamListInfo bound_params) ++#else + timescaledb_planner(Query *parse, int cursor_opts, ParamListInfo bound_params) ++#endif + { + PlannedStmt *stmt; + ListCell *lc; +@@ -302,11 +307,19 @@ timescaledb_planner(Query *parse, int cursor_opts, ParamListInfo bound_params) + preprocess_query((Node *) parse, parse); + + if (prev_planner_hook != NULL) +- /* Call any earlier hooks */ ++ /* Call any earlier hooks */ ++#if PG13_GE ++ stmt = (prev_planner_hook)(parse, query_string, cursor_opts, bound_params); ++#else + stmt = (prev_planner_hook)(parse, cursor_opts, bound_params); ++#endif + else +- /* Call the standard planner */ ++ /* Call the standard planner */ ++#if PG13_GE ++ stmt = standard_planner(parse, query_string, cursor_opts, bound_params); ++#else + stmt = standard_planner(parse, cursor_opts, bound_params); ++#endif + + if (ts_extension_is_loaded()) + { +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch b/buildroot/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch new file mode 100644 index 000000000..87a12b2d9 --- /dev/null +++ b/buildroot/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch @@ -0,0 +1,34 @@ +From d7960c761542d7e90e91a32e91b82459e5fcc84f Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 3 Oct 2020 15:53:19 +0200 +Subject: [PATCH] Adjust code to deparse_context changes + +PG13 changes EXPLAIN to use Plan instead PlanState as context. + +https://github.com/postgres/postgres/commit/6ef77cf46e + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/20c5ef33fc9c6d47cd6a95ca79b0b260ee3cfd25.patch +--- + src/chunk_append/explain.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/chunk_append/explain.c b/src/chunk_append/explain.c +index 0111cf72..7ee089c1 100644 +--- a/src/chunk_append/explain.c ++++ b/src/chunk_append/explain.c +@@ -84,7 +84,11 @@ show_sort_group_keys(ChunkAppendState *state, List *ancestors, ExplainState *es) + initStringInfo(&sortkeybuf); + + /* Set up deparsing context */ ++#if PG13_GE ++ context = set_deparse_context_plan(es->deparse_cxt, plan, ancestors); ++#else + context = set_deparse_context_planstate(es->deparse_cxt, (Node *) state, ancestors); ++#endif + useprefix = (list_length(es->rtable) > 1 || es->verbose); + + for (keyno = 0; keyno < nkeys; keyno++) +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0018-Update-compat.h.patch b/buildroot/package/timescaledb/0018-Update-compat.h.patch new file mode 100644 index 000000000..6e6dd9db8 --- /dev/null +++ b/buildroot/package/timescaledb/0018-Update-compat.h.patch @@ -0,0 +1,27 @@ +From 67744f30f481a05e3cb6a2e73c0cb17117a2eb38 Mon Sep 17 00:00:00 2001 +From: fidomax +Date: Mon, 11 Jan 2021 14:16:06 +0300 +Subject: [PATCH] Update compat.h + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/pull/2801/commits/6a927ee84c91797025fc48ac4aab74c3344ebdad.patch +--- + src/compat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compat.h b/src/compat.h +index 1b2ed8e5..6b461e38 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -371,7 +371,7 @@ get_vacuum_options(const VacuumStmt *stmt) + #define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc)) + #define list_make5(x1, x2, x3, x4, x5) lappend(list_make4(x1, x2, x3, x4), x5) + #define list_make5_oid(x1, x2, x3, x4, x5) lappend_oid(list_make4_oid(x1, x2, x3, x4), x5) +-#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) ++#define for_each_cell_compat(cell, list, initcell) for_each_cell (cell, list, initcell) + #endif + + /* PG13 removes the natts parameter from map_variable_attnos */ +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch b/buildroot/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch new file mode 100644 index 000000000..0793bf1d2 --- /dev/null +++ b/buildroot/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch @@ -0,0 +1,70 @@ +From 42ac10738119c7d31892d8c3f45d525ad5bda756 Mon Sep 17 00:00:00 2001 +From: Sven Klemm +Date: Sat, 26 Sep 2020 02:19:56 +0200 +Subject: [PATCH] Adjust code to PG13 tuptoaster changes + +PG13 split tuptoaster.c into three separate files. This patch also +removes unnecesary tuptoaster.h includes. + +https://github.com/postgres/postgres/commit/8b94dab066 + +Signed-off-by: Maxim Kochetkov +Fetch from: https://github.com/timescale/timescaledb/commit/2bef612c04435cdb5257d40373c4955a0d617c39.patch +--- + tsl/src/remote/async.c | 1 - + tsl/src/remote/stmt_params.c | 1 - + tsl/src/reorder.c | 7 ++++++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tsl/src/remote/async.c b/tsl/src/remote/async.c +index f3462809..0d55deb7 100644 +--- a/tsl/src/remote/async.c ++++ b/tsl/src/remote/async.c +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + + #include "compat.h" + #if PG12_GE +diff --git a/tsl/src/remote/stmt_params.c b/tsl/src/remote/stmt_params.c +index 0f315f37..1682d476 100644 +--- a/tsl/src/remote/stmt_params.c ++++ b/tsl/src/remote/stmt_params.c +@@ -6,7 +6,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/tsl/src/reorder.c b/tsl/src/reorder.c +index c4b42c12..7f301b2b 100644 +--- a/tsl/src/reorder.c ++++ b/tsl/src/reorder.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -58,6 +57,12 @@ + #include + #endif + ++#if PG13_LT ++#include ++#else ++#include ++#endif ++ + #include "chunk.h" + #include "chunk_index.h" + #include "hypertable_cache.h" +-- +2.29.2 + diff --git a/buildroot/package/timescaledb/timescaledb.hash b/buildroot/package/timescaledb/timescaledb.hash index 452e2efc8..f275c3d4b 100644 --- a/buildroot/package/timescaledb/timescaledb.hash +++ b/buildroot/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d0b7a153ff3e02ecf033a869ecdf4286f8610ea76140baa84928fc3a80223e99 timescaledb-1.7.4.tar.gz +sha256 96e51d5240547f0223c34b91263f6fffca46927710764bf450aa61e9756189bd timescaledb-2.0.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/buildroot/package/timescaledb/timescaledb.mk b/buildroot/package/timescaledb/timescaledb.mk index ee58c692b..0d5dc12d9 100644 --- a/buildroot/package/timescaledb/timescaledb.mk +++ b/buildroot/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 1.7.4 +TIMESCALEDB_VERSION = 2.0.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -17,6 +17,7 @@ TIMESCALEDB_DEPENDENCIES = postgresql # --ldflags and --libs. TIMESCALEDB_CONF_OPTS = \ -DREGRESS_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ -DPG_PKGLIBDIR=lib/postgresql \ -DPG_SHAREDIR=share/postgresql \ -DPG_BINDIR=bin \ diff --git a/buildroot/package/tinc/tinc.mk b/buildroot/package/tinc/tinc.mk index 56a26e9a5..0726e81d5 100644 --- a/buildroot/package/tinc/tinc.mk +++ b/buildroot/package/tinc/tinc.mk @@ -9,6 +9,7 @@ TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPL-2.0+ with OpenSSL exception TINC_LICENSE_FILES = COPYING COPYING.README +TINC_CPE_ID_VENDOR = tinc-vpn TINC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) diff --git a/buildroot/package/tinydtls/tinydtls.mk b/buildroot/package/tinydtls/tinydtls.mk index b4fd06ff7..6d839bc05 100644 --- a/buildroot/package/tinydtls/tinydtls.mk +++ b/buildroot/package/tinydtls/tinydtls.mk @@ -8,6 +8,7 @@ TINYDTLS_VERSION = 0.9-rc1 TINYDTLS_SITE = $(call github,eclipse,tinydtls,v$(TINYDTLS_VERSION)) TINYDTLS_LICENSE = EPL-1.0 or EDL-1.0 TINYDTLS_LICENSE_FILES = LICENSE +TINYDTLS_CPE_ID_VENDOR = eclipse TINYDTLS_INSTALL_STAGING = YES TINYDTLS_DEPENDENCIES = host-pkgconf # From git diff --git a/buildroot/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch b/buildroot/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch deleted file mode 100644 index d169322ed..000000000 --- a/buildroot/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a868bacb46e3c900530bed47a1c6f85b0fbe701c Mon Sep 17 00:00:00 2001 -From: nicm -Date: Thu, 29 Oct 2020 16:33:01 +0000 -Subject: [PATCH] Do not write after the end of the array and overwrite the - stack when colon-separated SGR sequences contain empty arguments. Reported by - Sergey Nizovtsev. - -[Peter: Fixes CVE-2020-27347] -Signed-off-by: Peter Korsgaard ---- - input.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/input.c b/input.c -index 42a60c92..c280c0d9 100644 ---- a/input.c -+++ b/input.c -@@ -1976,8 +1976,13 @@ input_csi_dispatch_sgr_colon(struct input_ctx *ictx, u_int i) - free(copy); - return; - } -- } else -+ } else { - n++; -+ if (n == nitems(p)) { -+ free(copy); -+ return; -+ } -+ } - log_debug("%s: %u = %d", __func__, n - 1, p[n - 1]); - } - free(copy); --- -2.20.1 - diff --git a/buildroot/package/tmux/tmux.hash b/buildroot/package/tmux/tmux.hash index e27fca253..75538e09a 100644 --- a/buildroot/package/tmux/tmux.hash +++ b/buildroot/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25 tmux-2.9a.tar.gz -sha256 ce75f1345a76c93bd0f413d1b93ff1baa0669f34a7242779a00c1b862b4f813a COPYING +sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/buildroot/package/tmux/tmux.mk b/buildroot/package/tmux/tmux.mk index 00e77ad76..17570520c 100644 --- a/buildroot/package/tmux/tmux.mk +++ b/buildroot/package/tmux/tmux.mk @@ -4,15 +4,13 @@ # ################################################################################ -TMUX_VERSION = 2.9a +TMUX_VERSION = 3.1c TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING +TMUX_CPE_ID_VALID = YES TMUX_DEPENDENCIES = libevent ncurses host-pkgconf -# 0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch -TMUX_IGNORE_CVES += CVE-2020-27347 - # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS diff --git a/buildroot/package/tor/tor.hash b/buildroot/package/tor/tor.hash index 7aa7280f2..4dd86e51f 100644 --- a/buildroot/package/tor/tor.hash +++ b/buildroot/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5f154c155803adf5c89e87cab53017b6908c5ebe50c65839e8cf4fbd2abe1fdc tor-0.4.4.6.tar.gz +sha256 326d2926177f0c7838cac213456d0056817d57f3f2e46714a2911c7d7a9b05ee tor-0.4.4.7.tar.gz sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE diff --git a/buildroot/package/tor/tor.mk b/buildroot/package/tor/tor.mk index b7095aa39..8ad4a7a82 100644 --- a/buildroot/package/tor/tor.mk +++ b/buildroot/package/tor/tor.mk @@ -4,10 +4,11 @@ # ################################################################################ -TOR_VERSION = 0.4.4.6 +TOR_VERSION = 0.4.4.7 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE +TOR_CPE_ID_VENDOR = torproject TOR_DEPENDENCIES = libevent openssl zlib TOR_AUTORECONF = YES diff --git a/buildroot/package/tovid/Config.in b/buildroot/package/tovid/Config.in index f4ddcfa4a..f972e1885 100644 --- a/buildroot/package/tovid/Config.in +++ b/buildroot/package/tovid/Config.in @@ -6,8 +6,9 @@ config BR2_PACKAGE_TOVID depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # mpv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mpv depends on BR2_TOOLCHAIN_HAS_ATOMIC # mpv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mpv depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv # The below dependencies are runtime dependencies only select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng @@ -28,12 +29,13 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.5" +comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC @@ -42,6 +44,7 @@ comment "tovid depends on python or python3" depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC diff --git a/buildroot/package/tpm2-pkcs11/Config.in b/buildroot/package/tpm2-pkcs11/Config.in new file mode 100644 index 000000000..46d5cab07 --- /dev/null +++ b/buildroot/package/tpm2-pkcs11/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_TPM2_PKCS11 + bool "tpm2-pkcs11" + depends on !BR2_STATIC_LIBS # tpm2-tss + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_TPM2_TSS + help + A PKCS#11 interface for TPM2 hardware + + https://github.com/tpm2-software/tpm2-pkcs11 + +comment "tpm2-pkcs11 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.hash b/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.hash new file mode 100644 index 000000000..16dd9166b --- /dev/null +++ b/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 13425c34358ec798d333743099b9aec5e42f6a4653c4c0e40eb075681f369687 tpm2-pkcs11-1.5.0.tar.gz +sha256 793aa007f793458434d7cc60b1c827053a399308658b32fcaa6023802adc22e1 LICENSE diff --git a/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.mk b/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.mk new file mode 100644 index 000000000..3acce0774 --- /dev/null +++ b/buildroot/package/tpm2-pkcs11/tpm2-pkcs11.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# tpm2-pkcs11 +# +################################################################################ + +TPM2_PKCS11_VERSION = 1.5.0 +TPM2_PKCS11_SITE = https://github.com/tpm2-software/tpm2-pkcs11/releases/download/$(TPM2_PKCS11_VERSION) +TPM2_PKCS11_LICENSE = BSD-2-Clause +TPM2_PKCS11_LICENSE_FILES = LICENSE +TPM2_PKCS11_DEPENDENCIES = host-pkgconf libyaml openssl sqlite tpm2-tss + +TPM2_PKCS11_CONF_OPTS += \ + --disable-hardening + +# Fix tpm.c:746:5: error: 'for' loop initial declarations are only allowed in C99 mode +# Fix implicit declaration of function 'strnlen' +TPM2_PKCS11_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" + +# do not build man pages +TPM2_PKCS11_CONF_ENV += ac_cv_prog_PANDOC='' + +# tpm2-pkcs11 checks for tpm2-tools programs and errors out if not +# found, even though they are only used by the (unused in Buildroot) +# python-based tools +TPM2_PKCS11_CONF_ENV += \ + ac_cv_prog_tpm2_createprimary=yes \ + ac_cv_prog_tpm2_create=yes \ + ac_cv_prog_tpm2_evictcontrol=yes \ + ac_cv_prog_tpm2_readpublic=yes \ + ac_cv_prog_tpm2_load=yes \ + ac_cv_prog_tpm2_loadexternal=yes \ + ac_cv_prog_tpm2_unseal=yes \ + ac_cv_prog_tpm2_encryptdecrypt=yes \ + ac_cv_prog_tpm2_sign=yes \ + ac_cv_prog_tpm2_getcap=yes \ + ac_cv_prog_tpm2_import=yes \ + ac_cv_prog_tpm2_changeauth=yes + +ifeq ($(BR2_PACKAGE_P11_KIT),y) +TPM2_PKCS11_DEPENDENCIES += p11-kit +TPM2_PKCS11_CONF_OPTS += \ + --with-p11kitconfigdir=/usr/share/p11-kit/modules +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/trace-cmd/0001-trace-cmd-libtracecmd-API-cleanup.patch b/buildroot/package/trace-cmd/0001-trace-cmd-libtracecmd-API-cleanup.patch new file mode 100644 index 000000000..a0dee2102 --- /dev/null +++ b/buildroot/package/trace-cmd/0001-trace-cmd-libtracecmd-API-cleanup.patch @@ -0,0 +1,1486 @@ +From 4b6e124d8b5a0dfd21aedf21d2c347fc5f0705a2 Mon Sep 17 00:00:00 2001 +From: "Tzvetomir Stoyanov (VMware)" +Date: Thu, 12 Nov 2020 13:52:08 +0200 +Subject: [PATCH] trace-cmd: libtracecmd API cleanup + +The tracecmd library is used by trace-cmd and KernelShark applications. +All APIs, that are not used by KernelShark are removed from trace-cmd.h. +This is the first step to cleanup the library APIs and dependencies. + +Link: https://lore.kernel.org/linux-trace-devel/20201112115208.1250789-3-tz.stoyanov@gmail.com + +Signed-off-by: Tzvetomir Stoyanov (VMware) +Signed-off-by: Steven Rostedt (VMware) +[Retrieved from: +https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/commit/?id=4b6e124d8b5a0dfd21aedf21d2c347fc5f0705a2] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 2 +- + include/trace-cmd/trace-cmd.h | 488 +----------------- + include/trace-cmd/trace-filter-hash.h | 64 --- + include/trace-cmd/trace-hash.h | 55 -- + include/trace-cmd/trace-msg.h | 15 - + .../include/private/trace-cmd-private.h | 480 +++++++++++++++++ + .../include/private/trace-filter-hash.h | 64 +++ + lib/trace-cmd/include/private/trace-hash.h | 55 ++ + lib/trace-cmd/include/private/trace-msg.h | 15 + + lib/trace-cmd/include/trace-cmd-local.h | 2 + + lib/trace-cmd/trace-ftrace.c | 2 +- + lib/trace-cmd/trace-hooks.c | 2 +- + lib/trace-cmd/trace-recorder.c | 2 +- + lib/trace-cmd/trace-timesync.c | 2 +- + lib/trace-cmd/trace-util.c | 2 +- + lib/traceevent/plugins/plugin_python_loader.c | 3 +- + python/ctracecmd.i | 1 + + tracecmd/include/trace-local.h | 2 +- + 18 files changed, 637 insertions(+), 619 deletions(-) + delete mode 100644 include/trace-cmd/trace-filter-hash.h + delete mode 100644 include/trace-cmd/trace-hash.h + delete mode 100644 include/trace-cmd/trace-msg.h + create mode 100644 lib/trace-cmd/include/private/trace-cmd-private.h + create mode 100644 lib/trace-cmd/include/private/trace-filter-hash.h + create mode 100644 lib/trace-cmd/include/private/trace-hash.h + create mode 100644 lib/trace-cmd/include/private/trace-msg.h + +diff --git a/Makefile b/Makefile +index b034042..6ef6936 100644 +--- a/Makefile ++++ b/Makefile +@@ -224,6 +224,7 @@ INCLUDES += -I$(src)/include/trace-cmd + INCLUDES += -I$(src)/include/tracefs + INCLUDES += -I$(src)/lib/traceevent/include + INCLUDES += -I$(src)/lib/trace-cmd/include ++INCLUDES += -I$(src)/lib/trace-cmd/include/private + INCLUDES += -I$(src)/lib/tracefs/include + INCLUDES += -I$(src)/tracecmd/include + INCLUDES += -I$(obj)/tracecmd/include +@@ -417,7 +418,6 @@ install_libs: libs + $(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent) + $(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent) + $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd) +- $(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ)/trace-cmd) + $(Q)$(call do_install,$(src)/include/tracefs/tracefs.h,$(includedir_SQ)/tracefs) + $(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)/trace-cmd) + $(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)/traceevent) +diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h +index 3c2b474..9751ac3 100644 +--- a/include/trace-cmd/trace-cmd.h ++++ b/include/trace-cmd/trace-cmd.h +@@ -9,497 +9,31 @@ + #include "traceevent/event-parse.h" + #include "tracefs/tracefs.h" + +-#define TRACECMD_MAGIC { 23, 8, 68 } +- +-#define ARRAY_SIZE(_a) (sizeof(_a) / sizeof((_a)[0])) +-#define __weak __attribute__((weak)) +-#define __noreturn __attribute__((noreturn)) +- +-#define TRACECMD_ERR_MSK ((unsigned long)(-1) & ~((1UL << 14) - 1)) +-#define TRACECMD_ISERR(ptr) ((unsigned long)(ptr) > TRACECMD_ERR_MSK) +-#define TRACECMD_ERROR(ret) ((void *)((unsigned long)(ret) | TRACECMD_ERR_MSK)) +-#define TRACECMD_PTR2ERR(ptr) ((unisgned long)(ptr) & ~TRACECMD_ERR_MSK) +- +-void tracecmd_parse_cmdlines(struct tep_handle *pevent, char *file, int size); +-void tracecmd_parse_proc_kallsyms(struct tep_handle *pevent, char *file, unsigned int size); +-void tracecmd_parse_ftrace_printk(struct tep_handle *pevent, char *file, unsigned int size); +-struct tep_plugin_list *trace_load_plugins(struct tep_handle *tep); +- +-int *tracecmd_add_id(int *list, int id, int len); +- +-enum { +- RINGBUF_TYPE_PADDING = 29, +- RINGBUF_TYPE_TIME_EXTEND = 30, +- RINGBUF_TYPE_TIME_STAMP = 31, +-}; +- +-void tracecmd_record_ref(struct tep_record *record); +-void free_record(struct tep_record *record); +- +-void tracecmd_set_debug(bool set_debug); +-bool tracecmd_get_debug(void); +- + struct tracecmd_input; +-struct tracecmd_output; +-struct tracecmd_recorder; +-struct hook_list; +- +-/* --- tracecmd plugins --- */ +- +-extern int tracecmd_disable_sys_plugins; +-extern int tracecmd_disable_plugins; +- +-enum tracecmd_context { +- TRACECMD_INPUT, +- TRACECMD_OUTPUT, +-}; +- +-enum tracecmd_plugin_flag { +- TRACECMD_DISABLE_SYS_PLUGINS = 1, +- TRACECMD_DISABLE_PLUGINS = 1 << 1, +-}; +- +-struct trace_plugin_context; +- +-struct trace_plugin_context * +-tracecmd_plugin_context_create(enum tracecmd_context context, void *data); +- +-void tracecmd_plugin_set_flag(struct trace_plugin_context *context, +- enum tracecmd_plugin_flag flag); +- +-#define TRACECMD_PLUGIN_LOADER tracecmd_plugin_loader +-#define TRACECMD_PLUGIN_UNLOADER tracecmd_plugin_unloader +-#define TRACECMD_PLUGIN_ALIAS tracecmd_plugin_alias +-#define _MAKE_STR(x) #x +-#define MAKE_STR(x) _MAKE_STR(x) +-#define TRACECMD_PLUGIN_LOADER_NAME MAKE_STR(TRACECMD_PLUGIN_LOADER) +-#define TRACECMD_PLUGIN_UNLOADER_NAME MAKE_STR(TRACECMD_PLUGIN_UNLOADER) +-#define TRACECMD_PLUGIN_ALIAS_NAME MAKE_STR(TRACECMD_PLUGIN_ALIAS) +- +-typedef int (*tracecmd_plugin_load_func)(struct trace_plugin_context *trace); +-typedef int (*tracecmd_plugin_unload_func)(struct trace_plugin_context *trace); +- +-struct tracecmd_input * +-tracecmd_plugin_context_input(struct trace_plugin_context *trace_context); +-struct tracecmd_output * +-tracecmd_plugin_context_output(struct trace_plugin_context *trace_context); +- +-void tracecmd_set_quiet(struct tracecmd_output *handle, bool set_quiet); +-bool tracecmd_get_quiet(struct tracecmd_output *handle); +- +-static inline int tracecmd_host_bigendian(void) +-{ +- unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 }; +- unsigned int *ptr; +- +- ptr = (unsigned int *)str; +- return *ptr == 0x01020304; +-} +- +-/* --- Opening and Reading the trace.dat file --- */ +- +-enum { +- TRACECMD_OPTION_DONE, +- TRACECMD_OPTION_DATE, +- TRACECMD_OPTION_CPUSTAT, +- TRACECMD_OPTION_BUFFER, +- TRACECMD_OPTION_TRACECLOCK, +- TRACECMD_OPTION_UNAME, +- TRACECMD_OPTION_HOOK, +- TRACECMD_OPTION_OFFSET, +- TRACECMD_OPTION_CPUCOUNT, +- TRACECMD_OPTION_VERSION, +- TRACECMD_OPTION_PROCMAPS, +- TRACECMD_OPTION_TRACEID, +- TRACECMD_OPTION_TIME_SHIFT, +- TRACECMD_OPTION_GUEST, +-}; +- +-enum { +- TRACECMD_FL_IGNORE_DATE = (1 << 0), +- TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), +- TRACECMD_FL_LATENCY = (1 << 2), +- TRACECMD_FL_IN_USECS = (1 << 3), +- TRACECMD_FL_FLYRECORD = (1 << 4), +-}; +- +-struct tracecmd_ftrace { +- struct tracecmd_input *handle; +- struct tep_event *fgraph_ret_event; +- int fgraph_ret_id; +- int long_size; +-}; +- +-struct tracecmd_proc_addr_map { +- unsigned long long start; +- unsigned long long end; +- char *lib_name; +-}; +- +-typedef void (*tracecmd_show_data_func)(struct tracecmd_input *handle, +- struct tep_record *record); +-typedef void (*tracecmd_handle_init_func)(struct tracecmd_input *handle, +- struct hook_list *hook, int global); + +-struct tracecmd_input *tracecmd_alloc(const char *file); +-struct tracecmd_input *tracecmd_alloc_fd(int fd); +-struct tracecmd_input *tracecmd_open(const char *file); + struct tracecmd_input *tracecmd_open_head(const char *file); +-struct tracecmd_input *tracecmd_open_fd(int fd); ++void tracecmd_close(struct tracecmd_input *handle); + int tracecmd_pair_peer(struct tracecmd_input *handle, + struct tracecmd_input *peer); +-void tracecmd_unpair_peer(struct tracecmd_input *handle); +-void tracecmd_ref(struct tracecmd_input *handle); +-void tracecmd_close(struct tracecmd_input *handle); +-int tracecmd_read_headers(struct tracecmd_input *handle); +-int tracecmd_get_parsing_failures(struct tracecmd_input *handle); +-int tracecmd_long_size(struct tracecmd_input *handle); +-int tracecmd_page_size(struct tracecmd_input *handle); +-int tracecmd_cpus(struct tracecmd_input *handle); +-int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); +-void tracecmd_set_flag(struct tracecmd_input *handle, int flag); +-void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); +-unsigned long tracecmd_get_flags(struct tracecmd_input *handle); +-unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle); +-int tracecmd_get_guest_cpumap(struct tracecmd_input *handle, +- unsigned long long trace_id, +- const char **name, +- int *vcpu_count, const int **cpu_pid); +-unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); +-int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); +- +-void tracecmd_parse_trace_clock(struct tracecmd_input *handle, char *file, int size); +- +-int tracecmd_make_pipe(struct tracecmd_input *handle, int cpu, int fd, int cpus); +- +-int tracecmd_buffer_instances(struct tracecmd_input *handle); +-const char *tracecmd_buffer_instance_name(struct tracecmd_input *handle, int indx); +-struct tracecmd_input *tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx); +-int tracecmd_is_buffer_instance(struct tracecmd_input *handle); +- +-void tracecmd_set_ts_offset(struct tracecmd_input *handle, long long offset); +-void tracecmd_set_ts2secs(struct tracecmd_input *handle, unsigned long long hz); +- +-void tracecmd_print_events(struct tracecmd_input *handle, const char *regex); +- +-struct hook_list *tracecmd_hooks(struct tracecmd_input *handle); + + int tracecmd_init_data(struct tracecmd_input *handle); +- +-void tracecmd_print_stats(struct tracecmd_input *handle); +-void tracecmd_print_uname(struct tracecmd_input *handle); +-void tracecmd_print_version(struct tracecmd_input *handle); +- + struct tep_record * +-tracecmd_peek_data(struct tracecmd_input *handle, int cpu); +- +-static inline struct tep_record * +-tracecmd_peek_data_ref(struct tracecmd_input *handle, int cpu) +-{ +- struct tep_record *rec = tracecmd_peek_data(handle, cpu); +- if (rec) +- rec->ref_count++; +- return rec; +-} +- ++tracecmd_read_cpu_first(struct tracecmd_input *handle, int cpu); + struct tep_record * + tracecmd_read_data(struct tracecmd_input *handle, int cpu); +- +-struct tep_record * +-tracecmd_read_prev(struct tracecmd_input *handle, struct tep_record *record); +- +-struct tep_record * +-tracecmd_read_next_data(struct tracecmd_input *handle, int *rec_cpu); +- +-struct tep_record * +-tracecmd_peek_next_data(struct tracecmd_input *handle, int *rec_cpu); +- + struct tep_record * + tracecmd_read_at(struct tracecmd_input *handle, unsigned long long offset, + int *cpu); +-struct tep_record * +-tracecmd_translate_data(struct tracecmd_input *handle, +- void *ptr, int size); +-struct tep_record * +-tracecmd_read_cpu_first(struct tracecmd_input *handle, int cpu); +-struct tep_record * +-tracecmd_read_cpu_last(struct tracecmd_input *handle, int cpu); +-int tracecmd_refresh_record(struct tracecmd_input *handle, +- struct tep_record *record); +- +-int tracecmd_set_cpu_to_timestamp(struct tracecmd_input *handle, +- int cpu, unsigned long long ts); +-void +-tracecmd_set_all_cpus_to_timestamp(struct tracecmd_input *handle, +- unsigned long long time); +- +-int tracecmd_set_cursor(struct tracecmd_input *handle, +- int cpu, unsigned long long offset); +-unsigned long long +-tracecmd_get_cursor(struct tracecmd_input *handle, int cpu); ++void free_record(struct tep_record *record); + +-int tracecmd_ftrace_overrides(struct tracecmd_input *handle, struct tracecmd_ftrace *finfo); + struct tep_handle *tracecmd_get_pevent(struct tracecmd_input *handle); +-bool tracecmd_get_use_trace_clock(struct tracecmd_input *handle); +-tracecmd_show_data_func +-tracecmd_get_show_data_func(struct tracecmd_input *handle); +-void tracecmd_set_show_data_func(struct tracecmd_input *handle, +- tracecmd_show_data_func func); +- +-int tracecmd_record_at_buffer_start(struct tracecmd_input *handle, struct tep_record *record); +-unsigned long long tracecmd_page_ts(struct tracecmd_input *handle, +- struct tep_record *record); +-unsigned int tracecmd_record_ts_delta(struct tracecmd_input *handle, +- struct tep_record *record); +- +-struct tracecmd_proc_addr_map * +-tracecmd_search_task_map(struct tracecmd_input *handle, +- int pid, unsigned long long addr); +-#ifndef SWIG +-/* hack for function graph work around */ +-extern __thread struct tracecmd_input *tracecmd_curr_thread_handle; +-#endif +- +- +-/* --- Creating and Writing the trace.dat file --- */ +- +-struct tracecmd_event_list { +- struct tracecmd_event_list *next; +- const char *glob; +-}; +- +-struct tracecmd_option; +-struct tracecmd_msg_handle; +- +-struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus); +-struct tracecmd_output *tracecmd_create_file(const char *output_file, +- int cpus, char * const *cpu_data_files); +-struct tracecmd_output * +-tracecmd_create_file_glob(const char *output_file, +- int cpus, char * const *cpu_data_files, +- struct tracecmd_event_list *event_globs); +-struct tracecmd_output * +-tracecmd_create_init_file_glob(const char *output_file, +- struct tracecmd_event_list *list); +-struct tracecmd_output *tracecmd_create_init_fd(int fd); +-struct tracecmd_output * +-tracecmd_create_init_fd_glob(int fd, struct tracecmd_event_list *list); +-struct tracecmd_output * +-tracecmd_create_init_fd_msg(struct tracecmd_msg_handle *msg_handle, +- struct tracecmd_event_list *list); +-struct tracecmd_output *tracecmd_create_init_file(const char *output_file); +-struct tracecmd_output *tracecmd_create_init_file_override(const char *output_file, +- const char *tracing_dir, +- const char *kallsyms); +-struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle, +- unsigned short id, int size, +- const void *data); +-struct tracecmd_option * +-tracecmd_add_option_v(struct tracecmd_output *handle, +- unsigned short id, const struct iovec *vector, int count); +- +-struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handle, +- const char *name, int cpus); +- +-int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); +-int tracecmd_write_options(struct tracecmd_output *handle); +-int tracecmd_append_options(struct tracecmd_output *handle); +-int tracecmd_update_option(struct tracecmd_output *handle, +- struct tracecmd_option *option, int size, +- const void *data); +-void tracecmd_output_close(struct tracecmd_output *handle); +-void tracecmd_output_free(struct tracecmd_output *handle); +-struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle, +- const char *file); +- +-int tracecmd_write_cpu_data(struct tracecmd_output *handle, +- int cpus, char * const *cpu_data_files); +-int tracecmd_append_cpu_data(struct tracecmd_output *handle, +- int cpus, char * const *cpu_data_files); +-int tracecmd_append_buffer_cpu_data(struct tracecmd_output *handle, +- struct tracecmd_option *option, +- int cpus, char * const *cpu_data_files); +- +-struct tracecmd_output *tracecmd_get_output_handle_fd(int fd); +- +-/* --- Reading the Fly Recorder Trace --- */ +- +-enum { +- TRACECMD_RECORD_NOSPLICE = (1 << 0), /* Use read instead of splice */ +- TRACECMD_RECORD_SNAPSHOT = (1 << 1), /* Extract from snapshot */ +- TRACECMD_RECORD_BLOCK = (1 << 2), /* Block on splice write */ +- TRACECMD_RECORD_NOBRASS = (1 << 3), /* Splice directly without a brass pipe */ +-}; +- +-void tracecmd_free_recorder(struct tracecmd_recorder *recorder); +-struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu, unsigned flags); +-struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu, unsigned flags); +-struct tracecmd_recorder *tracecmd_create_recorder_virt(const char *file, int cpu, unsigned flags, int trace_fd); +-struct tracecmd_recorder *tracecmd_create_recorder_maxkb(const char *file, int cpu, unsigned flags, int maxkb); +-struct tracecmd_recorder *tracecmd_create_buffer_recorder_fd(int fd, int cpu, unsigned flags, const char *buffer); +-struct tracecmd_recorder *tracecmd_create_buffer_recorder(const char *file, int cpu, unsigned flags, const char *buffer); +-struct tracecmd_recorder *tracecmd_create_buffer_recorder_maxkb(const char *file, int cpu, unsigned flags, const char *buffer, int maxkb); +- +-int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep); +-void tracecmd_stop_recording(struct tracecmd_recorder *recorder); +-long tracecmd_flush_recording(struct tracecmd_recorder *recorder); +- +-enum tracecmd_msg_flags { +- TRACECMD_MSG_FL_USE_TCP = 1 << 0, +-}; +- +-/* for both client and server */ +-struct tracecmd_msg_handle { +- int fd; +- short cpu_count; +- short version; /* Current protocol version */ +- unsigned long flags; +- bool done; +-}; +- +-struct tracecmd_msg_handle * +- tracecmd_msg_handle_alloc(int fd, unsigned long flags); +- +-/* Closes the socket and frees the handle */ +-void tracecmd_msg_handle_close(struct tracecmd_msg_handle *msg_handle); +- +-/* for clients */ +-int tracecmd_msg_send_init_data(struct tracecmd_msg_handle *msg_handle, +- unsigned int **client_ports); +-int tracecmd_msg_data_send(struct tracecmd_msg_handle *msg_handle, +- const char *buf, int size); +-int tracecmd_msg_finish_sending_data(struct tracecmd_msg_handle *msg_handle); +-int tracecmd_msg_send_close_msg(struct tracecmd_msg_handle *msg_handle); +-int tracecmd_msg_send_close_resp_msg(struct tracecmd_msg_handle *msg_handle); +-int tracecmd_msg_wait_close(struct tracecmd_msg_handle *msg_handle); +-int tracecmd_msg_wait_close_resp(struct tracecmd_msg_handle *msg_handle); +- +-/* for server */ +-int tracecmd_msg_initial_setting(struct tracecmd_msg_handle *msg_handle); +-int tracecmd_msg_send_port_array(struct tracecmd_msg_handle *msg_handle, +- unsigned *ports); +-int tracecmd_msg_read_data(struct tracecmd_msg_handle *msg_handle, int ofd); +-int tracecmd_msg_collect_data(struct tracecmd_msg_handle *msg_handle, int ofd); +-bool tracecmd_msg_done(struct tracecmd_msg_handle *msg_handle); +-void tracecmd_msg_set_done(struct tracecmd_msg_handle *msg_handle); +- +-int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle, +- int argc, char **argv, bool use_fifos, +- unsigned long long trace_id, +- char *tsync_protos, +- int tsync_protos_size); +-int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, +- int *argc, char ***argv, bool *use_fifos, +- unsigned long long *trace_id, +- char **tsync_protos, +- unsigned int *tsync_protos_size); +- +-int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle, +- int nr_cpus, int page_size, +- unsigned int *ports, bool use_fifos, +- unsigned long long trace_id, +- unsigned int tsync_proto, +- unsigned int tsync_port); +-int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, +- int *nr_cpus, int *page_size, +- unsigned int **ports, bool *use_fifos, +- unsigned long long *trace_id, +- unsigned int *tsync_proto, +- unsigned int *tsync_port); +- +-int tracecmd_msg_send_time_sync(struct tracecmd_msg_handle *msg_handle, +- unsigned int sync_protocol, +- unsigned int sync_msg_id, +- unsigned int payload_size, char *payload); +-int tracecmd_msg_recv_time_sync(struct tracecmd_msg_handle *msg_handle, +- unsigned int *sync_protocol, +- unsigned int *sync_msg_id, +- unsigned int *payload_size, char **payload); +- +-/* --- Timestamp synchronization --- */ +- +-enum{ +- TRACECMD_TIME_SYNC_PROTO_NONE = 0, +-}; +-enum{ +- TRACECMD_TIME_SYNC_CMD_PROBE = 1, +- TRACECMD_TIME_SYNC_CMD_STOP = 2, +-}; +- +-#define TRACECMD_TIME_SYNC_PROTO_PTP_WEIGHT 10 +- +-struct tracecmd_time_sync { +- unsigned int sync_proto; +- int loop_interval; +- pthread_mutex_t lock; +- pthread_cond_t cond; +- char *clock_str; +- struct tracecmd_msg_handle *msg_handle; +- void *context; +-}; +- +-void tracecmd_tsync_init(void); +-int tracecmd_tsync_proto_getall(char **proto_mask, int *words); +-unsigned int tracecmd_tsync_proto_select(char *proto_mask, int words); +-bool tsync_proto_is_supported(unsigned int proto_id); +-void tracecmd_tsync_with_host(struct tracecmd_time_sync *tsync); +-void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync); +-int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync, +- int *count, +- long long **ts, long long **offsets); +-void tracecmd_tsync_free(struct tracecmd_time_sync *tsync); +- +-/* --- Plugin handling --- */ +-extern struct tep_plugin_option trace_ftrace_options[]; +- +-char **trace_util_find_plugin_files(const char *suffix); +-void trace_util_free_plugin_files(char **files); +- +-/* Used for trace-cmd list */ +-void tracecmd_ftrace_load_options(void); +- +-/* event hooks */ +- +-struct hook_list { +- struct hook_list *next; +- struct buffer_instance *instance; +- const char *hook; +- char *str; +- char *start_system; +- char *start_event; +- char *start_match; +- char *end_system; +- char *end_event; +- char *end_match; +- char *pid; +- int migrate; +- int global; +- int stack; +-}; +- +-struct hook_list *tracecmd_create_event_hook(const char *arg); +-void tracecmd_free_hooks(struct hook_list *hooks); +- +-void tracecmd_plog(const char *fmt, ...); +-void tracecmd_plog_error(const char *fmt, ...); +-int tracecmd_set_logfile(char *logfile); +- +-/* --- System --- */ +-unsigned long long tracecmd_generate_traceid(void); +-int tracecmd_count_cpus(void); +- +-/* --- Hack! --- */ +-int tracecmd_blk_hack(struct tracecmd_input *handle); +- +-/* --- Stack tracer functions --- */ +-int tracecmd_stack_tracer_status(int *status); +- +-/* --- Debugging --- */ +-struct kbuffer *tracecmd_record_kbuf(struct tracecmd_input *handle, +- struct tep_record *record); +-void *tracecmd_record_page(struct tracecmd_input *handle, +- struct tep_record *record); +-void *tracecmd_record_offset(struct tracecmd_input *handle, +- struct tep_record *record); ++unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle); ++int tracecmd_get_guest_cpumap(struct tracecmd_input *handle, ++ unsigned long long trace_id, ++ const char **name, ++ int *vcpu_count, const int **cpu_pid); ++int tracecmd_buffer_instances(struct tracecmd_input *handle); ++const char *tracecmd_buffer_instance_name(struct tracecmd_input *handle, int indx); ++struct tracecmd_input *tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx); + + #endif /* _TRACE_CMD_H */ +diff --git a/include/trace-cmd/trace-filter-hash.h b/include/trace-cmd/trace-filter-hash.h +deleted file mode 100644 +index 4111c41..0000000 +--- a/include/trace-cmd/trace-filter-hash.h ++++ /dev/null +@@ -1,64 +0,0 @@ +-/* SPDX-License-Identifier: LGPL-2.1 */ +-/* +- * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt +- * Copyright (C) 2018 VMware Inc, Steven Rostedt +- * +- */ +-#ifndef _TRACE_FILTER_HASH_H +-#define _TRACE_FILTER_HASH_H +- +-#include +- +-struct tracecmd_filter_id_item { +- struct tracecmd_filter_id_item *next; +- int id; +-}; +- +-struct tracecmd_filter_id { +- struct tracecmd_filter_id_item **hash; +- int count; +-}; +- +-/** +- * tracecmd_quick_hash - A quick (non secured) hash alogirthm +- * @val: The value to perform the hash on +- * @bits: The size in bits you need to return +- * +- * This is a quick hashing function adapted from Donald E. Knuth's 32 +- * bit multiplicative hash. See The Art of Computer Programming (TAOCP). +- * Multiplication by the Prime number, closest to the golden ratio of +- * 2^32. +- * +- * @bits is used to max the result for use cases that require +- * a power of 2 return value that is less than 32 bits. Any value +- * of @bits greater than 31 (or zero), will simply return the full hash on @val. +- */ +-static inline uint32_t tracecmd_quick_hash(uint32_t val, unsigned int bits) +-{ +- val *= UINT32_C(2654435761); +- +- if (!bits || bits > 31) +- return val; +- +- return val & ((1 << bits) - 1); +-} +- +-struct tracecmd_filter_id_item * +- tracecmd_filter_id_find(struct tracecmd_filter_id *hash, int id); +-void tracecmd_filter_id_add(struct tracecmd_filter_id *hash, int id); +-void tracecmd_filter_id_remove(struct tracecmd_filter_id *hash, int id); +-void tracecmd_filter_id_clear(struct tracecmd_filter_id *hash); +-struct tracecmd_filter_id *tracecmd_filter_id_hash_alloc(void); +-void tracecmd_filter_id_hash_free(struct tracecmd_filter_id *hash); +-struct tracecmd_filter_id * +- tracecmd_filter_id_hash_copy(struct tracecmd_filter_id *hash); +-int *tracecmd_filter_ids(struct tracecmd_filter_id *hash); +-int tracecmd_filter_id_compare(struct tracecmd_filter_id *hash1, +- struct tracecmd_filter_id *hash2); +- +-static inline int tracecmd_filter_task_count(struct tracecmd_filter_id *hash) +-{ +- return hash->count; +-} +- +-#endif /* _TRACE_FILTER_HASH_H */ +diff --git a/include/trace-cmd/trace-hash.h b/include/trace-cmd/trace-hash.h +deleted file mode 100644 +index aa92cdf..0000000 +--- a/include/trace-cmd/trace-hash.h ++++ /dev/null +@@ -1,55 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-/* +- * Copyright (C) 2014 Red Hat Inc, Steven Rostedt +- * +- */ +-#ifndef _TRACE_HASH_H +-#define _TRACE_HASH_H +- +-struct trace_hash_item { +- struct trace_hash_item *next; +- struct trace_hash_item *prev; +- unsigned long long key; +-}; +- +-struct trace_hash { +- struct trace_hash_item **buckets; +- int nr_buckets; +- int power; +-}; +- +-int trace_hash_init(struct trace_hash *hash, int buckets); +-void trace_hash_free(struct trace_hash *hash); +-int trace_hash_add(struct trace_hash *hash, struct trace_hash_item *item); +-int trace_hash_empty(struct trace_hash *hash); +- +-static inline void trace_hash_del(struct trace_hash_item *item) +-{ +- struct trace_hash_item *prev = item->prev; +- +- prev->next = item->next; +- if (item->next) +- item->next->prev = prev; +-} +- +-#define trace_hash_for_each_bucket(bucket, hash) \ +- for (bucket = (hash)->buckets; \ +- (bucket) < (hash)->buckets + (hash)->nr_buckets; (bucket)++) +- +-#define trace_hash_for_each_item(item, bucket) \ +- for ((item = *(bucket)); item; item = (item)->next) +- +-#define trace_hash_for_each_item_safe(item, n, bucket) \ +- for ((item = *(bucket)), n = item ? item->next : NULL; item; \ +- item = n, n = item ? (item)->next : NULL) +- +-#define trace_hash_while_item(item, bucket) \ +- while ((item = *(bucket))) +- +-typedef int (*trace_hash_func)(struct trace_hash_item *item, void *data); +- +-struct trace_hash_item * +-trace_hash_find(struct trace_hash *hash, unsigned long long key, +- trace_hash_func match, void *data); +- +-#endif /* _TRACE_HASH_H */ +diff --git a/include/trace-cmd/trace-msg.h b/include/trace-cmd/trace-msg.h +deleted file mode 100644 +index aab8a69..0000000 +--- a/include/trace-cmd/trace-msg.h ++++ /dev/null +@@ -1,15 +0,0 @@ +-#ifndef _TRACE_MSG_H_ +-#define _TRACE_MSG_H_ +- +-#include +- +-#define UDP_MAX_PACKET (65536 - 20) +-#define V3_MAGIC "766679\0" +-#define V3_CPU "-1V3" +- +-#define V1_PROTOCOL 1 +-#define V3_PROTOCOL 3 +- +-extern unsigned int page_size; +- +-#endif /* _TRACE_MSG_H_ */ +diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h +new file mode 100644 +index 0000000..458760e +--- /dev/null ++++ b/lib/trace-cmd/include/private/trace-cmd-private.h +@@ -0,0 +1,480 @@ ++/* SPDX-License-Identifier: LGPL-2.1 */ ++/* ++ * Copyright (C) 2008, 2009, 2010 Red Hat Inc, Steven Rostedt ++ * ++ */ ++#ifndef _TRACE_CMD_PRIVATE_H ++#define _TRACE_CMD_PRIVATE_H ++ ++#include "traceevent/event-parse.h" ++#include "trace-cmd/trace-cmd.h" ++ ++#define TRACECMD_MAGIC { 23, 8, 68 } ++ ++#define ARRAY_SIZE(_a) (sizeof(_a) / sizeof((_a)[0])) ++#define __weak __attribute__((weak)) ++#define __noreturn __attribute__((noreturn)) ++ ++#define TRACECMD_ERR_MSK ((unsigned long)(-1) & ~((1UL << 14) - 1)) ++#define TRACECMD_ISERR(ptr) ((unsigned long)(ptr) > TRACECMD_ERR_MSK) ++#define TRACECMD_ERROR(ret) ((void *)((unsigned long)(ret) | TRACECMD_ERR_MSK)) ++#define TRACECMD_PTR2ERR(ptr) ((unisgned long)(ptr) & ~TRACECMD_ERR_MSK) ++ ++void tracecmd_parse_cmdlines(struct tep_handle *pevent, char *file, int size); ++void tracecmd_parse_proc_kallsyms(struct tep_handle *pevent, char *file, unsigned int size); ++void tracecmd_parse_ftrace_printk(struct tep_handle *pevent, char *file, unsigned int size); ++struct tep_plugin_list *trace_load_plugins(struct tep_handle *tep); ++ ++int *tracecmd_add_id(int *list, int id, int len); ++ ++enum { ++ RINGBUF_TYPE_PADDING = 29, ++ RINGBUF_TYPE_TIME_EXTEND = 30, ++ RINGBUF_TYPE_TIME_STAMP = 31, ++}; ++ ++void tracecmd_record_ref(struct tep_record *record); ++ ++void tracecmd_set_debug(bool set_debug); ++bool tracecmd_get_debug(void); ++ ++struct tracecmd_output; ++struct tracecmd_recorder; ++struct hook_list; ++ ++/* --- tracecmd plugins --- */ ++ ++extern int tracecmd_disable_sys_plugins; ++extern int tracecmd_disable_plugins; ++ ++enum tracecmd_context { ++ TRACECMD_INPUT, ++ TRACECMD_OUTPUT, ++}; ++ ++enum tracecmd_plugin_flag { ++ TRACECMD_DISABLE_SYS_PLUGINS = 1, ++ TRACECMD_DISABLE_PLUGINS = 1 << 1, ++}; ++ ++struct trace_plugin_context; ++ ++struct trace_plugin_context * ++tracecmd_plugin_context_create(enum tracecmd_context context, void *data); ++ ++void tracecmd_plugin_set_flag(struct trace_plugin_context *context, ++ enum tracecmd_plugin_flag flag); ++ ++#define TRACECMD_PLUGIN_LOADER tracecmd_plugin_loader ++#define TRACECMD_PLUGIN_UNLOADER tracecmd_plugin_unloader ++#define TRACECMD_PLUGIN_ALIAS tracecmd_plugin_alias ++#define _MAKE_STR(x) #x ++#define MAKE_STR(x) _MAKE_STR(x) ++#define TRACECMD_PLUGIN_LOADER_NAME MAKE_STR(TRACECMD_PLUGIN_LOADER) ++#define TRACECMD_PLUGIN_UNLOADER_NAME MAKE_STR(TRACECMD_PLUGIN_UNLOADER) ++#define TRACECMD_PLUGIN_ALIAS_NAME MAKE_STR(TRACECMD_PLUGIN_ALIAS) ++ ++typedef int (*tracecmd_plugin_load_func)(struct trace_plugin_context *trace); ++typedef int (*tracecmd_plugin_unload_func)(struct trace_plugin_context *trace); ++ ++struct tracecmd_input * ++tracecmd_plugin_context_input(struct trace_plugin_context *trace_context); ++struct tracecmd_output * ++tracecmd_plugin_context_output(struct trace_plugin_context *trace_context); ++ ++void tracecmd_set_quiet(struct tracecmd_output *handle, bool set_quiet); ++bool tracecmd_get_quiet(struct tracecmd_output *handle); ++ ++static inline int tracecmd_host_bigendian(void) ++{ ++ unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 }; ++ unsigned int *ptr; ++ ++ ptr = (unsigned int *)str; ++ return *ptr == 0x01020304; ++} ++ ++/* --- Opening and Reading the trace.dat file --- */ ++ ++enum { ++ TRACECMD_OPTION_DONE, ++ TRACECMD_OPTION_DATE, ++ TRACECMD_OPTION_CPUSTAT, ++ TRACECMD_OPTION_BUFFER, ++ TRACECMD_OPTION_TRACECLOCK, ++ TRACECMD_OPTION_UNAME, ++ TRACECMD_OPTION_HOOK, ++ TRACECMD_OPTION_OFFSET, ++ TRACECMD_OPTION_CPUCOUNT, ++ TRACECMD_OPTION_VERSION, ++ TRACECMD_OPTION_PROCMAPS, ++ TRACECMD_OPTION_TRACEID, ++ TRACECMD_OPTION_TIME_SHIFT, ++ TRACECMD_OPTION_GUEST, ++}; ++ ++enum { ++ TRACECMD_FL_IGNORE_DATE = (1 << 0), ++ TRACECMD_FL_BUFFER_INSTANCE = (1 << 1), ++ TRACECMD_FL_LATENCY = (1 << 2), ++ TRACECMD_FL_IN_USECS = (1 << 3), ++ TRACECMD_FL_FLYRECORD = (1 << 4), ++}; ++ ++struct tracecmd_ftrace { ++ struct tracecmd_input *handle; ++ struct tep_event *fgraph_ret_event; ++ int fgraph_ret_id; ++ int long_size; ++}; ++ ++struct tracecmd_proc_addr_map { ++ unsigned long long start; ++ unsigned long long end; ++ char *lib_name; ++}; ++ ++typedef void (*tracecmd_show_data_func)(struct tracecmd_input *handle, ++ struct tep_record *record); ++typedef void (*tracecmd_handle_init_func)(struct tracecmd_input *handle, ++ struct hook_list *hook, int global); ++ ++struct tracecmd_input *tracecmd_alloc(const char *file); ++struct tracecmd_input *tracecmd_alloc_fd(int fd); ++struct tracecmd_input *tracecmd_open(const char *file); ++struct tracecmd_input *tracecmd_open_fd(int fd); ++void tracecmd_unpair_peer(struct tracecmd_input *handle); ++void tracecmd_ref(struct tracecmd_input *handle); ++int tracecmd_read_headers(struct tracecmd_input *handle); ++int tracecmd_get_parsing_failures(struct tracecmd_input *handle); ++int tracecmd_long_size(struct tracecmd_input *handle); ++int tracecmd_page_size(struct tracecmd_input *handle); ++int tracecmd_cpus(struct tracecmd_input *handle); ++int tracecmd_copy_headers(struct tracecmd_input *handle, int fd); ++void tracecmd_set_flag(struct tracecmd_input *handle, int flag); ++void tracecmd_clear_flag(struct tracecmd_input *handle, int flag); ++unsigned long tracecmd_get_flags(struct tracecmd_input *handle); ++unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle); ++int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable); ++ ++void tracecmd_parse_trace_clock(struct tracecmd_input *handle, char *file, int size); ++ ++int tracecmd_make_pipe(struct tracecmd_input *handle, int cpu, int fd, int cpus); ++ ++int tracecmd_is_buffer_instance(struct tracecmd_input *handle); ++ ++void tracecmd_set_ts_offset(struct tracecmd_input *handle, long long offset); ++void tracecmd_set_ts2secs(struct tracecmd_input *handle, unsigned long long hz); ++ ++void tracecmd_print_events(struct tracecmd_input *handle, const char *regex); ++ ++struct hook_list *tracecmd_hooks(struct tracecmd_input *handle); ++ ++void tracecmd_print_stats(struct tracecmd_input *handle); ++void tracecmd_print_uname(struct tracecmd_input *handle); ++void tracecmd_print_version(struct tracecmd_input *handle); ++ ++struct tep_record * ++tracecmd_peek_data(struct tracecmd_input *handle, int cpu); ++ ++static inline struct tep_record * ++tracecmd_peek_data_ref(struct tracecmd_input *handle, int cpu) ++{ ++ struct tep_record *rec = tracecmd_peek_data(handle, cpu); ++ if (rec) ++ rec->ref_count++; ++ return rec; ++} ++ ++struct tep_record * ++tracecmd_read_prev(struct tracecmd_input *handle, struct tep_record *record); ++ ++struct tep_record * ++tracecmd_read_next_data(struct tracecmd_input *handle, int *rec_cpu); ++ ++struct tep_record * ++tracecmd_peek_next_data(struct tracecmd_input *handle, int *rec_cpu); ++ ++struct tep_record * ++tracecmd_translate_data(struct tracecmd_input *handle, ++ void *ptr, int size); ++struct tep_record * ++tracecmd_read_cpu_last(struct tracecmd_input *handle, int cpu); ++int tracecmd_refresh_record(struct tracecmd_input *handle, ++ struct tep_record *record); ++ ++int tracecmd_set_cpu_to_timestamp(struct tracecmd_input *handle, ++ int cpu, unsigned long long ts); ++void ++tracecmd_set_all_cpus_to_timestamp(struct tracecmd_input *handle, ++ unsigned long long time); ++ ++int tracecmd_set_cursor(struct tracecmd_input *handle, ++ int cpu, unsigned long long offset); ++unsigned long long ++tracecmd_get_cursor(struct tracecmd_input *handle, int cpu); ++ ++int tracecmd_ftrace_overrides(struct tracecmd_input *handle, struct tracecmd_ftrace *finfo); ++bool tracecmd_get_use_trace_clock(struct tracecmd_input *handle); ++tracecmd_show_data_func ++tracecmd_get_show_data_func(struct tracecmd_input *handle); ++void tracecmd_set_show_data_func(struct tracecmd_input *handle, ++ tracecmd_show_data_func func); ++ ++int tracecmd_record_at_buffer_start(struct tracecmd_input *handle, struct tep_record *record); ++unsigned long long tracecmd_page_ts(struct tracecmd_input *handle, ++ struct tep_record *record); ++unsigned int tracecmd_record_ts_delta(struct tracecmd_input *handle, ++ struct tep_record *record); ++ ++struct tracecmd_proc_addr_map * ++tracecmd_search_task_map(struct tracecmd_input *handle, ++ int pid, unsigned long long addr); ++#ifndef SWIG ++/* hack for function graph work around */ ++extern __thread struct tracecmd_input *tracecmd_curr_thread_handle; ++#endif ++ ++ ++/* --- Creating and Writing the trace.dat file --- */ ++ ++struct tracecmd_event_list { ++ struct tracecmd_event_list *next; ++ const char *glob; ++}; ++ ++struct tracecmd_option; ++struct tracecmd_msg_handle; ++ ++struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus); ++struct tracecmd_output *tracecmd_create_file(const char *output_file, ++ int cpus, char * const *cpu_data_files); ++struct tracecmd_output * ++tracecmd_create_file_glob(const char *output_file, ++ int cpus, char * const *cpu_data_files, ++ struct tracecmd_event_list *event_globs); ++struct tracecmd_output * ++tracecmd_create_init_file_glob(const char *output_file, ++ struct tracecmd_event_list *list); ++struct tracecmd_output *tracecmd_create_init_fd(int fd); ++struct tracecmd_output * ++tracecmd_create_init_fd_glob(int fd, struct tracecmd_event_list *list); ++struct tracecmd_output * ++tracecmd_create_init_fd_msg(struct tracecmd_msg_handle *msg_handle, ++ struct tracecmd_event_list *list); ++struct tracecmd_output *tracecmd_create_init_file(const char *output_file); ++struct tracecmd_output *tracecmd_create_init_file_override(const char *output_file, ++ const char *tracing_dir, ++ const char *kallsyms); ++struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle, ++ unsigned short id, int size, ++ const void *data); ++struct tracecmd_option * ++tracecmd_add_option_v(struct tracecmd_output *handle, ++ unsigned short id, const struct iovec *vector, int count); ++ ++struct tracecmd_option *tracecmd_add_buffer_option(struct tracecmd_output *handle, ++ const char *name, int cpus); ++ ++int tracecmd_write_cpus(struct tracecmd_output *handle, int cpus); ++int tracecmd_write_options(struct tracecmd_output *handle); ++int tracecmd_append_options(struct tracecmd_output *handle); ++int tracecmd_update_option(struct tracecmd_output *handle, ++ struct tracecmd_option *option, int size, ++ const void *data); ++void tracecmd_output_close(struct tracecmd_output *handle); ++void tracecmd_output_free(struct tracecmd_output *handle); ++struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle, ++ const char *file); ++ ++int tracecmd_write_cpu_data(struct tracecmd_output *handle, ++ int cpus, char * const *cpu_data_files); ++int tracecmd_append_cpu_data(struct tracecmd_output *handle, ++ int cpus, char * const *cpu_data_files); ++int tracecmd_append_buffer_cpu_data(struct tracecmd_output *handle, ++ struct tracecmd_option *option, ++ int cpus, char * const *cpu_data_files); ++ ++struct tracecmd_output *tracecmd_get_output_handle_fd(int fd); ++ ++/* --- Reading the Fly Recorder Trace --- */ ++ ++enum { ++ TRACECMD_RECORD_NOSPLICE = (1 << 0), /* Use read instead of splice */ ++ TRACECMD_RECORD_SNAPSHOT = (1 << 1), /* Extract from snapshot */ ++ TRACECMD_RECORD_BLOCK = (1 << 2), /* Block on splice write */ ++ TRACECMD_RECORD_NOBRASS = (1 << 3), /* Splice directly without a brass pipe */ ++}; ++ ++void tracecmd_free_recorder(struct tracecmd_recorder *recorder); ++struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu, unsigned flags); ++struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu, unsigned flags); ++struct tracecmd_recorder *tracecmd_create_recorder_virt(const char *file, int cpu, unsigned flags, int trace_fd); ++struct tracecmd_recorder *tracecmd_create_recorder_maxkb(const char *file, int cpu, unsigned flags, int maxkb); ++struct tracecmd_recorder *tracecmd_create_buffer_recorder_fd(int fd, int cpu, unsigned flags, const char *buffer); ++struct tracecmd_recorder *tracecmd_create_buffer_recorder(const char *file, int cpu, unsigned flags, const char *buffer); ++struct tracecmd_recorder *tracecmd_create_buffer_recorder_maxkb(const char *file, int cpu, unsigned flags, const char *buffer, int maxkb); ++ ++int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep); ++void tracecmd_stop_recording(struct tracecmd_recorder *recorder); ++long tracecmd_flush_recording(struct tracecmd_recorder *recorder); ++ ++enum tracecmd_msg_flags { ++ TRACECMD_MSG_FL_USE_TCP = 1 << 0, ++}; ++ ++/* for both client and server */ ++struct tracecmd_msg_handle { ++ int fd; ++ short cpu_count; ++ short version; /* Current protocol version */ ++ unsigned long flags; ++ bool done; ++}; ++ ++struct tracecmd_msg_handle * ++tracecmd_msg_handle_alloc(int fd, unsigned long flags); ++ ++/* Closes the socket and frees the handle */ ++void tracecmd_msg_handle_close(struct tracecmd_msg_handle *msg_handle); ++ ++/* for clients */ ++int tracecmd_msg_send_init_data(struct tracecmd_msg_handle *msg_handle, ++ unsigned int **client_ports); ++int tracecmd_msg_data_send(struct tracecmd_msg_handle *msg_handle, ++ const char *buf, int size); ++int tracecmd_msg_finish_sending_data(struct tracecmd_msg_handle *msg_handle); ++int tracecmd_msg_send_close_msg(struct tracecmd_msg_handle *msg_handle); ++int tracecmd_msg_send_close_resp_msg(struct tracecmd_msg_handle *msg_handle); ++int tracecmd_msg_wait_close(struct tracecmd_msg_handle *msg_handle); ++int tracecmd_msg_wait_close_resp(struct tracecmd_msg_handle *msg_handle); ++ ++/* for server */ ++int tracecmd_msg_initial_setting(struct tracecmd_msg_handle *msg_handle); ++int tracecmd_msg_send_port_array(struct tracecmd_msg_handle *msg_handle, ++ unsigned *ports); ++int tracecmd_msg_read_data(struct tracecmd_msg_handle *msg_handle, int ofd); ++int tracecmd_msg_collect_data(struct tracecmd_msg_handle *msg_handle, int ofd); ++bool tracecmd_msg_done(struct tracecmd_msg_handle *msg_handle); ++void tracecmd_msg_set_done(struct tracecmd_msg_handle *msg_handle); ++ ++int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle, ++ int argc, char **argv, bool use_fifos, ++ unsigned long long trace_id, ++ char *tsync_protos, ++ int tsync_protos_size); ++int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, ++ int *argc, char ***argv, bool *use_fifos, ++ unsigned long long *trace_id, ++ char **tsync_protos, ++ unsigned int *tsync_protos_size); ++ ++int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle, ++ int nr_cpus, int page_size, ++ unsigned int *ports, bool use_fifos, ++ unsigned long long trace_id, ++ unsigned int tsync_proto, ++ unsigned int tsync_port); ++int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, ++ int *nr_cpus, int *page_size, ++ unsigned int **ports, bool *use_fifos, ++ unsigned long long *trace_id, ++ unsigned int *tsync_proto, ++ unsigned int *tsync_port); ++ ++int tracecmd_msg_send_time_sync(struct tracecmd_msg_handle *msg_handle, ++ unsigned int sync_protocol, ++ unsigned int sync_msg_id, ++ unsigned int payload_size, char *payload); ++int tracecmd_msg_recv_time_sync(struct tracecmd_msg_handle *msg_handle, ++ unsigned int *sync_protocol, ++ unsigned int *sync_msg_id, ++ unsigned int *payload_size, char **payload); ++ ++/* --- Timestamp synchronization --- */ ++ ++enum{ ++ TRACECMD_TIME_SYNC_PROTO_NONE = 0, ++}; ++enum{ ++ TRACECMD_TIME_SYNC_CMD_PROBE = 1, ++ TRACECMD_TIME_SYNC_CMD_STOP = 2, ++}; ++ ++#define TRACECMD_TIME_SYNC_PROTO_PTP_WEIGHT 10 ++ ++struct tracecmd_time_sync { ++ unsigned int sync_proto; ++ int loop_interval; ++ pthread_mutex_t lock; ++ pthread_cond_t cond; ++ char *clock_str; ++ struct tracecmd_msg_handle *msg_handle; ++ void *context; ++}; ++ ++void tracecmd_tsync_init(void); ++int tracecmd_tsync_proto_getall(char **proto_mask, int *words); ++unsigned int tracecmd_tsync_proto_select(char *proto_mask, int words); ++bool tsync_proto_is_supported(unsigned int proto_id); ++void tracecmd_tsync_with_host(struct tracecmd_time_sync *tsync); ++void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync); ++int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync, ++ int *count, ++ long long **ts, long long **offsets); ++void tracecmd_tsync_free(struct tracecmd_time_sync *tsync); ++ ++/* --- Plugin handling --- */ ++extern struct tep_plugin_option trace_ftrace_options[]; ++ ++char **trace_util_find_plugin_files(const char *suffix); ++void trace_util_free_plugin_files(char **files); ++ ++/* Used for trace-cmd list */ ++void tracecmd_ftrace_load_options(void); ++ ++/* event hooks */ ++ ++struct hook_list { ++ struct hook_list *next; ++ struct buffer_instance *instance; ++ const char *hook; ++ char *str; ++ char *start_system; ++ char *start_event; ++ char *start_match; ++ char *end_system; ++ char *end_event; ++ char *end_match; ++ char *pid; ++ int migrate; ++ int global; ++ int stack; ++}; ++ ++struct hook_list *tracecmd_create_event_hook(const char *arg); ++void tracecmd_free_hooks(struct hook_list *hooks); ++ ++void tracecmd_plog(const char *fmt, ...); ++void tracecmd_plog_error(const char *fmt, ...); ++int tracecmd_set_logfile(char *logfile); ++ ++/* --- System --- */ ++unsigned long long tracecmd_generate_traceid(void); ++int tracecmd_count_cpus(void); ++ ++/* --- Hack! --- */ ++int tracecmd_blk_hack(struct tracecmd_input *handle); ++ ++/* --- Stack tracer functions --- */ ++int tracecmd_stack_tracer_status(int *status); ++ ++/* --- Debugging --- */ ++struct kbuffer *tracecmd_record_kbuf(struct tracecmd_input *handle, ++ struct tep_record *record); ++void *tracecmd_record_page(struct tracecmd_input *handle, ++ struct tep_record *record); ++void *tracecmd_record_offset(struct tracecmd_input *handle, ++ struct tep_record *record); ++ ++#endif /* _TRACE_CMD_PRIVATE_H */ +diff --git a/lib/trace-cmd/include/private/trace-filter-hash.h b/lib/trace-cmd/include/private/trace-filter-hash.h +new file mode 100644 +index 0000000..4111c41 +--- /dev/null ++++ b/lib/trace-cmd/include/private/trace-filter-hash.h +@@ -0,0 +1,64 @@ ++/* SPDX-License-Identifier: LGPL-2.1 */ ++/* ++ * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt ++ * Copyright (C) 2018 VMware Inc, Steven Rostedt ++ * ++ */ ++#ifndef _TRACE_FILTER_HASH_H ++#define _TRACE_FILTER_HASH_H ++ ++#include ++ ++struct tracecmd_filter_id_item { ++ struct tracecmd_filter_id_item *next; ++ int id; ++}; ++ ++struct tracecmd_filter_id { ++ struct tracecmd_filter_id_item **hash; ++ int count; ++}; ++ ++/** ++ * tracecmd_quick_hash - A quick (non secured) hash alogirthm ++ * @val: The value to perform the hash on ++ * @bits: The size in bits you need to return ++ * ++ * This is a quick hashing function adapted from Donald E. Knuth's 32 ++ * bit multiplicative hash. See The Art of Computer Programming (TAOCP). ++ * Multiplication by the Prime number, closest to the golden ratio of ++ * 2^32. ++ * ++ * @bits is used to max the result for use cases that require ++ * a power of 2 return value that is less than 32 bits. Any value ++ * of @bits greater than 31 (or zero), will simply return the full hash on @val. ++ */ ++static inline uint32_t tracecmd_quick_hash(uint32_t val, unsigned int bits) ++{ ++ val *= UINT32_C(2654435761); ++ ++ if (!bits || bits > 31) ++ return val; ++ ++ return val & ((1 << bits) - 1); ++} ++ ++struct tracecmd_filter_id_item * ++ tracecmd_filter_id_find(struct tracecmd_filter_id *hash, int id); ++void tracecmd_filter_id_add(struct tracecmd_filter_id *hash, int id); ++void tracecmd_filter_id_remove(struct tracecmd_filter_id *hash, int id); ++void tracecmd_filter_id_clear(struct tracecmd_filter_id *hash); ++struct tracecmd_filter_id *tracecmd_filter_id_hash_alloc(void); ++void tracecmd_filter_id_hash_free(struct tracecmd_filter_id *hash); ++struct tracecmd_filter_id * ++ tracecmd_filter_id_hash_copy(struct tracecmd_filter_id *hash); ++int *tracecmd_filter_ids(struct tracecmd_filter_id *hash); ++int tracecmd_filter_id_compare(struct tracecmd_filter_id *hash1, ++ struct tracecmd_filter_id *hash2); ++ ++static inline int tracecmd_filter_task_count(struct tracecmd_filter_id *hash) ++{ ++ return hash->count; ++} ++ ++#endif /* _TRACE_FILTER_HASH_H */ +diff --git a/lib/trace-cmd/include/private/trace-hash.h b/lib/trace-cmd/include/private/trace-hash.h +new file mode 100644 +index 0000000..aa92cdf +--- /dev/null ++++ b/lib/trace-cmd/include/private/trace-hash.h +@@ -0,0 +1,55 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2014 Red Hat Inc, Steven Rostedt ++ * ++ */ ++#ifndef _TRACE_HASH_H ++#define _TRACE_HASH_H ++ ++struct trace_hash_item { ++ struct trace_hash_item *next; ++ struct trace_hash_item *prev; ++ unsigned long long key; ++}; ++ ++struct trace_hash { ++ struct trace_hash_item **buckets; ++ int nr_buckets; ++ int power; ++}; ++ ++int trace_hash_init(struct trace_hash *hash, int buckets); ++void trace_hash_free(struct trace_hash *hash); ++int trace_hash_add(struct trace_hash *hash, struct trace_hash_item *item); ++int trace_hash_empty(struct trace_hash *hash); ++ ++static inline void trace_hash_del(struct trace_hash_item *item) ++{ ++ struct trace_hash_item *prev = item->prev; ++ ++ prev->next = item->next; ++ if (item->next) ++ item->next->prev = prev; ++} ++ ++#define trace_hash_for_each_bucket(bucket, hash) \ ++ for (bucket = (hash)->buckets; \ ++ (bucket) < (hash)->buckets + (hash)->nr_buckets; (bucket)++) ++ ++#define trace_hash_for_each_item(item, bucket) \ ++ for ((item = *(bucket)); item; item = (item)->next) ++ ++#define trace_hash_for_each_item_safe(item, n, bucket) \ ++ for ((item = *(bucket)), n = item ? item->next : NULL; item; \ ++ item = n, n = item ? (item)->next : NULL) ++ ++#define trace_hash_while_item(item, bucket) \ ++ while ((item = *(bucket))) ++ ++typedef int (*trace_hash_func)(struct trace_hash_item *item, void *data); ++ ++struct trace_hash_item * ++trace_hash_find(struct trace_hash *hash, unsigned long long key, ++ trace_hash_func match, void *data); ++ ++#endif /* _TRACE_HASH_H */ +diff --git a/lib/trace-cmd/include/private/trace-msg.h b/lib/trace-cmd/include/private/trace-msg.h +new file mode 100644 +index 0000000..aab8a69 +--- /dev/null ++++ b/lib/trace-cmd/include/private/trace-msg.h +@@ -0,0 +1,15 @@ ++#ifndef _TRACE_MSG_H_ ++#define _TRACE_MSG_H_ ++ ++#include ++ ++#define UDP_MAX_PACKET (65536 - 20) ++#define V3_MAGIC "766679\0" ++#define V3_CPU "-1V3" ++ ++#define V1_PROTOCOL 1 ++#define V3_PROTOCOL 3 ++ ++extern unsigned int page_size; ++ ++#endif /* _TRACE_MSG_H_ */ +diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h +index 95dce66..d0a7365 100644 +--- a/lib/trace-cmd/include/trace-cmd-local.h ++++ b/lib/trace-cmd/include/trace-cmd-local.h +@@ -6,6 +6,8 @@ + #ifndef _TRACE_CMD_LOCAL_H + #define _TRACE_CMD_LOCAL_H + ++#include "trace-cmd-private.h" ++ + /* Can be overridden */ + void warning(const char *fmt, ...); + +diff --git a/lib/trace-cmd/trace-ftrace.c b/lib/trace-cmd/trace-ftrace.c +index 20bf71f..df7335f 100644 +--- a/lib/trace-cmd/trace-ftrace.c ++++ b/lib/trace-cmd/trace-ftrace.c +@@ -8,7 +8,7 @@ + #include + #include + +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + + struct tep_plugin_option trace_ftrace_options[] = { + { +diff --git a/lib/trace-cmd/trace-hooks.c b/lib/trace-cmd/trace-hooks.c +index 8c969a6..2dadf61 100644 +--- a/lib/trace-cmd/trace-hooks.c ++++ b/lib/trace-cmd/trace-hooks.c +@@ -8,7 +8,7 @@ + #include + #include + +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + #include "event-utils.h" + + struct hook_list *tracecmd_create_event_hook(const char *arg) +diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c +index 2a6e2b6..6b647d6 100644 +--- a/lib/trace-cmd/trace-recorder.c ++++ b/lib/trace-cmd/trace-recorder.c +@@ -13,7 +13,7 @@ + #include + + #include "tracefs.h" +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + #include "event-utils.h" + + /* F_GETPIPE_SZ was introduced in 2.6.35, older systems don't have it */ +diff --git a/lib/trace-cmd/trace-timesync.c b/lib/trace-cmd/trace-timesync.c +index 7a6a7eb..390e9d9 100644 +--- a/lib/trace-cmd/trace-timesync.c ++++ b/lib/trace-cmd/trace-timesync.c +@@ -17,7 +17,7 @@ + #include + #include + +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + #include "tracefs.h" + #include "event-utils.h" + #include "trace-tsync-local.h" +diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c +index 0ead96e..6b5d872 100644 +--- a/lib/trace-cmd/trace-util.c ++++ b/lib/trace-cmd/trace-util.c +@@ -21,7 +21,7 @@ + #include + #include + +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + #include "event-utils.h" + + #define LOCAL_PLUGIN_DIR ".trace-cmd/plugins" +diff --git a/lib/traceevent/plugins/plugin_python_loader.c b/lib/traceevent/plugins/plugin_python_loader.c +index 776bf12..01bdfad 100644 +--- a/lib/traceevent/plugins/plugin_python_loader.c ++++ b/lib/traceevent/plugins/plugin_python_loader.c +@@ -1,6 +1,7 @@ + #include + #include +-#include "trace-cmd.h" ++#include "event-parse.h" ++#include "trace-cmd-private.h" + + #ifndef PYTHON_DIR + #define PYTHON_DIR "." +diff --git a/python/ctracecmd.i b/python/ctracecmd.i +index 01cd0d5..5f7181c 100644 +--- a/python/ctracecmd.i ++++ b/python/ctracecmd.i +@@ -15,6 +15,7 @@ + + %{ + #include "trace-cmd.h" ++#include "event-parse.h" + #include "event-utils.h" + #include + %} +diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h +index 207aa68..28d1b4e 100644 +--- a/tracecmd/include/trace-local.h ++++ b/tracecmd/include/trace-local.h +@@ -9,7 +9,7 @@ + #include + #include /* for DIR */ + +-#include "trace-cmd.h" ++#include "trace-cmd-private.h" + #include "event-utils.h" + + #define TRACE_AGENT_DEFAULT_PORT 823 +-- +2.29.2 + diff --git a/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch b/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch deleted file mode 100644 index 350e52302..000000000 --- a/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c68c868b573acc73e144312326750be2ed96632f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 29 Jun 2017 14:43:19 +0300 -Subject: [PATCH] trace-listen: add missing header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PATH_MAX macro requires the limits.h header. This fixes build with musl -libc: - -.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c: In function ‘make_pid_name’: -.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c:167:16: error: ‘PATH_MAX’ undeclared (first use in this function) - snprintf(buf, PATH_MAX, VAR_RUN_DIR "/trace-cmd-net.pid"); - ^~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://lkml.org/lkml/2017/6/29/286 - - trace-listen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/trace-listen.c b/trace-listen.c -index 17ff9d8c160c..838d6bcf3649 100644 ---- a/trace-listen.c -+++ b/trace-listen.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "trace-local.h" - #include "trace-msg.h" --- -2.11.0 - diff --git a/buildroot/package/trace-cmd/0002-trace-cmd-make-it-build-against-musl-C-library.patch b/buildroot/package/trace-cmd/0002-trace-cmd-make-it-build-against-musl-C-library.patch new file mode 100644 index 000000000..64021245d --- /dev/null +++ b/buildroot/package/trace-cmd/0002-trace-cmd-make-it-build-against-musl-C-library.patch @@ -0,0 +1,140 @@ +From 1a000636c1828eecdcec5360a51623ef4ffbff04 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu +Date: Mon, 30 Nov 2020 14:27:55 +0200 +Subject: [PATCH] trace-cmd: make it build against musl C library + +* add some missing headers and macros +* set pthread affinity using pthread_setaffinity_np after creating the thread +instead of pthread_attr_setaffinity_np (which seems to not be implemented +in musl) + +Tested using https://musl.cc/x86_64-linux-musl-native.tgz + +Link: https://lore.kernel.org/linux-trace-devel/20201130122755.31000-1-beniaminsandu@gmail.com + +Reviewed-by: Tzvetomir Stoyanov (VMware) +Signed-off-by: Beniamin Sandu +[ Fixed a whitespace issue ] +Signed-off-by: Steven Rostedt (VMware) +[Retrieved from: +https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/commit/?id=1a000636c1828eecdcec5360a51623ef4ffbff04] +Signed-off-by: Fabrice Fontaine +--- + .../include/private/trace-cmd-private.h | 1 + + lib/trace-cmd/include/trace-cmd-local.h | 1 + + lib/tracefs/include/tracefs-local.h | 12 ++++++++++++ + lib/tracefs/tracefs-events.c | 1 + + tracecmd/include/trace-local.h | 1 + + tracecmd/trace-tsync.c | 16 +++++++++++----- + 6 files changed, 27 insertions(+), 5 deletions(-) + +diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h +index 458760e5..a0dac5da 100644 +--- a/lib/trace-cmd/include/private/trace-cmd-private.h ++++ b/lib/trace-cmd/include/private/trace-cmd-private.h +@@ -6,6 +6,7 @@ + #ifndef _TRACE_CMD_PRIVATE_H + #define _TRACE_CMD_PRIVATE_H + ++#include + #include "traceevent/event-parse.h" + #include "trace-cmd/trace-cmd.h" + +diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h +index d0a7365a..0cd27441 100644 +--- a/lib/trace-cmd/include/trace-cmd-local.h ++++ b/lib/trace-cmd/include/trace-cmd-local.h +@@ -6,6 +6,7 @@ + #ifndef _TRACE_CMD_LOCAL_H + #define _TRACE_CMD_LOCAL_H + ++#include + #include "trace-cmd-private.h" + + /* Can be overridden */ +diff --git a/lib/tracefs/include/tracefs-local.h b/lib/tracefs/include/tracefs-local.h +index 9cc371b4..bdbf89e8 100644 +--- a/lib/tracefs/include/tracefs-local.h ++++ b/lib/tracefs/include/tracefs-local.h +@@ -13,4 +13,16 @@ void warning(const char *fmt, ...); + int str_read_file(const char *file, char **buffer); + char *trace_append_file(const char *dir, const char *name); + ++#ifndef ACCESSPERMS ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++ ++#ifndef ALLPERMS ++#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ ++#ifndef DEFFILEMODE ++#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) /* 0666*/ ++#endif ++ + #endif /* _TRACE_FS_LOCAL_H */ +diff --git a/lib/tracefs/tracefs-events.c b/lib/tracefs/tracefs-events.c +index 80a25ee5..a4e5215f 100644 +--- a/lib/tracefs/tracefs-events.c ++++ b/lib/tracefs/tracefs-events.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "kbuffer.h" + #include "tracefs.h" +diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h +index 28d1b4e0..85c7e03e 100644 +--- a/tracecmd/include/trace-local.h ++++ b/tracecmd/include/trace-local.h +@@ -8,6 +8,7 @@ + + #include + #include /* for DIR */ ++#include + + #include "trace-cmd-private.h" + #include "event-utils.h" +diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c +index e639788d..8b9083ae 100644 +--- a/tracecmd/trace-tsync.c ++++ b/tracecmd/trace-tsync.c +@@ -104,13 +104,16 @@ int tracecmd_host_tsync(struct buffer_instance *instance, + + pthread_attr_init(&attrib); + pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); +- if (!get_first_cpu(&pin_mask, &mask_size)) +- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); + + ret = pthread_create(&instance->tsync_thread, &attrib, + tsync_host_thread, &instance->tsync); +- if (!ret) ++ ++ if (!ret) { ++ if (!get_first_cpu(&pin_mask, &mask_size)) ++ pthread_setaffinity_np(instance->tsync_thread, mask_size, pin_mask); + instance->tsync_thread_running = true; ++ } ++ + if (pin_mask) + CPU_FREE(pin_mask); + pthread_attr_destroy(&attrib); +@@ -243,11 +246,14 @@ unsigned int tracecmd_guest_tsync(char *tsync_protos, + pthread_attr_init(&attrib); + tsync->sync_proto = proto; + pthread_attr_setdetachstate(&attrib, PTHREAD_CREATE_JOINABLE); +- if (!get_first_cpu(&pin_mask, &mask_size)) +- pthread_attr_setaffinity_np(&attrib, mask_size, pin_mask); + + ret = pthread_create(thr_id, &attrib, tsync_agent_thread, tsync); + ++ if (!ret) { ++ if (!get_first_cpu(&pin_mask, &mask_size)) ++ pthread_setaffinity_np(*thr_id, mask_size, pin_mask); ++ } ++ + if (pin_mask) + CPU_FREE(pin_mask); + pthread_attr_destroy(&attrib); diff --git a/buildroot/package/trace-cmd/0003-trace-cmd-Move-add_event_pid-out-of-ifndef-NO_PTRACE.patch b/buildroot/package/trace-cmd/0003-trace-cmd-Move-add_event_pid-out-of-ifndef-NO_PTRACE.patch new file mode 100644 index 000000000..ca32e69ab --- /dev/null +++ b/buildroot/package/trace-cmd/0003-trace-cmd-Move-add_event_pid-out-of-ifndef-NO_PTRACE.patch @@ -0,0 +1,51 @@ +From 2f55ded528cfd8ef468bdd1f8bb82dcf1cfae04a Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (VMware)" +Date: Wed, 16 Dec 2020 18:19:43 -0500 +Subject: [PATCH] trace-cmd: Move add_event_pid() out of #ifndef NO_PTRACE + +When NO_PTRACE is defined, add_event_pid() is also not defined, but it is +used outside of NO_PTRACE pre processor block. And this causes a +"add_event_pid" not defined build failure. + +Link: https://lore.kernel.org/linux-trace-devel/20201216232145.010165486@goodmis.org + +Fixes: 0844cff1c ("trace-cmd: Fix "trace-cmd reset" command to restore the default value of set_event_pid") +Signed-off-by: Steven Rostedt (VMware) +[Retrieved from: +https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/commit/?id=2f55ded528cfd8ef468bdd1f8bb82dcf1cfae04a] +Signed-off-by: Fabrice Fontaine +--- + tracecmd/trace-record.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c +index f8baed7d..e2d1cedf 100644 +--- a/tracecmd/trace-record.c ++++ b/tracecmd/trace-record.c +@@ -1312,8 +1312,13 @@ static int trace_wait_for_processes(struct buffer_instance *instance) { + free(pidfds); + return ret; + } +-#ifndef NO_PTRACE + ++static void add_event_pid(struct buffer_instance *instance, const char *buf) ++{ ++ tracefs_instance_file_write(instance->tracefs, "set_event_pid", buf); ++} ++ ++#ifndef NO_PTRACE + /** + * append_pid_filter - add a new pid to an existing filter + * @curr_filter: the filter to append to. If NULL, then allocate one +@@ -1369,11 +1374,6 @@ static void update_sched_events(struct buffer_instance *instance, int pid) + static int open_instance_fd(struct buffer_instance *instance, + const char *file, int flags); + +-static void add_event_pid(struct buffer_instance *instance, const char *buf) +-{ +- tracefs_instance_file_write(instance->tracefs, "set_event_pid", buf); +-} +- + static void add_new_filter_child_pid(int pid, int child) + { + struct buffer_instance *instance; diff --git a/buildroot/package/trace-cmd/trace-cmd.hash b/buildroot/package/trace-cmd/trace-cmd.hash index c6447f34d..0afde6705 100644 --- a/buildroot/package/trace-cmd/trace-cmd.hash +++ b/buildroot/package/trace-cmd/trace-cmd.hash @@ -1,4 +1,6 @@ # Locally computed -sha256 3b3f564cc6ee30341051ccb7589b42f3abe4e676a21c029c7c127c7edf5bdcf0 trace-cmd-trace-cmd-v2.7.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB +sha256 8bab29530cd05272dccab48c9780644758e71ed990ce65c701b9095f7beae417 trace-cmd-trace-cmd-v2.9.1-br1.tar.gz +sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING +sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/buildroot/package/trace-cmd/trace-cmd.mk b/buildroot/package/trace-cmd/trace-cmd.mk index 09bbf0f2e..cd3fcb975 100644 --- a/buildroot/package/trace-cmd/trace-cmd.mk +++ b/buildroot/package/trace-cmd/trace-cmd.mk @@ -4,13 +4,14 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.7 -TRACE_CMD_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git +TRACE_CMD_VERSION = trace-cmd-v2.9.1 +TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git TRACE_CMD_SITE_METHOD = git TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 -TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB +TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 TRACE_CMD_DEPENDENCIES = host-pkgconf +TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc ifeq ($(BR2_PACKAGE_AUDIT),y) TRACE_CMD_DEPENDENCIES += audit @@ -18,10 +19,10 @@ endif ifeq ($(BR2_PACKAGE_PYTHON),y) TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python +TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python else ifeq ($(BR2_PACKAGE_PYTHON3),y) TRACE_CMD_DEPENDENCIES += python3 host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python3 +TRACE_CMD_MAKE_OPTS += PYTHON_VERS=python3 else TRACE_CMD_MAKE_OPTS += NO_PYTHON=1 endif @@ -36,17 +37,18 @@ TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS)) define TRACE_CMD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TRACE_CMD_CFLAGS)" \ - CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ - $(TRACE_CMD_MAKE_OPTS) \ - -C $(@D) all + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TRACE_CMD_CFLAGS)" \ + CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ + $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) endef define TRACE_CMD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/trace-cmd $(TARGET_DIR)/usr/bin/trace-cmd - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/trace-cmd/plugins - $(INSTALL) -D -m 0755 $(@D)/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TRACE_CMD_CFLAGS)" \ + CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ + DESTDIR=$(TARGET_DIR) \ + $(MAKE) $(TRACE_CMD_MAKE_OPTS) -C $(@D) install endef $(eval $(generic-package)) diff --git a/buildroot/package/tremor/tremor.hash b/buildroot/package/tremor/tremor.hash index 89661a64c..89d8bde84 100644 --- a/buildroot/package/tremor/tremor.hash +++ b/buildroot/package/tremor/tremor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba94cfdf886399c550f76908285bfa9e322f24085de6f1810c2abea565c13a15 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8.tar.gz -sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING +sha256 a387ebb4536ca98034eb91855616b971b0a85575943699b2a6d0be79b4a9f6a9 tremor-7c30a66346199f3f09017a09567c6c8a3a0eedc8-br1.tar.gz +sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch b/buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch deleted file mode 100644 index 609245dad..000000000 --- a/buildroot/package/trousers/0003-Correct-multiple-security-issues-that-are-present-if.patch +++ /dev/null @@ -1,90 +0,0 @@ -From e74dd1d96753b0538192143adf58d04fcd3b242b Mon Sep 17 00:00:00 2001 -From: Matthias Gerstner -Date: Fri, 14 Aug 2020 22:14:36 -0700 -Subject: [PATCH] Correct multiple security issues that are present if the tcsd - is started by root instead of the tss user. - -Patch fixes the following 3 CVEs: - -CVE-2020-24332 -If the tcsd daemon is started with root privileges, -the creation of the system.data file is prone to symlink attacks - -CVE-2020-24330 -If the tcsd daemon is started with root privileges, -it fails to drop the root gid after it is no longer needed - -CVE-2020-24331 -If the tcsd daemon is started with root privileges, -the tss user has read and write access to the /etc/tcsd.conf file - -Authored-by: Matthias Gerstner -Signed-off-by: Debora Velarde Babb -Signed-off-by: Peter Korsgaard ---- - src/tcs/ps/tcsps.c | 2 +- - src/tcsd/svrside.c | 1 + - src/tcsd/tcsd_conf.c | 10 +++++----- - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/tcs/ps/tcsps.c b/src/tcs/ps/tcsps.c -index e47154b..85d45a9 100644 ---- a/src/tcs/ps/tcsps.c -+++ b/src/tcs/ps/tcsps.c -@@ -72,7 +72,7 @@ get_file() - } - - /* open and lock the file */ -- system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR, 0600); -+ system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR|O_NOFOLLOW, 0600); - if (system_ps_fd < 0) { - LogError("system PS: open() of %s failed: %s", - tcsd_options.system_ps_file, strerror(errno)); -diff --git a/src/tcsd/svrside.c b/src/tcsd/svrside.c -index 1ae1636..1c12ff3 100644 ---- a/src/tcsd/svrside.c -+++ b/src/tcsd/svrside.c -@@ -473,6 +473,7 @@ main(int argc, char **argv) - } - return TCSERR(TSS_E_INTERNAL_ERROR); - } -+ setgid(pwd->pw_gid); - setuid(pwd->pw_uid); - #endif - #endif -diff --git a/src/tcsd/tcsd_conf.c b/src/tcsd/tcsd_conf.c -index a31503d..ea8ea13 100644 ---- a/src/tcsd/tcsd_conf.c -+++ b/src/tcsd/tcsd_conf.c -@@ -743,7 +743,7 @@ conf_file_init(struct tcsd_config *conf) - #ifndef SOLARIS - struct group *grp; - struct passwd *pw; -- mode_t mode = (S_IRUSR|S_IWUSR); -+ mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP); - #endif /* SOLARIS */ - TSS_RESULT result; - -@@ -798,15 +798,15 @@ conf_file_init(struct tcsd_config *conf) - } - - /* make sure user/group TSS owns the conf file */ -- if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { -+ if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) { - LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, -- TSS_USER_NAME, TSS_GROUP_NAME); -+ "root", TSS_GROUP_NAME); - return TCSERR(TSS_E_INTERNAL_ERROR); - } - -- /* make sure only the tss user can manipulate the config file */ -+ /* make sure only the tss user can read (but not manipulate) the config file */ - if (((stat_buf.st_mode & 0777) ^ mode) != 0) { -- LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); -+ LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file); - return TCSERR(TSS_E_INTERNAL_ERROR); - } - #endif /* SOLARIS */ --- -2.20.1 - diff --git a/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch b/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch deleted file mode 100644 index ea054ab2c..000000000 --- a/buildroot/package/trousers/0004-trousers-resolve-build-failure.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc Mon Sep 17 00:00:00 2001 -From: Jerry Snitselaar -Date: Wed, 18 Mar 2020 14:10:35 -0700 -Subject: [PATCH] trousers: resolve build failure - -The global variables tcsd_sa_chld and tcsd_sa_int in tcsd.h are -causing build failures in latest Fedora release: - -/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:169: multiple definition of `tcsd_sa_chld'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:169: first defined here -/usr/bin/ld: ../../src/tcs/libtcs.a(libtcs_a-tcsi_changeauth.o):/builddir/build/BUILD/trousers-0.3.13/src/tcs/../include/tcsd.h:168: multiple definition of `tcsd_sa_int'; tcsd-svrside.o:/builddir/build/BUILD/trousers-0.3.13/src/tcsd/../../src/include/tcsd.h:168: first defined here - -They are no longer used since 9b40e581470b ("Improved daemon's signal -handling") so just remove them. - -Signed-off-by: Jerry Snitselaar -Signed-off-by: Debora Velarde Babb -[Retrieved from: -https://sourceforge.net/p/trousers/trousers/ci/c9b8c4434f3b11bae4f7e72c3aec5b4f3459eecc] -Signed-off-by: Fabrice Fontaine ---- - src/include/tcsd.h | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/include/tcsd.h b/src/include/tcsd.h -index 5b9462b..f5c286e 100644 ---- a/src/include/tcsd.h -+++ b/src/include/tcsd.h -@@ -164,10 +164,4 @@ TSS_RESULT tcsd_thread_create(int, char *); - void *tcsd_thread_run(void *); - void thread_signal_init(); - --/* signal handling */ --#ifndef __APPLE__ --struct sigaction tcsd_sa_int; --struct sigaction tcsd_sa_chld; --#endif -- - #endif --- -2.28.0 - diff --git a/buildroot/package/trousers/trousers.hash b/buildroot/package/trousers/trousers.hash index 20c65c450..f6c342746 100644 --- a/buildroot/package/trousers/trousers.hash +++ b/buildroot/package/trousers/trousers.hash @@ -1,6 +1,6 @@ -# http://sourceforge.net/projects/trousers/files/trousers/0.3.14/ -sha1 9ca2cc9e1179465f6c5d9055e2b855e25031b85a trousers-0.3.14.tar.gz -md5 4a476b4f036dd20a764fb54fc24edbec trousers-0.3.14.tar.gz +# http://sourceforge.net/projects/trousers/files/trousers/0.3.15/ +sha1 75cd40e17c9385299e50ff2099905865442b59f1 trousers-0.3.15.tar.gz +md5 eb1b02e98c7d360749b9076196db3f0f trousers-0.3.15.tar.gz # Locally computed -sha256 ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 trousers-0.3.14.tar.gz -sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae LICENSE +sha256 1e5be93e518372acf1d92d2f567d01a46fdb0b730487e544e6fb896c59cac77f trousers-0.3.15.tar.gz +sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae LICENSE diff --git a/buildroot/package/trousers/trousers.mk b/buildroot/package/trousers/trousers.mk index 5e6161ce4..b84425dea 100644 --- a/buildroot/package/trousers/trousers.mk +++ b/buildroot/package/trousers/trousers.mk @@ -4,18 +4,16 @@ # ################################################################################ -TROUSERS_VERSION = 0.3.14 +TROUSERS_VERSION = 0.3.15 TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION) TROUSERS_LICENSE = BSD-3-Clause TROUSERS_LICENSE_FILES = LICENSE +TROUSERS_CPE_ID_VENDOR = trustedcomputinggroup TROUSERS_INSTALL_STAGING = YES # Need autoreconf because of a patch touching configure.in and Makefile.am TROUSERS_AUTORECONF = YES TROUSERS_DEPENDENCIES = host-pkgconf openssl -# 0003-Correct-multiple-security-issues-that-are-present-if.patch -TROUSERS_IGNORE_CVES += CVE-2020-24330 CVE-2020-24331 CVE-2020-24332 - ifeq ($(BR2_PACKAGE_LIBICONV),y) TROUSERS_DEPENDENCIES += libiconv endif diff --git a/buildroot/package/ttyd/ttyd.hash b/buildroot/package/ttyd/ttyd.hash index 881028261..c4263d6e9 100644 --- a/buildroot/package/ttyd/ttyd.hash +++ b/buildroot/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d72dcca3dec00cda87b80a0a25ae4fee2f8b9098c1cdb558508dcb14fbb6fafc ttyd-1.6.1.tar.gz +sha256 1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9 ttyd-1.6.3.tar.gz sha256 711762f081c180ade3d09d7b0b7537eaf35eca8d1671e47bc66eaa39376edb12 LICENSE diff --git a/buildroot/package/ttyd/ttyd.mk b/buildroot/package/ttyd/ttyd.mk index 91b650c49..856270a88 100644 --- a/buildroot/package/ttyd/ttyd.mk +++ b/buildroot/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.6.1 +TTYD_VERSION = 1.6.3 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tvheadend/tvheadend.hash b/buildroot/package/tvheadend/tvheadend.hash index d4dbc4006..b987a735e 100644 --- a/buildroot/package/tvheadend/tvheadend.hash +++ b/buildroot/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 28cae1960135f9485907a5bea857963d5625fc374371d12320353f824ce70a06 tvheadend-6b8f014c39703640a1fe8af9c2b7663588ed2b56.tar.gz +sha256 b5e58601da7af383c2c7f27016417a478be0d302a4a8a00ec87fc8bdacc56ef1 tvheadend-febcf9818d7c37fec8a98d424934edcb3243d5e4.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/buildroot/package/tvheadend/tvheadend.mk b/buildroot/package/tvheadend/tvheadend.mk index de1de4af8..e19763e18 100644 --- a/buildroot/package/tvheadend/tvheadend.mk +++ b/buildroot/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 6b8f014c39703640a1fe8af9c2b7663588ed2b56 +TVHEADEND_VERSION = febcf9818d7c37fec8a98d424934edcb3243d5e4 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/tzdata/tzdata.mk b/buildroot/package/tzdata/tzdata.mk index 04f5d84bf..8201dc120 100644 --- a/buildroot/package/tzdata/tzdata.mk +++ b/buildroot/package/tzdata/tzdata.mk @@ -51,8 +51,8 @@ endef define HOST_TZDATA_BUILD_CMDS (cd $(@D); \ for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix $$zone || exit 1; \ - $(ZIC) -d _output/right -L leapseconds $$zone || exit 1; \ + $(ZIC) -b fat -d _output/posix $$zone || exit 1; \ + $(ZIC) -b fat -d _output/right -L leapseconds $$zone || exit 1; \ done; \ ) endef diff --git a/buildroot/package/uboot-tools/uboot-tools.mk b/buildroot/package/uboot-tools/uboot-tools.mk index b24078928..c4006fe3d 100644 --- a/buildroot/package/uboot-tools/uboot-tools.mk +++ b/buildroot/package/uboot-tools/uboot-tools.mk @@ -9,6 +9,8 @@ UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt +UBOOT_TOOLS_CPE_ID_VENDOR = denx +UBOOT_TOOLS_CPE_ID_PRODUCT = u-boot UBOOT_TOOLS_INSTALL_STAGING = YES # u-boot 2020.01+ needs make 4.0+ @@ -111,7 +113,20 @@ endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE),y) UBOOT_TOOLS_GENERATE_ENV_FILE = $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE)) -ifeq ($(UBOOT_TOOLS_GENERATE_ENV_FILE):$(BR2_TARGET_UBOOT),:y) + +# If BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE is left empty, we +# will use the default environment provided in the U-Boot build +# directory as boot-env-defaults.txt, which requires having uboot as a +# dependency. +# If BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE is not empty, is +# might be referring to a file within the U-Boot source tree, so we +# also need to have uboot as a dependency. +ifeq ($(BR2_TARGET_UBOOT),y) +HOST_UBOOT_TOOLS_DEPENDENCIES += uboot + +# Handle the case where BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE +# is left empty, use the default U-Boot environment. +ifeq ($(UBOOT_TOOLS_GENERATE_ENV_FILE),) UBOOT_TOOLS_GENERATE_ENV_FILE = $(@D)/boot-env-defaults.txt define HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -119,8 +134,8 @@ define HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS $(UBOOT_SRCDIR) \ > $(UBOOT_TOOLS_GENERATE_ENV_FILE) endef -HOST_UBOOT_TOOLS_DEPENDENCIES += uboot -endif #UBOOT_TOOLS_GENERATE_ENV_FILE:BR2_TARGET_UBOOT +endif # UBOOT_TOOLS_GENERATE_ENV_FILE +endif # BR2_TARGET_UBOOT ifeq ($(BR_BUILDING),y) ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE)),) diff --git a/buildroot/package/ubus/ubus.hash b/buildroot/package/ubus/ubus.hash index bda58bc30..1fcea3685 100644 --- a/buildroot/package/ubus/ubus.hash +++ b/buildroot/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 93ef2612853641ca8d16d07527115c72ed03f8eaa1c727a01b069a4e814247c0 ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692.tar.gz +sha256 011566b2be426f572d397b44a7c12baa50a9b949232e5a6075eba613e1c3f7ae ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692-br1.tar.gz sha256 f53187f011575f6ec6c529136fd4658d67e674227c80b7b72c99b3654454ae7f ubusd_acl.h diff --git a/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash index 2a73237f0..796f1dbce 100644 --- a/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash +++ b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1f22e4143413550d64cbde193de388e8884eb7398cd41d3835e5d8a06a488423 uclibc-ng-test-c64d6ac77f0e745c70e76024212c72e4bbe2091a.tar.gz +sha256 ece0cb910ce649601e4dec42572c2871c3c58cff1be5c94e8e91816dce5793ba uclibc-ng-test-c64d6ac77f0e745c70e76024212c72e4bbe2091a-br1.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc/0001-arch-sh-Add-64-bit-time-types-from-kernel.patch b/buildroot/package/uclibc/0001-arch-sh-Add-64-bit-time-types-from-kernel.patch new file mode 100644 index 000000000..aec8fcda9 --- /dev/null +++ b/buildroot/package/uclibc/0001-arch-sh-Add-64-bit-time-types-from-kernel.patch @@ -0,0 +1,33 @@ +From 385f2b18ccde15f72a6e8aee4c960a5bc18481d7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= + +Date: Tue, 26 Jan 2021 20:39:36 +0100 +Subject: [PATCH] arch/sh: Add 64-bit time types from kernel + +--- + libc/sysdeps/linux/sh/bits/kernel_types.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h +index ac97261e6..90b2e66b6 100644 +--- a/libc/sysdeps/linux/sh/bits/kernel_types.h ++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h +@@ -21,6 +21,7 @@ typedef unsigned int __kernel_size_t; + typedef int __kernel_ssize_t; + typedef int __kernel_ptrdiff_t; + typedef long __kernel_time_t; ++typedef long long __kernel_time64_t; + typedef long __kernel_suseconds_t; + typedef long __kernel_clock_t; + typedef int __kernel_daddr_t; +@@ -33,6 +34,7 @@ typedef unsigned short __kernel_old_uid_t; + typedef unsigned short __kernel_old_gid_t; + typedef __kernel_dev_t __kernel_old_dev_t; + typedef long __kernel_long_t; ++typedef __kernel_long_t __kernel_old_time_t; + typedef unsigned long __kernel_ulong_t; + typedef long long __kernel_loff_t; + +-- +2.17.1 + diff --git a/buildroot/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash index 7319a70c8..e8bd5c519 100644 --- a/buildroot/package/uclibc/uclibc.hash +++ b/buildroot/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.36/uClibc-ng-1.0.36.tar.xz.sha256 -sha256 010f40841669809422e01b47e7169d49c61bf3382f493c2571a8a96634ed300c uClibc-ng-1.0.36.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.37/uClibc-ng-1.0.37.tar.xz.sha256 +sha256 b2b815d20645cf604b99728202bf3ecb62507ce39dfa647884b4453caf86212c uClibc-ng-1.0.37.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk index 524fc98d2..53983e852 100644 --- a/buildroot/package/uclibc/uclibc.mk +++ b/buildroot/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.36 +UCLIBC_VERSION = 1.0.37 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/uemacs/uemacs.hash b/buildroot/package/uemacs/uemacs.hash index 7dcbba926..c8dd620b8 100644 --- a/buildroot/package/uemacs/uemacs.hash +++ b/buildroot/package/uemacs/uemacs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9b4a849f65edb482f59bc40f646e7cd79915b3030ea9bd825868347217db3c96 uemacs-1cdcf9df88144049750116e36fe20c8c39fa2517.tar.gz -sha256 6e2a4cf41ec8d4379c154923349733bc0d3935c6fa72c4337cf1bc137b98b90a README +sha256 96e30247365bb27bd74c550b637f5b2ffd2978379872a32a840f6667cec5fa2a uemacs-1cdcf9df88144049750116e36fe20c8c39fa2517-br1.tar.gz +sha256 6e2a4cf41ec8d4379c154923349733bc0d3935c6fa72c4337cf1bc137b98b90a README diff --git a/buildroot/package/uhd/Config.in b/buildroot/package/uhd/Config.in index b9aa665c3..fae088750 100644 --- a/buildroot/package/uhd/Config.in +++ b/buildroot/package/uhd/Config.in @@ -35,16 +35,24 @@ if BR2_PACKAGE_UHD config BR2_PACKAGE_UHD_B100 bool "b100 support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B100 support +comment "B100 support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_UHD_B200 bool "b200 support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B200 support +comment "B200 support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_UHD_E300 bool "E300 support" select BR2_PACKAGE_UHD_MPMD @@ -67,6 +75,43 @@ config BR2_PACKAGE_UHD_MPMD help enable MPMD support +config BR2_PACKAGE_UHD_N230 + bool "N230 support" + help + enable N230 support + +config BR2_PACKAGE_UHD_N300 + bool "N300 support" + select BR2_PACKAGE_UHD_MPMD + help + enable N300 support + +config BR2_PACKAGE_UHD_N320 + bool "N320 support" + select BR2_PACKAGE_UHD_MPMD + help + enable N320 support + +config BR2_PACKAGE_UHD_OCTOCLOCK + bool "OctoClock support" + help + enable OctoClock support + +comment "uhd python API needs python3 and a toolchain w/ glibc or musl" + depends on !BR2_PACKAGE_PYTHON3 + depends on !BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) # python-numpy + +config BR2_PACKAGE_UHD_PYTHON + bool "python API support" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_PYTHON_REQUESTS + help + enable python API support + config BR2_PACKAGE_UHD_RFNOC bool "RFNoC support" help @@ -74,8 +119,38 @@ config BR2_PACKAGE_UHD_RFNOC config BR2_PACKAGE_UHD_USB bool "USB support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help enable UHD USB support +comment "USB support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_UHD_USRP1 + bool "USRP1 support" + select BR2_PACKAGE_UHD_USB + help + enable USRP1 support + +config BR2_PACKAGE_UHD_USRP2 + bool "USRP2 support" + help + enable USRP2 support + +comment "uhd utils depends on python API support" + depends on !BR2_PACKAGE_UHD_PYTHON + +config BR2_PACKAGE_UHD_UTILS + bool "uhd-utils" + depends on BR2_PACKAGE_UHD_PYTHON + select BR2_PACKAGE_PYTHON_SIX + help + uhd-utils + +config BR2_PACKAGE_UHD_X300 + bool "X300 support" + help + enable X300 support + endif diff --git a/buildroot/package/uhd/uhd.mk b/buildroot/package/uhd/uhd.mk index 2a40efdd2..a8001dfd7 100644 --- a/buildroot/package/uhd/uhd.mk +++ b/buildroot/package/uhd/uhd.mk @@ -25,18 +25,9 @@ UHD_CONF_OPTS = \ -DENABLE_DOXYGEN=OFF \ -DENABLE_DPDK=OFF \ -DENABLE_LIBUHD=ON \ - -DENABLE_N230=OFF \ - -DENABLE_N300=OFF \ - -DENABLE_N320=OFF \ -DENABLE_MANUAL=OFF \ -DENABLE_MAN_PAGES=OFF \ - -DENABLE_OCTOCLOCK=OFF \ - -DENABLE_PYTHON_API=OFF \ - -DENABLE_TESTS=OFF \ - -DENABLE_USRP1=OFF \ - -DENABLE_USRP2=OFF \ - -DENABLE_UTILS=OFF \ - -DENABLE_X300=OFF + -DENABLE_TESTS=OFF # As soon as architecture is ARM, uhd will try to use NEON. # But not all ARM cores have NEON support. @@ -89,12 +80,44 @@ else UHD_CONF_OPTS += -DENABLE_MPMD=OFF endif +ifeq ($(BR2_PACKAGE_UHD_N230),y) +UHD_CONF_OPTS += -DENABLE_N230=ON +else +UHD_CONF_OPTS += -DENABLE_N230=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_N300),y) +UHD_CONF_OPTS += -DENABLE_N300=ON +else +UHD_CONF_OPTS += -DENABLE_N300=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_N320),y) +UHD_CONF_OPTS += -DENABLE_N320=ON +else +UHD_CONF_OPTS += -DENABLE_N320=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_OCTOCLOCK),y) +UHD_CONF_OPTS += -DENABLE_OCTOCLOCK=ON +else +UHD_CONF_OPTS += -DENABLE_OCTOCLOCK=OFF +endif + ifeq ($(BR2_PACKAGE_UHD_RFNOC),y) UHD_CONF_OPTS += -DENABLE_RFNOC=ON else UHD_CONF_OPTS += -DENABLE_RFNOC=OFF endif +ifeq ($(BR2_PACKAGE_UHD_PYTHON),y) +UHD_DEPENDENCIES += host-python-numpy host-python3-requests \ + python-numpy python-requests +UHD_CONF_OPTS += -DENABLE_PYTHON_API=ON +else +UHD_CONF_OPTS += -DENABLE_PYTHON_API=OFF +endif + ifeq ($(BR2_PACKAGE_UHD_USB),y) UHD_DEPENDENCIES += libusb UHD_CONF_OPTS += -DENABLE_USB=ON @@ -102,4 +125,29 @@ else UHD_CONF_OPTS += -DENABLE_USB=OFF endif +ifeq ($(BR2_PACKAGE_UHD_USRP1),y) +UHD_CONF_OPTS += -DENABLE_USRP1=ON +else +UHD_CONF_OPTS += -DENABLE_USRP1=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_USRP2),y) +UHD_CONF_OPTS += -DENABLE_USRP2=ON +else +UHD_CONF_OPTS += -DENABLE_USRP2=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_UTILS),y) +UHD_DEPENDENCIES += python-six +UHD_CONF_OPTS += -DENABLE_UTILS=ON +else +UHD_CONF_OPTS += -DENABLE_UTILS=OFF +endif + +ifeq ($(BR2_PACKAGE_UHD_X300),y) +UHD_CONF_OPTS += -DENABLE_X300=ON +else +UHD_CONF_OPTS += -DENABLE_X300=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/uhttpd/uhttpd.hash b/buildroot/package/uhttpd/uhttpd.hash index e8bdb0bb6..389a0ef63 100644 --- a/buildroot/package/uhttpd/uhttpd.hash +++ b/buildroot/package/uhttpd/uhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz +sha256 5b81ebf9e419c668de4181cce7b9f5fa358cabb2a4a0d1f1a3a24190eeb21f25 uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82-br1.tar.gz sha256 2a61a8a690e7646a4bfe4261bf77c49f47588db5fc234b3cc66809dcc0cb3985 uhttpd.h diff --git a/buildroot/package/uhubctl/Config.in b/buildroot/package/uhubctl/Config.in index c000b5ab4..52b0268a3 100644 --- a/buildroot/package/uhubctl/Config.in +++ b/buildroot/package/uhubctl/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_UHUBCTL bool "uhubctl" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help Control USB power per-port on smart USB hubs. https://github.com/mvp/uhubctl -comment "uhubctl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "uhubctl needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/uhubctl/uhubctl.hash b/buildroot/package/uhubctl/uhubctl.hash index c477301c7..c13708877 100644 --- a/buildroot/package/uhubctl/uhubctl.hash +++ b/buildroot/package/uhubctl/uhubctl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5a722cb41967903bedbab4eea566ab332241a7f05fc7bc9c386b9a5e1762d8b uhubctl-2.2.0.tar.gz +sha256 714f733592d3cb6ba8efc84fbc03b1beed2323918ff33aef01cdb956755be7b7 uhubctl-2.3.0.tar.gz sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE diff --git a/buildroot/package/uhubctl/uhubctl.mk b/buildroot/package/uhubctl/uhubctl.mk index 0633152cc..08efca092 100644 --- a/buildroot/package/uhubctl/uhubctl.mk +++ b/buildroot/package/uhubctl/uhubctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHUBCTL_VERSION = 2.2.0 +UHUBCTL_VERSION = 2.3.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/unbound/unbound.hash b/buildroot/package/unbound/unbound.hash index 9ccea6eb8..ec7e94079 100644 --- a/buildroot/package/unbound/unbound.hash +++ b/buildroot/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.0.tar.gz.sha256 -sha256 a954043a95b0326ca4037e50dace1f3a207a0a19e9a4a22f4c6718fc623db2a1 unbound-1.13.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz.sha256 +sha256 8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8 unbound-1.13.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/buildroot/package/unbound/unbound.mk b/buildroot/package/unbound/unbound.mk index 8b7d1e8e9..140b7d278 100644 --- a/buildroot/package/unbound/unbound.mk +++ b/buildroot/package/unbound/unbound.mk @@ -4,11 +4,12 @@ # ################################################################################ -UNBOUND_VERSION = 1.13.0 +UNBOUND_VERSION = 1.13.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause UNBOUND_LICENSE_FILES = LICENSE +UNBOUND_CPE_ID_VENDOR = nlnetlabs UNBOUND_CONF_OPTS = \ --disable-rpath \ --disable-debug \ diff --git a/buildroot/package/unzip/unzip.hash b/buildroot/package/unzip/unzip.hash index d05957d5e..8b3f27553 100644 --- a/buildroot/package/unzip/unzip.hash +++ b/buildroot/package/unzip/unzip.hash @@ -1,20 +1,6 @@ +# From https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip/unzip_6.0-26.dsc +sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip_6.0.orig.tar.gz +sha256 88cb7c0f1fd13252b662dfd224b64b352f9e75cd86389557fcb23fa6d2638599 unzip_6.0-26.debian.tar.xz + # Locally computed: -sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz -sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE -sha256 66a364d75cea29363768ca6d43dd11b9913a59e42b8da16c4f63516c3e4ce7c1 07-increase-size-of-cfactorstr.patch -sha256 3a8cfd2702d220c6c119eaf805b018b66460284e585e92adc8a572d190471724 08-allow-greater-hostver-values.patch -sha256 0a1b23118b2f4a3ed097348ab33050d4f79b3863ab30e6d64ac382589834e3de 09-cve-2014-8139-crc-overflow.patch -sha256 32b1eda30644c44a8bdb9a02ff08bb2eca107f8eb16dda6992a9b778a0de395e 10-cve-2014-8140-test-compr-eb.patch -sha256 1f60f6e28b36f3cddb7da64c528cfe29160cefa1232e13bb8a47561f574067a9 11-cve-2014-8141-getzip64data.patch -sha256 c05885bb48b41603f0893ada88f15c0fae3b3f9f6489f24ad630a400f6271351 12-cve-2014-9636-test-compr-eb.patch -sha256 788c29727ff0689c3b1828466127758426f6d2c769048aa985950373747c76f3 14-cve-2015-7696.patch -sha256 e85dab65c3ebf3c4ab3359a4143cfd0efccfd1cac517a4e7bd5f518f41a02b6f 15-cve-2015-7697.patch -sha256 95dd15d5d9cdf5cea18c357b152930d6d52660599e0fd4907d6405870fdd9fe1 16-fix-integer-underflow-csiz-decrypted.patch -sha256 ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e 17-restore-unix-timestamps-accurately.patch -sha256 1872ffdd4d82edd7b1e62c469642bf16a1ca12dd26d41bd3f0b44f0f7602eb63 18-cve-2014-9913-unzip-buffer-overflow.patch -sha256 60840ea8f5d11a276972fb5b43652cdd49a9ed93b2cc0586ad309bf52104b012 19-cve-2016-9844-zipinfo-buffer-overflow.patch -sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2018-1000035-unzip-buffer-overflow.patch -sha256 df3b0eeea8dcc161a2565e306b5dda13d27de43145e198baaf0eab822321ee7e 21-fix-warning-messages-on-big-files.patch -sha256 2cf5a89e921da99e883bcde0ea03e2c77ae9185f57efaf35e7d43bc24353cfdc 22-cve-2019-13232-fix-bug-in-undefer-input.patch -sha256 c8e82c80fc7760f90567118a465e4cfa1b8e5d0a5723f9c70e3d21247e550615 23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch -sha256 37ba0bea723beeb22670babda18bd980368cc6591bc7bd9caa04f62692c7e5ac 24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch +sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE diff --git a/buildroot/package/unzip/unzip.mk b/buildroot/package/unzip/unzip.mk index 1d972055d..2997d33a2 100644 --- a/buildroot/package/unzip/unzip.mk +++ b/buildroot/package/unzip/unzip.mk @@ -4,29 +4,26 @@ # ################################################################################ -UNZIP_VERSION = 60 -UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz -UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src +UNZIP_VERSION = 6.0 +UNZIP_SOURCE = unzip_$(UNZIP_VERSION).orig.tar.gz +UNZIP_PATCH = unzip_$(UNZIP_VERSION)-26.debian.tar.xz +UNZIP_SITE = https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE +UNZIP_CPE_ID_VALID = YES -UNZIP_PATCH = \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/07-increase-size-of-cfactorstr.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/08-allow-greater-hostver-values.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/09-cve-2014-8139-crc-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/10-cve-2014-8140-test-compr-eb.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/11-cve-2014-8141-getzip64data.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/12-cve-2014-9636-test-compr-eb.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/14-cve-2015-7696.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/15-cve-2015-7697.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/17-restore-unix-timestamps-accurately.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/21-fix-warning-messages-on-big-files.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch \ - https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch +# unzip_$(UNZIP_VERSION)-26.debian.tar.xz has patches to fix: +UNZIP_IGNORE_CVES = \ + CVE-2014-8139 \ + CVE-2014-8140 \ + CVE-2014-8141 \ + CVE-2014-9636 \ + CVE-2014-9913 \ + CVE-2015-7696 \ + CVE-2015-7697 \ + CVE-2016-9844 \ + CVE-2018-18384 \ + CVE-2018-1000035 \ + CVE-2019-13232 $(eval $(cmake-package)) diff --git a/buildroot/package/upmpdcli/upmpdcli.hash b/buildroot/package/upmpdcli/upmpdcli.hash index 68ea707e5..fe8999d47 100644 --- a/buildroot/package/upmpdcli/upmpdcli.hash +++ b/buildroot/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.14.tar.gz.sha256: -sha256 e3d90dedee6a942acc049324ca81b7f008d217d386a3e2590a2ca5670cc9df05 upmpdcli-1.4.14.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.5.8.tar.gz.sha256: +sha256 802a2ab795841fbb9bfff5fd7951881022f5414ed893a1db704801b999e658a8 upmpdcli-1.5.8.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/upmpdcli/upmpdcli.mk b/buildroot/package/upmpdcli/upmpdcli.mk index 6531b90ee..3dc79f8f4 100644 --- a/buildroot/package/upmpdcli/upmpdcli.mk +++ b/buildroot/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.14 +UPMPDCLI_VERSION = 1.5.8 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING diff --git a/buildroot/package/upower/Config.in b/buildroot/package/upower/Config.in index e56438434..612a2b74b 100644 --- a/buildroot/package/upower/Config.in +++ b/buildroot/package/upower/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_UPOWER bool "upower" depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_USE_MMU # libgudev depends on BR2_USE_WCHAR # libgudev select BR2_PACKAGE_LIBGUDEV @@ -22,6 +23,7 @@ comment "upower needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "upower needs a toolchain w/ threads, wchar" +comment "upower needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/upx/upx.mk b/buildroot/package/upx/upx.mk index c577dfc2d..2449fa643 100644 --- a/buildroot/package/upx/upx.mk +++ b/buildroot/package/upx/upx.mk @@ -9,6 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING +UPX_CPE_ID_VALID = YES HOST_UPX_DEPENDENCIES = host-ucl host-zlib diff --git a/buildroot/package/usb_modeswitch/Config.in b/buildroot/package/usb_modeswitch/Config.in index 579761c04..ecb043a14 100644 --- a/buildroot/package/usb_modeswitch/Config.in +++ b/buildroot/package/usb_modeswitch/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USB_MODESWITCH bool "usb_modeswitch" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_JIMTCL if !BR2_PACKAGE_TCL || BR2_PACKAGE_TCL_SHLIB_ONLY select BR2_PACKAGE_LIBUSB help @@ -20,5 +21,6 @@ config BR2_PACKAGE_USB_MODESWITCH http://www.draisberghof.de/usb_modeswitch/ -comment "usb_modeswitch needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usb_modeswitch needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/usb_modeswitch_data/Config.in b/buildroot/package/usb_modeswitch_data/Config.in index 95b2a073b..6da7d3bb0 100644 --- a/buildroot/package/usb_modeswitch_data/Config.in +++ b/buildroot/package/usb_modeswitch_data/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA bool "usb_modeswitch_data" depends on BR2_TOOLCHAIN_HAS_THREADS # usb_modeswitch -> libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # usb_modeswitch -> libusb select BR2_PACKAGE_USB_MODESWITCH help USB mode switch data @@ -9,5 +10,6 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA http://www.draisberghof.de/usb_modeswitch/ -comment "usb_modeswitch_data needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usb_modeswitch_data needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/usbredir/Config.in b/buildroot/package/usbredir/Config.in index 78b0bff6e..8ce180a88 100644 --- a/buildroot/package/usbredir/Config.in +++ b/buildroot/package/usbredir/Config.in @@ -1,9 +1,11 @@ -comment "usbredir needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "usbredir needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_USBREDIR bool "usbredir" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help usbredir is the name of a network protocol for sending usb diff --git a/buildroot/package/usbutils/Config.in b/buildroot/package/usbutils/Config.in index 923853af0..a38eb2f2e 100644 --- a/buildroot/package/usbutils/Config.in +++ b/buildroot/package/usbutils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USBUTILS bool "usbutils" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb depends on BR2_PACKAGE_HAS_UDEV # needs hwdb select BR2_PACKAGE_LIBUSB help @@ -8,5 +9,7 @@ config BR2_PACKAGE_USBUTILS http://linux-usb.sourceforge.net/ -comment "usbutils needs udev /dev management and toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV +comment "usbutils needs udev /dev management and toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/usbutils/usbutils.hash b/buildroot/package/usbutils/usbutils.hash index 440491319..96426aeea 100644 --- a/buildroot/package/usbutils/usbutils.hash +++ b/buildroot/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 88634625f91840bc1993d2731cc081ee8d3b13d56069a95bdd6ac6ef0e063e46 usbutils-012.tar.xz +sha256 9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338 usbutils-013.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt diff --git a/buildroot/package/usbutils/usbutils.mk b/buildroot/package/usbutils/usbutils.mk index 2389386e5..ef5fd1201 100644 --- a/buildroot/package/usbutils/usbutils.mk +++ b/buildroot/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 012 +USBUTILS_VERSION = 013 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev diff --git a/buildroot/package/ushare/0001-compile-fixes.patch b/buildroot/package/ushare/0001-compile-fixes.patch deleted file mode 100644 index cfdf5e340..000000000 --- a/buildroot/package/ushare/0001-compile-fixes.patch +++ /dev/null @@ -1,206 +0,0 @@ -Patch nixed from OpenWRT svn to fix build breakage. - -Signed-off-by: Gustavo Zacarias - ---- a/src/cds.c -+++ b/src/cds.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - ---- a/src/http.c -+++ b/src/http.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -77,8 +78,7 @@ set_info_file (struct File_Info *info, c - info->content_type = ixmlCloneDOMString (content_type); - } - --static int --http_get_info (const char *filename, struct File_Info *info) -+int http_get_info (const char *filename, struct File_Info *info) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -197,8 +197,7 @@ get_file_memory (const char *fullpath, c - return ((UpnpWebFileHandle) file); - } - --static UpnpWebFileHandle --http_open (const char *filename, enum UpnpOpenFileMode mode) -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -251,8 +250,7 @@ http_open (const char *filename, enum Up - return ((UpnpWebFileHandle) file); - } - --static int --http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) - { - struct web_file_t *file = (struct web_file_t *) fh; - ssize_t len = -1; -@@ -286,8 +284,7 @@ http_read (UpnpWebFileHandle fh, char *b - return len; - } - --static int --http_write (UpnpWebFileHandle fh __attribute__((unused)), -+int http_write (UpnpWebFileHandle fh __attribute__((unused)), - char *buf __attribute__((unused)), - size_t buflen __attribute__((unused))) - { -@@ -296,8 +293,7 @@ http_write (UpnpWebFileHandle fh __attri - return 0; - } - --static int --http_seek (UpnpWebFileHandle fh, off_t offset, int origin) -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) - { - struct web_file_t *file = (struct web_file_t *) fh; - off_t newpos = -1; -@@ -371,8 +367,7 @@ http_seek (UpnpWebFileHandle fh, off_t o - return 0; - } - --static int --http_close (UpnpWebFileHandle fh) -+int http_close (UpnpWebFileHandle fh) - { - struct web_file_t *file = (struct web_file_t *) fh; - -@@ -402,13 +397,3 @@ http_close (UpnpWebFileHandle fh) - - return 0; - } -- --struct UpnpVirtualDirCallbacks virtual_dir_callbacks = -- { -- http_get_info, -- http_open, -- http_read, -- http_write, -- http_seek, -- http_close -- }; ---- a/src/http.h -+++ b/src/http.h -@@ -25,6 +25,18 @@ - #include - #include - --struct UpnpVirtualDirCallbacks virtual_dir_callbacks; -+int http_get_info (const char *filename, struct File_Info *info); -+ -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode); -+ -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen); -+ -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin); -+ -+int http_write (UpnpWebFileHandle fh __attribute__((unused)), -+ char *buf __attribute__((unused)), -+ size_t buflen __attribute__((unused))); -+ -+int http_close (UpnpWebFileHandle fh); - - #endif /* _HTTP_H_ */ ---- a/src/ushare.c -+++ b/src/ushare.c -@@ -188,7 +188,7 @@ handle_action_request (struct Upnp_Actio - if (strcmp (request->DevUDN + 5, ut->udn)) - return; - -- ip = request->CtrlPtIPAddr.s_addr; -+ ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr; - ip = ntohl (ip); - sprintf (val, "%d.%d.%d.%d", - (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); -@@ -348,13 +348,23 @@ init_upnp (struct ushare_t *ut) - - UpnpEnableWebserver (TRUE); - -- res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks); -- if (res != UPNP_E_SUCCESS) -- { -- log_error (_("Cannot set virtual directory callbacks\n")); -- free (description); -- return -1; -- } -+#define upnp_set_callback(cb, func) \ -+ do { \ -+ res = UpnpVirtualDir_set_##cb##Callback(func); \ -+ if (res != UPNP_E_SUCCESS) \ -+ { \ -+ log_error (_("Cannot set virtual directory callbacks\n")); \ -+ free (description); \ -+ return -1; \ -+ } \ -+ } while(0) -+ -+ upnp_set_callback(GetInfo, http_get_info); -+ upnp_set_callback(Open, http_open); -+ upnp_set_callback(Read, http_read); -+ upnp_set_callback(Seek, http_seek); -+ upnp_set_callback(Write, http_write); -+ upnp_set_callback(Close, http_close); - - res = UpnpAddVirtualDir (VIRTUAL_DIR); - if (res != UPNP_E_SUCCESS) ---- a/src/cms.c -+++ b/src/cms.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - ---- a/src/mime.c -+++ b/src/mime.c -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include - - #include "mime.h" ---- a/src/presentation.c -+++ b/src/presentation.c -@@ -19,6 +19,8 @@ - */ - - #include -+#include -+#include - - #if HAVE_LANGINFO_CODESET - # include ---- a/src/services.c -+++ b/src/services.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - diff --git a/buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch b/buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch deleted file mode 100644 index abef81fe4..000000000 --- a/buildroot/package/ushare/0002-ushare-fix-building-with-gcc-5.x.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6abc52190accc8d8b17455420e234a1d7dc7ba55 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 16 Nov 2015 23:15:27 +0100 -Subject: [PATCH] ushare: fix building with gcc 5.x - -GCC5 defaults to -std=gnu11, which has different semantics for inline than -previous versions: - -https://gcc.gnu.org/gcc-5/porting_to.html - -Which causes linker issues when display_headers() and start_log() are -referenced from other files. There's no real reason why these needs to be -inline, so just drop the keyword. - -Signed-off-by: Peter Korsgaard ---- - src/trace.c | 2 +- - src/ushare.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/trace.c b/src/trace.c -index 50729ef..4e314ef 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -57,7 +57,7 @@ print_log (log_level level, const char *format, ...) - va_end (va); - } - --inline void -+void - start_log (void) - { - openlog (PACKAGE_NAME, LOG_PID, LOG_DAEMON); -diff --git a/src/ushare.c b/src/ushare.c -index b64451e..af46e78 100644 ---- a/src/ushare.c -+++ b/src/ushare.c -@@ -496,7 +496,7 @@ reload_config (int s __attribute__ ((unused))) - } - } - --inline void -+void - display_headers (void) - { - printf (_("%s (version %s), a lightweight UPnP A/V and DLNA Media Server.\n"), --- -2.1.4 - diff --git a/buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch b/buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch deleted file mode 100644 index e97c3deab..000000000 --- a/buildroot/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch +++ /dev/null @@ -1,42 +0,0 @@ -ushare.c: include config.h before checking for CONFIG_NLS - -When NLS support is enabled, we get following build errors: - - ushare.c: In function 'setup_i18n': - ushare.c:745:3: warning: implicit declaration of function 'setlocale' [-Wimplicit-function-declaration] - setlocale (LC_ALL, ""); - ^ - ushare.c:745:14: error: 'LC_ALL' undeclared (first use in this function) - setlocale (LC_ALL, ""); - ^ - ushare.c:745:14: note: each undeclared identifier is reported only once for each function it appears in - make[2]: *** [ushare.o] Error 1 - -When NLS support is enabled, configure script creates macro in config.h. -We check for CONFIG_NLS before including config.h which results in above -build errors as locale.h doesn't get included. - -This patch fixes above build error by including config.h before we check for -CONFIG_NLS. - -This build error is detected by Buildroot autobuilder -http://autobuild.buildroot.net/results/19d/19d67dd43e5a313c77e4be97ecb9811ffa52f797/ - -Signed-off-by: Rahul Bedarkar - ---- ushare-1.1a/src/ushare.c.old 2016-09-20 19:04:00.915239326 +0530 -+++ ushare-1.1a/src/ushare.c 2016-09-20 19:04:24.707239276 +0530 -@@ -56,11 +56,12 @@ - #include - #include - -+#include "config.h" -+ - #if (defined(HAVE_SETLOCALE) && defined(CONFIG_NLS)) - # include - #endif - --#include "config.h" - #include "ushare.h" - #include "services.h" - #include "http.h" diff --git a/buildroot/package/ushare/0004-switch-to-libupnp-1.14.x-API.patch b/buildroot/package/ushare/0004-switch-to-libupnp-1.14.x-API.patch deleted file mode 100644 index e200bb192..000000000 --- a/buildroot/package/ushare/0004-switch-to-libupnp-1.14.x-API.patch +++ /dev/null @@ -1,433 +0,0 @@ -From 4643b9cb9e6c0331fd663437a7ed8061b9edf971 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Aug 2020 19:26:03 +0200 -Subject: [PATCH] switch to libupnp 1.14.x API - -Use the new libupnp 1.14.x API (i.e. UpnpInit2) to allow ushare to be -protected against CallStranger a.k.a. CVE-2020-12695 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/ddugovic/uShare/commit/4643b9cb9e6c0331fd663437a7ed8061b9edf971] ---- - configure | 2 -- - src/http.c | 50 +++++++++++++++++++++++++++++++------------------- - src/http.h | 24 ++++++++++++++++++------ - src/services.c | 28 ++++++++++++++++++---------- - src/services.h | 6 +++--- - src/ushare.c | 36 ++++++++++++++++++------------------ - src/ushare.h | 2 +- - 7 files changed, 89 insertions(+), 59 deletions(-) - -diff --git a/configure b/configure -index 20a08ed..4a3efe0 100755 ---- a/configure -+++ b/configure -@@ -638,8 +638,6 @@ fi - echolog "Checking for libixml ..." - check_lib upnp/ixml.h ixmlRelaxParser -lixml || die "Error, can't find libixml !" - --echolog "Checking for libthreadutil ..." --check_lib upnp/ThreadPool.h ThreadPoolAdd "-lthreadutil -lpthread" || die "Error, can't find libthreadutil !" - add_extralibs -lpthread - - libupnp_min_version="1.4.2" -diff --git a/src/http.c b/src/http.c -index 8a4e67d..1e5b350 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -68,17 +68,19 @@ struct web_file_t { - - - static inline void --set_info_file (struct File_Info *info, const size_t length, -+set_info_file (UpnpFileInfo *info, const size_t length, - const char *content_type) - { -- info->file_length = length; -- info->last_modified = 0; -- info->is_directory = 0; -- info->is_readable = 1; -- info->content_type = ixmlCloneDOMString (content_type); -+ UpnpFileInfo_set_FileLength(info, length); -+ UpnpFileInfo_set_LastModified(info, 0); -+ UpnpFileInfo_set_IsDirectory(info, 0); -+ UpnpFileInfo_set_IsReadable(info, 1); -+ UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString (content_type)); - } - --int http_get_info (const char *filename, struct File_Info *info) -+int http_get_info (const char *filename, UpnpFileInfo *info, -+ const void* cookie __attribute__((unused)), -+ const void** requestCookie __attribute__((unused))) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -143,15 +145,15 @@ int http_get_info (const char *filename, struct File_Info *info) - { - if (errno != EACCES) - return -1; -- info->is_readable = 0; -+ UpnpFileInfo_set_IsReadable(info, 0); - } - else -- info->is_readable = 1; -+ UpnpFileInfo_set_IsReadable(info, 1); - - /* file exist and can be read */ -- info->file_length = st.st_size; -- info->last_modified = st.st_mtime; -- info->is_directory = S_ISDIR (st.st_mode); -+ UpnpFileInfo_set_FileLength(info, st.st_size); -+ UpnpFileInfo_set_LastModified(info, st.st_mtime); -+ UpnpFileInfo_set_IsDirectory(info, S_ISDIR (st.st_mode)); - - protocol = - #ifdef HAVE_DLNA -@@ -172,11 +174,11 @@ int http_get_info (const char *filename, struct File_Info *info) - - if (content_type) - { -- info->content_type = ixmlCloneDOMString (content_type); -+ UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString (content_type)); - free (content_type); - } - else -- info->content_type = ixmlCloneDOMString (""); -+ UpnpFileInfo_set_ContentType(info, ixmlCloneDOMString ("")); - - return 0; - } -@@ -197,7 +199,9 @@ get_file_memory (const char *fullpath, const char *description, - return ((UpnpWebFileHandle) file); - } - --UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -250,7 +254,9 @@ UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) - return ((UpnpWebFileHandle) file); - } - --int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))) - { - struct web_file_t *file = (struct web_file_t *) fh; - ssize_t len = -1; -@@ -285,14 +291,18 @@ int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) - - int http_write (UpnpWebFileHandle fh __attribute__((unused)), - char *buf __attribute__((unused)), -- size_t buflen __attribute__((unused))) -+ size_t buflen __attribute__((unused)), -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))) - { - log_verbose ("http write\n"); - - return 0; - } - --int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))) - { - struct web_file_t *file = (struct web_file_t *) fh; - off_t newpos = -1; -@@ -366,7 +376,9 @@ int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) - return 0; - } - --int http_close (UpnpWebFileHandle fh) -+int http_close (UpnpWebFileHandle fh, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))) - { - struct web_file_t *file = (struct web_file_t *) fh; - -diff --git a/src/http.h b/src/http.h -index 32d6bcc..c912a7b 100644 ---- a/src/http.h -+++ b/src/http.h -@@ -25,18 +25,30 @@ - #include - #include - --int http_get_info (const char *filename, struct File_Info *info); -+int http_get_info (const char *filename, UpnpFileInfo *info, -+ const void* cookie __attribute__((unused)), -+ const void** requestCookie __attribute__((unused))); - --UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode); -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))); - --int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen); -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))); - --int http_seek (UpnpWebFileHandle fh, off_t offset, int origin); -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))); - - int http_write (UpnpWebFileHandle fh __attribute__((unused)), - char *buf __attribute__((unused)), -- size_t buflen __attribute__((unused))); -+ size_t buflen __attribute__((unused)), -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))); - --int http_close (UpnpWebFileHandle fh); -+int http_close (UpnpWebFileHandle fh, -+ const void* cookie __attribute__((unused)), -+ const void* requestCookie __attribute__((unused))); - - #endif /* _HTTP_H_ */ -diff --git a/src/services.c b/src/services.c -index aec9cf8..287df55 100644 ---- a/src/services.c -+++ b/src/services.c -@@ -62,25 +62,28 @@ static struct service_t services[] = { - }; - - bool --find_service_action (struct Upnp_Action_Request *request, -+find_service_action (UpnpActionRequest *request, - struct service_t **service, - struct service_action_t **action) - { - int c, d; -+ const char *actionName = NULL; - - *service = NULL; - *action = NULL; -+ -+ actionName = UpnpActionRequest_get_ActionName_cstr(request); - -- if (!request || !request->ActionName) -+ if (!request || !actionName) - return false; - - for (c = 0; services[c].id != NULL; c++) -- if (!strcmp (services[c].id, request->ServiceID)) -+ if (!strcmp (services[c].id, UpnpActionRequest_get_ServiceID_cstr(request))) - { - *service = &services[c]; - for (d = 0; services[c].actions[d].name; d++) - { -- if (!strcmp (services[c].actions[d].name, request->ActionName)) -+ if (!strcmp (services[c].actions[d].name, actionName)) - { - *action = &services[c].actions[d]; - return true; -@@ -97,6 +100,7 @@ upnp_add_response (struct action_event_t *event, char *key, const char *value) - { - char *val; - int res; -+ IXML_Document* actionResult = NULL; - - if (!event || !event->status || !key || !value) - return false; -@@ -105,8 +109,9 @@ upnp_add_response (struct action_event_t *event, char *key, const char *value) - if (!val) - return false; - -- res = UpnpAddToActionResponse (&event->request->ActionResult, -- event->request->ActionName, -+ actionResult = UpnpActionRequest_get_ActionResult(event->request); -+ res = UpnpAddToActionResponse (&actionResult, -+ UpnpActionRequest_get_ActionName_cstr(event->request), - event->service->type, key, val); - - if (res != UPNP_E_SUCCESS) -@@ -120,14 +125,17 @@ upnp_add_response (struct action_event_t *event, char *key, const char *value) - } - - char * --upnp_get_string (struct Upnp_Action_Request *request, const char *key) -+upnp_get_string (UpnpActionRequest *request, const char *key) - { - IXML_Node *node = NULL; -+ IXML_Document *actionRequest = NULL; - -- if (!request || !request->ActionRequest || !key) -+ actionRequest = UpnpActionRequest_get_ActionRequest(request); -+ -+ if (!request || !actionRequest || !key) - return NULL; - -- node = (IXML_Node *) request->ActionRequest; -+ node = (IXML_Node *) actionRequest; - if (!node) - { - log_verbose ("Invalid action request document\n"); -@@ -157,7 +165,7 @@ upnp_get_string (struct Upnp_Action_Request *request, const char *key) - } - - int --upnp_get_ui4 (struct Upnp_Action_Request *request, const char *key) -+upnp_get_ui4 (UpnpActionRequest *request, const char *key) - { - char *value; - int val; -diff --git a/src/services.h b/src/services.h -index 89c072e..d5726b4 100644 ---- a/src/services.h -+++ b/src/services.h -@@ -39,15 +39,15 @@ struct service_t { - - #define SERVICE_CONTENT_TYPE "text/xml" - --bool find_service_action (struct Upnp_Action_Request *request, -+bool find_service_action (UpnpActionRequest *request, - struct service_t **service, - struct service_action_t **action); - - bool upnp_add_response (struct action_event_t *event, - char *key, const char *value); - --char * upnp_get_string (struct Upnp_Action_Request *request, const char *key); -+char * upnp_get_string (UpnpActionRequest *request, const char *key); - --int upnp_get_ui4 (struct Upnp_Action_Request *request, const char *key); -+int upnp_get_ui4 (UpnpActionRequest *request, const char *key); - - #endif /* _SERVICES_H_ */ -diff --git a/src/ushare.c b/src/ushare.c -index 28fd67e..92e2345 100644 ---- a/src/ushare.c -+++ b/src/ushare.c -@@ -177,7 +177,7 @@ ushare_signal_exit (void) - } - - static void --handle_action_request (struct Upnp_Action_Request *request) -+handle_action_request (UpnpActionRequest *request) - { - struct service_t *service; - struct service_action_t *action; -@@ -187,25 +187,25 @@ handle_action_request (struct Upnp_Action_Request *request) - if (!request || !ut) - return; - -- if (request->ErrCode != UPNP_E_SUCCESS) -+ if (UpnpActionRequest_get_ErrCode(request) != UPNP_E_SUCCESS) - return; - -- if (strcmp (request->DevUDN + 5, ut->udn)) -+ if (strcmp (UpnpActionRequest_get_DevUDN_cstr(request) + 5, ut->udn)) - return; - -- ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr; -+ ip = (*(struct sockaddr_in *)UpnpActionRequest_get_CtrlPtIPAddr(request)).sin_addr.s_addr; - ip = ntohl (ip); - sprintf (val, "%d.%d.%d.%d", - (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); - - if (ut->verbose) - { -- DOMString str = ixmlPrintDocument (request->ActionRequest); -+ DOMString str = ixmlPrintDocument (UpnpActionRequest_get_ActionRequest(request)); - log_verbose ("***************************************************\n"); - log_verbose ("** New Action Request **\n"); - log_verbose ("***************************************************\n"); -- log_verbose ("ServiceID: %s\n", request->ServiceID); -- log_verbose ("ActionName: %s\n", request->ActionName); -+ log_verbose ("ServiceID: %s\n", UpnpActionRequest_get_ServiceID_cstr(request)); -+ log_verbose ("ActionName: %s\n", UpnpActionRequest_get_ActionName_cstr(request)); - log_verbose ("CtrlPtIP: %s\n", val); - log_verbose ("Action Request:\n%s\n", str); - ixmlFreeDOMString (str); -@@ -220,11 +220,11 @@ handle_action_request (struct Upnp_Action_Request *request) - event.service = service; - - if (action->function (&event) && event.status) -- request->ErrCode = UPNP_E_SUCCESS; -+ UpnpActionRequest_set_ErrCode(request, UPNP_E_SUCCESS); - - if (ut->verbose) - { -- DOMString str = ixmlPrintDocument (request->ActionResult); -+ DOMString str = ixmlPrintDocument (UpnpActionRequest_get_ActionResult(request)); - log_verbose ("Action Result:\n%s", str); - log_verbose ("***************************************************\n"); - log_verbose ("\n"); -@@ -235,22 +235,22 @@ handle_action_request (struct Upnp_Action_Request *request) - } - - if (service) /* Invalid Action name */ -- strcpy (request->ErrStr, "Unknown Service Action"); -+ UpnpActionRequest_strcpy_ErrStr(request, "Unknown Service Action"); - else /* Invalid Service name */ -- strcpy (request->ErrStr, "Unknown Service ID"); -+ UpnpActionRequest_strcpy_ErrStr(request, "Unknown Service ID"); - -- request->ActionResult = NULL; -- request->ErrCode = UPNP_SOAP_E_INVALID_ACTION; -+ UpnpActionRequest_set_ActionResult(request, NULL); -+ UpnpActionRequest_set_ErrCode(request, UPNP_SOAP_E_INVALID_ACTION); - } - - static int --device_callback_event_handler (Upnp_EventType type, void *event, -+device_callback_event_handler (Upnp_EventType type, const void *event, - void *cookie __attribute__((unused))) - { - switch (type) - { - case UPNP_CONTROL_ACTION_REQUEST: -- handle_action_request ((struct Upnp_Action_Request *) event); -+ handle_action_request ((UpnpActionRequest *) event); - break; - case UPNP_CONTROL_ACTION_COMPLETE: - case UPNP_EVENT_SUBSCRIPTION_REQUEST: -@@ -323,7 +323,7 @@ init_upnp (struct ushare_t *ut) - #endif /* HAVE_DLNA */ - - log_info (_("Initializing UPnP subsystem ...\n")); -- res = UpnpInit (ut->ip, ut->port); -+ res = UpnpInit2 (ut->interface, ut->port); - if (res != UPNP_E_SUCCESS) - { - log_error (_("Cannot initialize UPnP subsystem\n")); -@@ -351,7 +351,7 @@ init_upnp (struct ushare_t *ut) - log_info (_("UPnP MediaServer listening on %s:%d\n"), - UpnpGetServerIpAddress (), ut->port); - -- UpnpEnableWebserver (TRUE); -+ UpnpEnableWebserver (1); - - #define upnp_set_callback(cb, func) \ - do { \ -@@ -371,7 +371,7 @@ init_upnp (struct ushare_t *ut) - upnp_set_callback(Write, http_write); - upnp_set_callback(Close, http_close); - -- res = UpnpAddVirtualDir (VIRTUAL_DIR); -+ res = UpnpAddVirtualDir (VIRTUAL_DIR, NULL, NULL); - if (res != UPNP_E_SUCCESS) - { - log_error (_("Cannot add virtual directory for web server\n")); -diff --git a/src/ushare.h b/src/ushare.h -index a29da01..cd86cef 100644 ---- a/src/ushare.h -+++ b/src/ushare.h -@@ -125,7 +125,7 @@ struct ushare_t { - }; - - struct action_event_t { -- struct Upnp_Action_Request *request; -+ UpnpActionRequest *request; - bool status; - struct service_t *service; - }; diff --git a/buildroot/package/ushare/ushare.hash b/buildroot/package/ushare/ushare.hash index 03c675f09..4d009dd99 100644 --- a/buildroot/package/ushare/ushare.hash +++ b/buildroot/package/ushare/ushare.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 ushare-1.1a.tar.bz2 +sha256 3bfc2eecdbbbf3c1778f70e8e8a8fc4638fbf52081c4b047a59204f079a4a580 ushare-2.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/ushare/ushare.mk b/buildroot/package/ushare/ushare.mk index bb194f637..59dddb4bf 100644 --- a/buildroot/package/ushare/ushare.mk +++ b/buildroot/package/ushare/ushare.mk @@ -4,9 +4,8 @@ # ################################################################################ -USHARE_VERSION = 1.1a -USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 -USHARE_SITE = http://ushare.geexbox.org/releases +USHARE_VERSION = 2.0 +USHARE_SITE = $(call github,ddugovic,uShare,v$(USHARE_VERSION)) USHARE_DEPENDENCIES = host-pkgconf libupnp $(TARGET_NLS_DEPENDENCIES) USHARE_LICENSE = GPL-2.0+ USHARE_LICENSE_FILES = COPYING diff --git a/buildroot/package/ustream-ssl/ustream-ssl.hash b/buildroot/package/ustream-ssl/ustream-ssl.hash index ba315f88d..60672b38b 100644 --- a/buildroot/package/ustream-ssl/ustream-ssl.hash +++ b/buildroot/package/ustream-ssl/ustream-ssl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63ecc9d78ef83020a4539a89c8a3690657e7bbe7580ae02cc0e7b4267ffea5cd ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb.tar.gz -sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h +sha256 f09474dbe4680b51cc0c6a088807102d64954764ef58c2a1e3231e3a77c4b01f ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb-br1.tar.gz +sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h diff --git a/buildroot/package/utf8proc/utf8proc.hash b/buildroot/package/utf8proc/utf8proc.hash index f7b8776a5..2deff4e0c 100644 --- a/buildroot/package/utf8proc/utf8proc.hash +++ b/buildroot/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d4e8dfc898cfd062493cb7f42d95d70ccdd3a4cd4d90bec0c71b47cca688f1be utf8proc-2.5.0.tar.gz -sha256 fbc720fcc90fb44396985646f67e4d19be03e0c0539f7138ed9dc6efba49dc49 LICENSE.md +sha256 4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b utf8proc-2.6.1.tar.gz +sha256 fbc720fcc90fb44396985646f67e4d19be03e0c0539f7138ed9dc6efba49dc49 LICENSE.md diff --git a/buildroot/package/utf8proc/utf8proc.mk b/buildroot/package/utf8proc/utf8proc.mk index 2bb193991..bedd38ca5 100644 --- a/buildroot/package/utf8proc/utf8proc.mk +++ b/buildroot/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.5.0 +UTF8PROC_VERSION = 2.6.1 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk index b726f8950..0178c52ba 100644 --- a/buildroot/package/util-linux/util-linux.mk +++ b/buildroot/package/util-linux/util-linux.mk @@ -23,6 +23,7 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.ISC \ Documentation/licenses/COPYING.LGPL-2.1-or-later +UTIL_LINUX_CPE_ID_VENDOR = kernel UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/uvw/uvw.mk b/buildroot/package/uvw/uvw.mk index 39952caa1..f152d9f1c 100644 --- a/buildroot/package/uvw/uvw.mk +++ b/buildroot/package/uvw/uvw.mk @@ -13,8 +13,4 @@ UVW_DEPENDENCIES = libuv UVW_LICENSE = MIT UVW_LICENSE_FILES = LICENSE -# The following CMake variable disables a TRY_RUN call in the -pthread -# test which is not allowed when cross-compiling (for cmake < 3.10) -UVW_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF - $(eval $(cmake-package)) diff --git a/buildroot/package/vala/vala.mk b/buildroot/package/vala/vala.mk index 95365faf1..93a304f19 100644 --- a/buildroot/package/vala/vala.mk +++ b/buildroot/package/vala/vala.mk @@ -10,6 +10,7 @@ VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ VALA_LICENSE_FILES = COPYING +VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not diff --git a/buildroot/package/valgrind/valgrind.mk b/buildroot/package/valgrind/valgrind.mk index 7fd327861..a1b4d97ee 100644 --- a/buildroot/package/valgrind/valgrind.mk +++ b/buildroot/package/valgrind/valgrind.mk @@ -9,6 +9,7 @@ VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS +VALGRIND_CPE_ID_VENDOR = valgrind VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc diff --git a/buildroot/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk index b38c6319a..29e6342a6 100644 --- a/buildroot/package/valijson/valijson.mk +++ b/buildroot/package/valijson/valijson.mk @@ -8,6 +8,7 @@ VALIJSON_VERSION = 0.3 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE +VALIJSON_CPE_ID_VALID = YES VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_DEPENDENCIES = boost diff --git a/buildroot/package/vboot-utils/vboot-utils.hash b/buildroot/package/vboot-utils/vboot-utils.hash index e2ddf7773..efef776ca 100644 --- a/buildroot/package/vboot-utils/vboot-utils.hash +++ b/buildroot/package/vboot-utils/vboot-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d95b64b1f1de4a3ffa5c2e446d7c8e92aa197aee10de24206b2ea2deb5a8b947 vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz +sha256 9cdeaa2e4e1190c0cd200e1b07d394e5d24f57cc0efffdce861d5de934035bf7 vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656-br1.tar.gz sha256 cb9dc8e96aedf9120b6757a60387db10f3c1a8e3fd97bb9d0f11327be5a7ed4d LICENSE diff --git a/buildroot/package/vde2/vde2.mk b/buildroot/package/vde2/vde2.mk index 29337601c..76d6f352b 100644 --- a/buildroot/package/vde2/vde2.mk +++ b/buildroot/package/vde2/vde2.mk @@ -9,6 +9,8 @@ VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2 VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION) VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3-Clause VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde +VDE2_CPE_ID_VENDOR = vde_project +VDE2_CPE_ID_PRODUCT = vde VDE2_INSTALL_STAGING = YES # We touch configure.ac, so we need to autoreconf diff --git a/buildroot/package/vdr/0001-libjpeg.patch b/buildroot/package/vdr/0001-libjpeg.patch deleted file mode 100644 index dbd1f1283..000000000 --- a/buildroot/package/vdr/0001-libjpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix compilation with libjpeg - -Patch inspired by upstream board: -http://www.vdr-portal.de/board16-video-disk-recorder/board4-vdr-installation/p1189959-vdr-2-05-mit-libjpeg-9a-kommt-nicht-aus/#post1189959 - -Signed-off-by: Bernd Kuhls - -diff -uNr vdr-2.3.1.org/tools.c vdr-2.3.1/tools.c ---- vdr-2.3.1.org/tools.c 2015-09-10 15:17:55.000000000 +0200 -+++ vdr-2.3.1/tools.c 2016-08-01 06:37:44.000000000 +0200 -@@ -1254,15 +1254,15 @@ - } - else { - esyslog("ERROR: out of memory"); -- return false; -+ return FALSE; - } - if (jcd->mem) { - cinfo->dest->next_output_byte = jcd->mem + Used; - cinfo->dest->free_in_buffer = jcd->size - Used; -- return true; -+ return TRUE; - } - } -- return false; -+ return FALSE; - } - - static void JpegCompressTermDestination(j_compress_ptr cinfo) -@@ -1307,8 +1307,8 @@ - cinfo.in_color_space = JCS_RGB; - - jpeg_set_defaults(&cinfo); -- jpeg_set_quality(&cinfo, Quality, true); -- jpeg_start_compress(&cinfo, true); -+ jpeg_set_quality(&cinfo, Quality, TRUE); -+ jpeg_start_compress(&cinfo, TRUE); - - int rs = Width * 3; - JSAMPROW rp[Height]; diff --git a/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch b/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch deleted file mode 100644 index 32c0e97ac..000000000 --- a/buildroot/package/vdr/0002-Fixed-compatibility-with-current-versions-of-glibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 930c2cd2eb8947413e88404fa94c66e4e1db5ad6 Mon Sep 17 00:00:00 2001 -From: Klaus Schmidinger -Date: Mon, 4 May 2020 12:28:31 +0200 -Subject: Fixed compatibility with current versions of glibc - -[Retrieved (and updated to remove CONTRIBUTORS and HISTORY) from: -https://projects.vdr-developer.org/git/vdr.git/commit?id=930c2cd2eb8947413e88404fa94c66e4e1db5ad6] -Signed-off-by: Fabrice Fontaine - -diff --git a/eit.c b/eit.c -index 72a45e5..d437b44 100644 ---- a/eit.c -+++ b/eit.c -@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) - if (abs(diff) > MAX_TIME_DIFF) { - mutex.Lock(); - if (abs(diff) > MAX_ADJ_DIFF) { -- if (stime(&dvbtim) == 0) -+ timespec ts = { 0 }; -+ ts.tv_sec = dvbtim; -+ if (clock_settime(CLOCK_REALTIME, &ts) == 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); - else - esyslog("ERROR while setting system time: %m"); --- -cgit v0.10.2 - diff --git a/buildroot/package/vdr/vdr.hash b/buildroot/package/vdr/vdr.hash index 99f6ba822..3d0dc443e 100644 --- a/buildroot/package/vdr/vdr.hash +++ b/buildroot/package/vdr/vdr.hash @@ -1,5 +1,5 @@ -# From https://www.linuxtv.org/pipermail/vdr/2019-June/029497.html -md5 b2897fe6b6e6711d512a69642b1b8ec1 vdr-2.4.1.tar.bz2 +# From https://www.linuxtv.org/pipermail/vdr/2020-December/029578.html +md5 aa91614159ae2db45655d35918e2c24e vdr-2.4.6.tar.bz2 # Locally computed -sha256 25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc vdr-2.4.1.tar.bz2 -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING +sha256 c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b vdr-2.4.6.tar.bz2 +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/buildroot/package/vdr/vdr.mk b/buildroot/package/vdr/vdr.mk index 83cdede30..eac13bfff 100644 --- a/buildroot/package/vdr/vdr.mk +++ b/buildroot/package/vdr/vdr.mk @@ -4,22 +4,24 @@ # ################################################################################ -VDR_VERSION = 2.4.1 +VDR_VERSION = 2.4.6 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 VDR_SITE = ftp://ftp.tvdr.de/vdr VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING +VDR_CPE_ID_VENDOR = tvdr VDR_INSTALL_STAGING = YES VDR_DEPENDENCIES = \ + host-pkgconf \ freetype \ fontconfig \ jpeg \ libcap \ $(TARGET_NLS_DEPENDENCIES) -VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 VDR_MAKE_FLAGS = \ NO_KBD=yes \ + PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ PLUGINLIBDIR=/usr/lib/vdr \ PREFIX=/usr \ VIDEODIR=/var/lib/vdr @@ -27,8 +29,6 @@ VDR_LDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi -VDR_INCLUDE_DIRS += -I$(STAGING_DIR)/usr/include/fribidi -VDR_LDFLAGS += -lfribidi VDR_MAKE_FLAGS += BIDI=1 endif @@ -38,7 +38,6 @@ VDR_LDFLAGS += -liconv endif VDR_MAKE_ENV = \ - INCLUDES="$(VDR_INCLUDE_DIRS)" \ LDFLAGS="$(VDR_LDFLAGS)" \ $(VDR_MAKE_FLAGS) diff --git a/buildroot/package/vim/vim.mk b/buildroot/package/vim/vim.mk index 1fbb6a6b8..36cb59331 100644 --- a/buildroot/package/vim/vim.mk +++ b/buildroot/package/vim/vim.mk @@ -23,6 +23,7 @@ VIM_CONF_ENV = \ VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x VIM_LICENSE = Charityware VIM_LICENSE_FILES = README.txt +VIM_CPE_ID_VENDOR = vim ifeq ($(BR2_PACKAGE_ACL),y) VIM_CONF_OPTS += --enable-acl diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index 945ea5d65..020c37aa5 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -10,7 +10,7 @@ VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_CPE_ID_VENDOR = videolan -VLC_CPE_ID_NAME = vlc_media_player +VLC_CPE_ID_PRODUCT = vlc_media_player VLC_DEPENDENCIES = host-pkgconf VLC_AUTORECONF = YES diff --git a/buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch b/buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch deleted file mode 100644 index 6df67869e..000000000 --- a/buildroot/package/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix CVE-2015-6749 - invalid AIFF file causes alloca() buffer overflow. -See https://trac.xiph.org/ticket/2212 -Status: upstream - -Signed-off-by: Gustavo Zacarias - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..4921fb9 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = - int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - { - int aifc; /* AIFC or AIFF? */ -- unsigned int len; -- unsigned char *buffer; -+ unsigned int len, readlen; -+ unsigned char buffer[22]; - unsigned char buf2[8]; - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); -@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; /* Weird common chunk */ - } - -- buffer = alloca(len); -- -- if(fread(buffer,1,len,in) < len) -+ readlen = len < sizeof(buffer) ? len : sizeof(buffer); -+ if(fread(buffer,1,readlen,in) < readlen || -+ (len > readlen && !seek_forward(in, len-readlen))) - { - fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); - return 0; --- -2.5.0 - diff --git a/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch b/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch deleted file mode 100644 index 0e9cae061..000000000 --- a/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 3bbabc06c4b35c84f6747ed850213161aca568c7 Mon Sep 17 00:00:00 2001 -From: Petter Reinholdtsen -Date: Tue, 22 Sep 2015 15:14:06 +0200 -Subject: [PATCH] oggenc: validate count of channels in the header - (CVE-2014-9638 & CVE-2014-9639) - -Author: Kamil Dudka -Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html -Bug: https://trac.xiph.org/ticket/2136 -Bug: https://trac.xiph.org/ticket/2137 -Bug-Debian: https://bugs.debian.org/776086 -Forwarded: not-needed -Reviewed-By: Petter Reinholdtsen -Last-Update: 2015-09-22 -Signed-off-by: Peter Korsgaard ---- - oggenc/audio.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 4921fb9..535a704 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -13,6 +13,7 @@ - #include - #endif - -+#include - #include - #include - #include -@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); - int i; -+ long channels; - - if(buf[11]=='C') - aifc=1; -@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; - } - -- format.channels = READ_U16_BE(buffer); -+ format.channels = channels = READ_U16_BE(buffer); - format.totalframes = READ_U32_BE(buffer+2); - format.samplesize = READ_U16_BE(buffer+6); - format.rate = (int)read_IEEE80(buffer+8); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); -+ return 0; -+ } - aiff->bigendian = 1; - - if(aifc) -@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - wav_fmt format; - wavfile *wav = malloc(sizeof(wavfile)); - int i; -+ long channels; - - /* Ok. At this point, we know we have a WAV file. Now we have to detect - * whether we support the subtype, and we have to find the actual data -@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - } - - format.format = READ_U16_LE(buf); -- format.channels = READ_U16_LE(buf+2); -+ format.channels = channels = READ_U16_LE(buf+2); - format.samplerate = READ_U32_LE(buf+4); - format.bytespersec = READ_U32_LE(buf+8); - format.align = READ_U16_LE(buf+12); - format.samplesize = READ_U16_LE(buf+14); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); -+ return 0; -+ } -+ - if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ - { - if(len<40) --- -2.20.1 - diff --git a/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch b/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch deleted file mode 100644 index e245e1534..000000000 --- a/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 514116d7bea89dad9f1deb7617b2277b5e9115cd Mon Sep 17 00:00:00 2001 -From: Gregory Maxwell -Date: Wed, 16 Apr 2014 23:55:10 +0000 -Subject: [PATCH] oggenc: fix crash on raw file close, reported by Hanno in - issue #2009. pointer to a non-static struct was escaping its scope. Also fix - a C99-ism. - -svn path=/trunk/vorbis-tools/; revision=19117 - -Fixes CVE-2014-9640 - -Signed-off-by: Peter Korsgaard ---- - oggenc/oggenc.c | 4 ++-- - oggenc/skeleton.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c -index 4a120f3..e7de0bb 100644 ---- a/oggenc/oggenc.c -+++ b/oggenc/oggenc.c -@@ -97,6 +97,8 @@ int main(int argc, char **argv) - .3,-1, - 0,0,0.f, - 0, 0, 0, 0, 0}; -+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -+ N_("RAW file reader")}; - - int i; - -@@ -239,8 +241,6 @@ int main(int argc, char **argv) - - if(opt.rawmode) - { -- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -- N_("RAW file reader")}; - - enc_opts.rate=opt.raw_samplerate; - enc_opts.channels=opt.raw_channels; -diff --git a/oggenc/skeleton.h b/oggenc/skeleton.h -index cf87dc2..168b8b6 100644 ---- a/oggenc/skeleton.h -+++ b/oggenc/skeleton.h -@@ -41,7 +41,7 @@ typedef struct { - ogg_int64_t granule_rate_d; /* granule rate denominator */ - ogg_int64_t start_granule; /* start granule value */ - ogg_uint32_t preroll; /* preroll */ -- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ -+ unsigned char granule_shift; /* 1 byte value holding the granule shift */ - char *message_header_fields; /* holds all the message header fields */ - /* current total size of the message header fields, for realloc purpose, initially zero */ - ogg_uint32_t current_header_size; --- -2.20.1 - diff --git a/buildroot/package/vorbis-tools/vorbis-tools.hash b/buildroot/package/vorbis-tools/vorbis-tools.hash index 76122be13..a4f463e46 100644 --- a/buildroot/package/vorbis-tools/vorbis-tools.hash +++ b/buildroot/package/vorbis-tools/vorbis-tools.hash @@ -1,4 +1,4 @@ # From http://downloads.xiph.org/releases/vorbis/SHA256SUMS -sha256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc vorbis-tools-1.4.0.tar.gz +sha256 db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0 vorbis-tools-1.4.2.tar.gz # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/vorbis-tools/vorbis-tools.mk b/buildroot/package/vorbis-tools/vorbis-tools.mk index 407ea975e..936d2d816 100644 --- a/buildroot/package/vorbis-tools/vorbis-tools.mk +++ b/buildroot/package/vorbis-tools/vorbis-tools.mk @@ -4,20 +4,14 @@ # ################################################################################ -VORBIS_TOOLS_VERSION = 1.4.0 +VORBIS_TOOLS_VERSION = 1.4.2 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis VORBIS_TOOLS_LICENSE = GPL-2.0 VORBIS_TOOLS_LICENSE_FILES = COPYING +VORBIS_TOOLS_CPE_ID_VENDOR = xiph VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl VORBIS_TOOLS_CONF_OPTS = --program-transform-name='' -# 0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2015-6749 -# 0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9638 CVE-2014-9639 -# 0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch -VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9640 - # ogg123 calls math functions but forgets to link with libm VORBIS_TOOLS_CONF_ENV = LIBS=-lm @@ -25,6 +19,10 @@ ifeq ($(BR2_PACKAGE_FLAC),y) VORBIS_TOOLS_DEPENDENCIES += flac endif +ifeq ($(BR2_PACKAGE_OPUSFILE),y) +VORBIS_TOOLS_DEPENDENCIES += opusfile +endif + ifeq ($(BR2_PACKAGE_SPEEX),y) VORBIS_TOOLS_DEPENDENCIES += speex endif diff --git a/buildroot/package/vsftpd/vsftpd.mk b/buildroot/package/vsftpd/vsftpd.mk index 8a9aac2d2..2804a3a39 100644 --- a/buildroot/package/vsftpd/vsftpd.mk +++ b/buildroot/package/vsftpd/vsftpd.mk @@ -9,6 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING +VSFTPD_CPE_ID_VALID = YES define VSFTPD_DISABLE_UTMPX $(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h diff --git a/buildroot/package/vuejs/vuejs.hash b/buildroot/package/vuejs/vuejs.hash index d2b30b8d3..db4a5bbe3 100644 --- a/buildroot/package/vuejs/vuejs.hash +++ b/buildroot/package/vuejs/vuejs.hash @@ -1,3 +1,2 @@ # Locally computed -sha256 7ee4d5e4ec7d44fb9918ecb074ad7701eb0bcb3a840cee3c2924734ef3fd888a v2.6.11.tar.gz -sha256 17fb24bc303763f3fe1911ee24e5225c7ad59f0e3a5d8123e9b730c100a306a6 LICENSE +sha256 a69f04bf138af09a956150675151edb9354aeec8bd627c21cbcfa646248214fa vue-3.0.5.tgz diff --git a/buildroot/package/vuejs/vuejs.mk b/buildroot/package/vuejs/vuejs.mk index f7e197c4a..43b45e00b 100644 --- a/buildroot/package/vuejs/vuejs.mk +++ b/buildroot/package/vuejs/vuejs.mk @@ -4,15 +4,14 @@ # ################################################################################ -VUEJS_VERSION = 2.6.11 -VUEJS_SOURCE = v$(VUEJS_VERSION).tar.gz -VUEJS_SITE = https://github.com/vuejs/vue/archive +VUEJS_VERSION = 3.0.5 +VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz +VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT -VUEJS_LICENSE_FILES = LICENSE # Install .min.js as .js define VUEJS_INSTALL_TARGET_CMDS - $(INSTALL) -m 644 -D $(@D)/dist/vue.min.js \ + $(INSTALL) -m 644 -D $(@D)/dist/vue.global.prod.js \ $(TARGET_DIR)/var/www/vue.js endef diff --git a/buildroot/package/waf/waf.hash b/buildroot/package/waf/waf.hash index afca0f31b..e9d387e7d 100644 --- a/buildroot/package/waf/waf.hash +++ b/buildroot/package/waf/waf.hash @@ -1,4 +1,7 @@ # Locally computed -sha1 92212071a63ce38fdfd69fb8332f04e84d1f6635 waf-2.0.20 -sha256 bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f waf-2.0.20 -sha256 bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f waf +sha1 494ada411468129ed229f946ecec3048400e320b waf-2.0.22 +sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf-2.0.22 + +# The waf script also contains its license, but is renamed `waf` in the extract +# step, so this is a synonym for the above, to check WAF_LICENSE +sha256 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 waf diff --git a/buildroot/package/waf/waf.mk b/buildroot/package/waf/waf.mk index 9c5e72d9e..5cc0dc371 100644 --- a/buildroot/package/waf/waf.mk +++ b/buildroot/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.20 +WAF_VERSION = 2.0.22 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause diff --git a/buildroot/package/wavpack/wavpack.mk b/buildroot/package/wavpack/wavpack.mk index d44982232..485ab9b2a 100644 --- a/buildroot/package/wavpack/wavpack.mk +++ b/buildroot/package/wavpack/wavpack.mk @@ -12,6 +12,7 @@ WAVPACK_INSTALL_STAGING = YES WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) WAVPACK_LICENSE = BSD-3-Clause WAVPACK_LICENSE_FILES = COPYING +WAVPACK_CPE_ID_VENDOR = wavpack ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv diff --git a/buildroot/package/wayland/wayland.mk b/buildroot/package/wayland/wayland.mk index 1b1927271..6cb4a50db 100644 --- a/buildroot/package/wayland/wayland.mk +++ b/buildroot/package/wayland/wayland.mk @@ -9,6 +9,7 @@ WAYLAND_SITE = https://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING +WAYLAND_CPE_ID_VENDOR = wayland WAYLAND_INSTALL_STAGING = YES WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2 diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index 27f0e5a69..3869058d7 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.30.4.tar.xz.sums -md5 81c813d77a7b52ef655922f9b387f3a1 webkitgtk-2.30.4.tar.xz -sha1 330f45d7badf944fb01a3238ebb2ceaad8c2a91f webkitgtk-2.30.4.tar.xz -sha256 d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24 webkitgtk-2.30.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.30.5.tar.xz.sums +md5 c8291af0c5102fff1f73e67f0bff6c87 webkitgtk-2.30.5.tar.xz +sha1 4fc8753786d7762a3c4ecdc7ea11fc38b5468d6f webkitgtk-2.30.5.tar.xz +sha256 7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f webkitgtk-2.30.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 73111d383..8a3be4c95 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.30.4 +WEBKITGTK_VERSION = 2.30.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -12,6 +12,7 @@ WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 +WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 diff --git a/buildroot/package/webp/webp.hash b/buildroot/package/webp/webp.hash index a2d000026..24cec6dfa 100644 --- a/buildroot/package/webp/webp.hash +++ b/buildroot/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 libwebp-1.1.0.tar.gz -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING +sha256 2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c libwebp-1.2.0.tar.gz +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/buildroot/package/webp/webp.mk b/buildroot/package/webp/webp.mk index 4a9455498..ecf26faa3 100644 --- a/buildroot/package/webp/webp.mk +++ b/buildroot/package/webp/webp.mk @@ -4,11 +4,13 @@ # ################################################################################ -WEBP_VERSION = 1.1.0 +WEBP_VERSION = 1.2.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause WEBP_LICENSE_FILES = COPYING +WEBP_CPE_ID_VENDOR = webmproject +WEBP_CPE_ID_PRODUCT = libwebp WEBP_INSTALL_STAGING = YES WEBP_CONF_OPTS += \ diff --git a/buildroot/package/websocketpp/websocketpp.mk b/buildroot/package/websocketpp/websocketpp.mk index 26595a00d..59b365aa5 100644 --- a/buildroot/package/websocketpp/websocketpp.mk +++ b/buildroot/package/websocketpp/websocketpp.mk @@ -8,6 +8,7 @@ WEBSOCKETPP_VERSION = 0.8.2 WEBSOCKETPP_SITE = $(call github,zaphoyd,websocketpp,$(WEBSOCKETPP_VERSION)) WEBSOCKETPP_LICENSE = BSD-3c, MIT, Zlib WEBSOCKETPP_LICENSE_FILES = COPYING +WEBSOCKETPP_CPE_ID_VENDOR = zaphoyd WEBSOCKETPP_INSTALL_STAGING = YES # Only installs headers WEBSOCKETPP_INSTALL_TARGET = NO diff --git a/buildroot/package/wget/wget.mk b/buildroot/package/wget/wget.mk index ed3f1fdff..65c132e45 100644 --- a/buildroot/package/wget/wget.mk +++ b/buildroot/package/wget/wget.mk @@ -10,6 +10,7 @@ WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING +WGET_CPE_ID_VENDOR = gnu ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls diff --git a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash index 7adcc8603..b0aa6b91e 100644 --- a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash +++ b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9e3c3e8aa19e6cf59a72f235391a095d6d953c325b669d8a7815e32616c232df wilink-bt-firmware-43fca73c6a98c63fcb98f82af5bf83761778e005.tar.gz -sha256 21fd99ce784dc33b39ec0b4a383a9a9b8dafea261d73ad4548683c4eecd87f37 LICENSE +sha256 209e1a46a945e7d4d031e22fb7bd1e3fc96fa3b99d069051ce257c5e2e0843f4 wilink-bt-firmware-43fca73c6a98c63fcb98f82af5bf83761778e005-br1.tar.gz +sha256 21fd99ce784dc33b39ec0b4a383a9a9b8dafea261d73ad4548683c4eecd87f37 LICENSE diff --git a/buildroot/package/wine/wine.mk b/buildroot/package/wine/wine.mk index 7eafe9b06..80c9d20d3 100644 --- a/buildroot/package/wine/wine.mk +++ b/buildroot/package/wine/wine.mk @@ -9,6 +9,7 @@ WINE_SOURCE = wine-$(WINE_VERSION).tar.xz WINE_SITE = https://dl.winehq.org/wine/source/5.x WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE +WINE_CPE_ID_VENDOR = winehq WINE_DEPENDENCIES = host-bison host-flex host-wine HOST_WINE_DEPENDENCIES = host-bison host-flex diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash index 194c79857..f4f94cfd2 100644 --- a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-December/006210.html -sha256 6e5289a8b602eaaf1383aebefcbc41b8ad2721269055858b150363076c1c2132 wireguard-linux-compat-1.0.20201221.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2021-January/006349.html +sha256 dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54 wireguard-linux-compat-1.0.20210124.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk index ef21e2e11..2f36ec8bf 100644 --- a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20201221 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20210124 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 diff --git a/buildroot/package/wireless-regdb/wireless-regdb.mk b/buildroot/package/wireless-regdb/wireless-regdb.mk index e40c4beb1..2f9e91df3 100644 --- a/buildroot/package/wireless-regdb/wireless-regdb.mk +++ b/buildroot/package/wireless-regdb/wireless-regdb.mk @@ -9,6 +9,7 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE +WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS diff --git a/buildroot/package/wireless_tools/wireless_tools.mk b/buildroot/package/wireless_tools/wireless_tools.mk index b87ab20fb..1d29c3b10 100644 --- a/buildroot/package/wireless_tools/wireless_tools.mk +++ b/buildroot/package/wireless_tools/wireless_tools.mk @@ -10,6 +10,8 @@ WIRELESS_TOOLS_SITE = https://hewlettpackard.github.io/wireless-tools WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz WIRELESS_TOOLS_LICENSE = GPL-2.0 WIRELESS_TOOLS_LICENSE_FILES = COPYING +WIRELESS_TOOLS_CPE_ID_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR) +WIRELESS_TOOLS_CPE_ID_UPDATE = pre9 WIRELESS_TOOLS_INSTALL_STAGING = YES WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index b0e7687e1..56a0122dd 100644 --- a/buildroot/package/wireshark/wireshark.hash +++ b/buildroot/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.2.txt -sha1 b33276e4e6c3d6a057da3b569b58316330a5f3e3 wireshark-3.4.2.tar.xz -sha256 de9868729e426a469baabd8d444240d84fa5445020e92c842dd19afd0d47a4c4 wireshark-3.4.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.3.txt +sha1 7dec4332f21827e360b5830d1d6d566365796a67 wireshark-3.4.3.tar.xz +sha256 f467cc77f0fc73fce0b854cdbc292f132d4879fca69d417eccad5f967fbf262b wireshark-3.4.3.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index 84dfe7494..e751e550b 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,11 +4,12 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.2 +WIRESHARK_VERSION = 3.4.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_CPE_ID_VENDOR = wireshark WIRESHARK_DEPENDENCIES = \ c-ares \ host-pkgconf \ diff --git a/buildroot/package/wlroots/wlroots.hash b/buildroot/package/wlroots/wlroots.hash index 636f39101..2fab9b30b 100644 --- a/buildroot/package/wlroots/wlroots.hash +++ b/buildroot/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.11.0/wlroots-0.11.0.tar.gz.sig -sha256 a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01 wlroots-0.11.0.tar.gz +# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.12.0/wlroots-0.12.0.tar.gz.sig +sha256 c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb wlroots-0.12.0.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/buildroot/package/wlroots/wlroots.mk b/buildroot/package/wlroots/wlroots.mk index c1771df41..5665d5a95 100644 --- a/buildroot/package/wlroots/wlroots.mk +++ b/buildroot/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.11.0 +WLROOTS_VERSION = 0.12.0 WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -21,7 +21,7 @@ WLROOTS_DEPENDENCIES = \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Dlibseat=disabled ifeq ($(BR2_PACKAGE_FFMPEG),y) WLROOTS_DEPENDENCIES += ffmpeg diff --git a/buildroot/package/wolfssl/wolfssl.mk b/buildroot/package/wolfssl/wolfssl.mk index 202340114..d66a1c280 100644 --- a/buildroot/package/wolfssl/wolfssl.mk +++ b/buildroot/package/wolfssl/wolfssl.mk @@ -10,6 +10,7 @@ WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING +WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.hash b/buildroot/package/wpa_supplicant/wpa_supplicant.hash index ff5a2edb3..cce465d84 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.hash +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README +sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk index 7170db0d0..940a82174 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.mk +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.mk @@ -6,14 +6,18 @@ WPA_SUPPLICANT_VERSION = 2.9 WPA_SUPPLICANT_SITE = http://w1.fi/releases +WPA_SUPPLICANT_PATCH = \ + https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README +WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) +WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 diff --git a/buildroot/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash index 42bd27f11..df8ac547b 100644 --- a/buildroot/package/wpewebkit/wpewebkit.hash +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.30.4.tar.xz.sums -md5 d423a01ffb5be44e6ad59b2cfb9d6eb3 wpewebkit-2.30.4.tar.xz -sha1 2fdca7b888966ad2ed7d998bef52c9024dae063f wpewebkit-2.30.4.tar.xz -sha256 1e521d85cf8cf344b9fd08eabad7a1d18a330fb7862a77eaf78d7d7b10d5f6ef wpewebkit-2.30.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.30.5.tar.xz.sums +md5 63a9a7b7f29862ec827a730ba6542e80 wpewebkit-2.30.5.tar.xz +sha1 33136493672882d56617007d7ce65268cb79bda7 wpewebkit-2.30.5.tar.xz +sha256 4b577f4f07c34bb5d453d62b7a41d9e937bd3a2827a92dcd6f47c35f27c8359a wpewebkit-2.30.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/wpewebkit/wpewebkit.mk b/buildroot/package/wpewebkit/wpewebkit.mk index d3afdf009..78f729f82 100644 --- a/buildroot/package/wpewebkit/wpewebkit.mk +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.30.4 +WPEWEBKIT_VERSION = 2.30.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -12,6 +12,8 @@ WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 +WPEWEBKIT_CPE_ID_VENDOR = wpewebkit +WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo diff --git a/buildroot/package/wqy-zenhei/Config.in b/buildroot/package/wqy-zenhei/Config.in new file mode 100644 index 000000000..f9135e01a --- /dev/null +++ b/buildroot/package/wqy-zenhei/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_WQY_ZENHEI + bool "wqy-zenhei" + help + "WenQuanYi Zen Hei" is a Hei-Ti Style (sans-serif) Chinese + font capable of text formatting and on-screen display of + both simplified and traditional forms of Chinese Hanzi + glyphs (among many other languages). Both the proportional + "WenQuanYi Zen Hei", as well as the monospaced typeface + "WenQuanYi Zen Hei Mono" provides over 35,000 glyphs, + including over 21,000 Chinese Hanzi. This font provides full + coverage of GBK (CP936) charset, CJK Unified Ideographs, as + well as the code-points needed for zh_CN, zh_SG, zh_TW, + zh_HK, zh_MO, ja (Japanese) and ko (Korean) locales for + fontconfig. + + https://sourceforge.net/projects/wqy/ diff --git a/buildroot/package/wqy-zenhei/wqy-zenhei.hash b/buildroot/package/wqy-zenhei/wqy-zenhei.hash new file mode 100644 index 000000000..386f16eb6 --- /dev/null +++ b/buildroot/package/wqy-zenhei/wqy-zenhei.hash @@ -0,0 +1,6 @@ +# from https://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/ +md5 4c6c3f4e902dd5ee0a121e8c41d040bd wqy-zenhei-0.9.45.tar.gz +sha1 b86b65d3048ade868fcc89229cfac6baf80a3e54 wqy-zenhei-0.9.45.tar.gz +# locally calculated +sha256 e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6 wqy-zenhei-0.9.45.tar.gz +sha256 871c2a85e6bbf7bec65043820b706a265ed95d4e58c577fbb2c9f60c39c26ca7 COPYING diff --git a/buildroot/package/wqy-zenhei/wqy-zenhei.mk b/buildroot/package/wqy-zenhei/wqy-zenhei.mk new file mode 100644 index 000000000..88e60f3e5 --- /dev/null +++ b/buildroot/package/wqy-zenhei/wqy-zenhei.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# wqy-zenhei +# +################################################################################ + +WQY_ZENHEI_VERSION = 0.9.45 +WQY_ZENHEI_SITE = https://downloads.sourceforge.net/project/wqy/wqy-zenhei/$(WQY_ZENHEI_VERSION)%20%28Fighting-state%20RC1%29 +WQY_ZENHEI_LICENSE = GPL-2.0-with-font-exception +WQY_ZENHEI_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +define WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS + $(INSTALL) -D -m 0644 $(@D)/43-wqy-zenhei-sharp.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/43-wqy-zenhei-sharp.conf + $(INSTALL) -D -m 0644 $(@D)/44-wqy-zenhei.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/44-wqy-zenhei.conf +endef +endif + +define WQY_ZENHEI_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/wqy-zenhei.ttc \ + $(TARGET_DIR)/usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc + $(WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/x11r7/libxcb/libxcb.mk b/buildroot/package/x11r7/libxcb/libxcb.mk index fb691c242..9a35a7299 100644 --- a/buildroot/package/x11r7/libxcb/libxcb.mk +++ b/buildroot/package/x11r7/libxcb/libxcb.mk @@ -14,17 +14,17 @@ LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ host-libxslt xcb-proto xlib_libXdmcp xlib_libXau \ - host-xcb-proto host-python host-pkgconf + host-xcb-proto host-python3 host-pkgconf HOST_LIBXCB_DEPENDENCIES = \ host-libxslt host-xcb-proto host-xlib_libXdmcp \ - host-xlib_libXau host-python host-pkgconf + host-xlib_libXau host-python3 host-pkgconf LIBXCB_CONF_OPTS = --with-doxygen=no HOST_LIBXCB_CONF_OPTS = --with-doxygen=no -# libxcb is not python3 friendly, so force the python interpreter -HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 -LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 +# Force detection of Buildroot host-python3 over system python +LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 +HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash index 7a13a01a1..7faa797fd 100644 --- a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash +++ b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-January/003035.html -md5 bf8086aa878f0d1bb7715e5865183cc4 fonttosfnt-1.1.0.tar.bz2 -sha1 0e0ea8c92941bf9126b87fae5bb723c8e1035ae2 fonttosfnt-1.1.0.tar.bz2 -sha256 7283fd477e3de75cce40b91b5012953e30b862975555d4482435e2ee7b0f46dc fonttosfnt-1.1.0.tar.bz2 -sha512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173 fonttosfnt-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-October/003062.html +sha256 07c835f1f98d7b462be8f1493d072b62418282421be18197e50579c70b0c259b fonttosfnt-1.2.1.tar.bz2 +sha512 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742 fonttosfnt-1.2.1.tar.bz2 # Locally computed -sha256 f83378580cb7909a98b52bf5cd6a29f4894d76318c5c5312dd3f17a3e92beef1 COPYING +sha256 f83378580cb7909a98b52bf5cd6a29f4894d76318c5c5312dd3f17a3e92beef1 COPYING diff --git a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk index ab1d95577..bafc52490 100644 --- a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk +++ b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_FONTTOSFNT_VERSION = 1.1.0 +XAPP_FONTTOSFNT_VERSION = 1.2.1 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_FONTTOSFNT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index 98bd0c43a..7191d5520 100644 --- a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-February/003037.html -sha256 06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435 xkbcomp-1.4.3.tar.bz2 -sha512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d xkbcomp-1.4.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-November/003063.html +sha256 59cce603a607a17722a0a1cf99010f4894e7812beb5d695abbc08474d59af27e xkbcomp-1.4.4.tar.bz2 +sha512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4 xkbcomp-1.4.4.tar.bz2 # Locally computed -sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3 COPYING +sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3 COPYING diff --git a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index e97f8fdd8..69d4aefb9 100644 --- a/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.3 +XAPP_XKBCOMP_VERSION = 1.4.4 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash index f513e12c2..43eed80ba 100644 --- a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002969.html -md5 cc369c28383a5d7144e7197ee7d30bfa xprop-1.2.4.tar.bz2 -sha1 0549a927d01930218f1d0089d0157eb9538b34a5 xprop-1.2.4.tar.bz2 -sha256 8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753 xprop-1.2.4.tar.bz2 -sha512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-November/003064.html +sha256 9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1 xprop-1.2.5.tar.bz2 +sha512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2 # Locally computed -sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING +sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk index a0ad4302c..75f0d37cd 100644 --- a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.4 +XAPP_XPROP_VERSION = 1.2.5 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPROP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xcb-proto/xcb-proto.hash b/buildroot/package/x11r7/xcb-proto/xcb-proto.hash index c6d2d8e34..e6bc2379b 100644 --- a/buildroot/package/x11r7/xcb-proto/xcb-proto.hash +++ b/buildroot/package/x11r7/xcb-proto/xcb-proto.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-February/003038.html -sha256 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605 xcb-proto-1.14.tar.xz -sha512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 xcb-proto-1.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2020-October/003061.html +sha256 f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3 xcb-proto-1.14.1.tar.xz +sha512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d xcb-proto-1.14.1.tar.xz # Locally computed -sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/buildroot/package/x11r7/xcb-proto/xcb-proto.mk b/buildroot/package/x11r7/xcb-proto/xcb-proto.mk index f7a3ad55b..64190c817 100644 --- a/buildroot/package/x11r7/xcb-proto/xcb-proto.mk +++ b/buildroot/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,16 +4,20 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.14 +XCB_PROTO_VERSION = 1.14.1 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.xz -XCB_PROTO_SITE = http://xcb.freedesktop.org/dist +XCB_PROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XCB_PROTO_LICENSE = MIT XCB_PROTO_LICENSE_FILES = COPYING XCB_PROTO_INSTALL_STAGING = YES -XCB_PROTO_DEPENDENCIES = host-python -HOST_XCB_PROTO_DEPENDENCIES = host-python +XCB_PROTO_DEPENDENCIES = host-python3 +HOST_XCB_PROTO_DEPENDENCIES = host-python3 + +# Force detection of Buildroot host-python3 over system python +XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 +HOST_XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index e5d46c86f..5873b4b11 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61b3a7a22f80d1cbc797c329615e1699f3906c9261de7eabcf0de2bf2399de55 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz +sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index 321ae5b60..4e41bda15 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 029afa61e785f6e0fb18d2c2f1619e97af8b6f19c7fa0ba9923eea03ccf78626 xdriver_xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.gz +sha256 e121871de0396caff0349d761033aa4c0618d27b1ad5d79dab6c8246d9fb50d1 xdriver_xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc-br1.tar.gz sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index ee2769009..d179228a7 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002837.html -md5 8134201beaf6f77150c7809c3cc802e6 xf86-video-vesa-2.4.0.tar.bz2 -sha1 99b69044c34292ba062e365c07dcd024462e794b xf86-video-vesa-2.4.0.tar.bz2 -sha256 bf443c94d7bf6cd4e248f8a3147f4647be04dc4c80250d9405006263bbdee38c xf86-video-vesa-2.4.0.tar.bz2 -sha512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de xf86-video-vesa-2.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-September/003060.html +sha256 1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 xf86-video-vesa-2.5.0.tar.bz2 +sha512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2 # Locally computed -sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING +sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index 425280a11..b08bab4ec 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.4.0 +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.5.0 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT diff --git a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash index ae679a0ad..5390d1c12 100644 --- a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash +++ b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2020-August/003054.html +sha256 f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276 font-alias-1.0.4.tar.bz2 +sha512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2 # locally computed -sha256 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a font-alias-1.0.3.tar.bz2 sha256 bdba5452fc080c0f1a56d66978ac4150d1d1a00a9cc0248bba4f0b76c80ad47e COPYING diff --git a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk index 8a37da44c..7f8e4b2ea 100644 --- a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk +++ b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFONT_FONT_ALIAS_VERSION = 1.0.3 +XFONT_FONT_ALIAS_VERSION = 1.0.4 XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2 XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_ALIAS_LICENSE = MIT diff --git a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash index f806bf089..45cf43001 100644 --- a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash +++ b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2020-August/003055.html +sha256 698c0f6ddf9ca482250bdafa08293893148393bb9cb23e0a9ca313c6dbfc4ae0 font-misc-ethiopic-1.0.4.tar.bz2 +sha512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2 # locally computed -sha256 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5 font-misc-ethiopic-1.0.3.tar.bz2 sha256 94835f274f1ddad34f8fd3a06b2c493222a68e4094f4097000d101f22ee0d0d5 COPYING diff --git a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk index 6f345df52..9ded4b6ce 100644 --- a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +++ b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.3 +XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.4 XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2 XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash index 4da866f7b..3cbd19118 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4 xkeyboard-config-2.30.tar.bz2 +sha256 da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3 xkeyboard-config-2.31.tar.bz2 sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 9cf1a5787..f192836d1 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.30 +XKEYBOARD_CONFIG_VERSION = 2.31 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash index 142e4505d..5b1162f4c 100644 --- a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-August/003057.html -sha256 f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7 libX11-1.6.12.tar.bz2 -sha512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47 libX11-1.6.12.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-November/003065.html +sha256 36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54 libX11-1.7.0.tar.bz2 +sha512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb libX11-1.7.0.tar.bz2 # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk index ba9fcef25..8fefbc492 100644 --- a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,11 +4,13 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.6.12 +XLIB_LIBX11_VERSION = 1.7.0 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT XLIB_LIBX11_LICENSE_FILES = COPYING +XLIB_LIBX11_CPE_ID_VENDOR = x.org +XLIB_LIBX11_CPE_ID_PRODUCT = libx11 XLIB_LIBX11_INSTALL_STAGING = YES XLIB_LIBX11_DEPENDENCIES = \ libxcb \ diff --git a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk index de7f3a7d3..ad4cf5f96 100644 --- a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -9,6 +9,8 @@ XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING +XLIB_LIBXI_CPE_ID_VENDOR = x.org +XLIB_LIBXI_CPE_ID_PRODUCT = libxi XLIB_LIBXI_INSTALL_STAGING = YES XLIB_LIBXI_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index 23a0d974d..aa2761330 100644 --- a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -9,6 +9,8 @@ XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRANDR_LICENSE = MIT XLIB_LIBXRANDR_LICENSE_FILES = COPYING +XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org +XLIB_LIBXRANDR_CPE_ID_PRODUCT = libxrandr XLIB_LIBXRANDR_INSTALL_STAGING = YES XLIB_LIBXRANDR_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXrender xorgproto XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 870f94386..0ef0ec48d 100644 --- a/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -9,6 +9,8 @@ XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRENDER_LICENSE = MIT XLIB_LIBXRENDER_LICENSE_FILES = COPYING +XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org +XLIB_LIBXRENDER_CPE_ID_PRODUCT = libxrender XLIB_LIBXRENDER_INSTALL_STAGING = YES XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xorgproto HOST_XLIB_LIBXRENDER_DEPENDENCIES = \ diff --git a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash index 7f457fb9b..dcd4853d7 100644 --- a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg/2019-June/059825.html -md5 a9019421d3ee8b4937b6afd9025f018a libXt-1.2.0.tar.bz2 -sha1 f6b5ed799bc2e8d721e5407a09c2a8f570963f1b libXt-1.2.0.tar.bz2 -sha256 b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 libXt-1.2.0.tar.bz2 -sha512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 libXt-1.2.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2021-January/003070.html +sha256 679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 libXt-1.2.1.tar.bz2 +sha512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2 # Locally calculated -sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING +sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING diff --git a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk index 01251c091..289cb5ac5 100644 --- a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.2.0 +XLIB_LIBXT_VERSION = 1.2.1 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk index 0ff99b938..1105b5925 100644 --- a/buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -9,6 +9,8 @@ XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING +XLIB_LIBXV_CPE_ID_VENDOR = x.org +XLIB_LIBXV_CPE_ID_PRODUCT = libxv XLIB_LIBXV_INSTALL_STAGING = YES XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk index 02959c230..7980f1749 100644 --- a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk @@ -9,6 +9,8 @@ XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXVMC_LICENSE = MIT XLIB_LIBXVMC_LICENSE_FILES = COPYING +XLIB_LIBXVMC_CPE_ID_VENDOR = x.org +XLIB_LIBXVMC_CPE_ID_PRODUCT = libxvmc XLIB_LIBXVMC_INSTALL_STAGING = YES XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xorgproto XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch b/buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch deleted file mode 100644 index 68a9d7fc7..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/0002-Remove-check-for-useSIGIO-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj -Date: Mon, 30 Jan 2017 16:32:06 -0600 -Subject: [PATCH] Remove check for useSIGIO option - -Original patch follows: -Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO -option. - -As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO -and OsReleaseSIGIO. - -No longer the check for useSIGIO is needed - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj - -Downloaded from -https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch - -Signed-off-by: Mylène Josserand ---- - hw/xfree86/os-support/shared/sigio.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c -index 884a71c..be76498 100644 ---- a/hw/xfree86/os-support/shared/sigio.c -+++ b/hw/xfree86/os-support/shared/sigio.c -@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) - int i; - int installed = FALSE; - -- if (!xf86Info.useSIGIO) -- return 0; -- - for (i = 0; i < MAX_FUNCS; i++) { - if (!xf86SigIOFuncs[i].f) { - if (xf86IsPipe(fd)) -@@ -257,9 +256,6 @@ xf86RemoveSIGIOHandler(int fd) - int max; - int ret; - -- if (!xf86Info.useSIGIO) -- return 0; -- - max = 0; - ret = 0; - for (i = 0; i < MAX_FUNCS; i++) { --- -2.7.4 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/0003-include-misc.h-fix-uClibc-build.patch b/buildroot/package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/0003-include-misc.h-fix-uClibc-build.patch rename to buildroot/package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/0004-hw-xwayland-Makefile.am-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/0005-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/buildroot/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/0006-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch rename to buildroot/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 8ac2d17b2..fa8ae13b8 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -216,9 +216,12 @@ define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/xorg.service endef +# init script conflicts with S90nodm +ifneq ($(BR2_PACKAGE_NODM),y) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg endef +endif $(eval $(autotools-package)) diff --git a/buildroot/package/x11vnc/x11vnc.mk b/buildroot/package/x11vnc/x11vnc.mk index 571febfcf..aa0f14c45 100644 --- a/buildroot/package/x11vnc/x11vnc.mk +++ b/buildroot/package/x11vnc/x11vnc.mk @@ -12,6 +12,7 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING +X11VNC_CPE_ID_VALID = YES # 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch X11VNC_IGNORE_CVES += CVE-2020-29074 diff --git a/buildroot/package/x265/x265.mk b/buildroot/package/x265/x265.mk index ae9e0acb6..872753eea 100644 --- a/buildroot/package/x265/x265.mk +++ b/buildroot/package/x265/x265.mk @@ -9,6 +9,7 @@ X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ X265_LICENSE_FILES = COPYING +X265_CPE_ID_VENDOR = multicorewareinc X265_SUBDIR = source X265_INSTALL_STAGING = YES X265_MAKE = $(MAKE1) diff --git a/buildroot/package/xapian/xapian.hash b/buildroot/package/xapian/xapian.hash index 3ebaea705..192032e6d 100644 --- a/buildroot/package/xapian/xapian.hash +++ b/buildroot/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2020-June/009813.html -sha256 4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70 xapian-core-1.4.16.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2021-January/009856.html +sha256 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 xapian-core-1.4.18.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/xapian/xapian.mk b/buildroot/package/xapian/xapian.mk index 19d301e98..4f40babcf 100644 --- a/buildroot/package/xapian/xapian.mk +++ b/buildroot/package/xapian/xapian.mk @@ -4,11 +4,13 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.16 +XAPIAN_VERSION = 1.4.18 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ XAPIAN_LICENSE_FILES = COPYING +XAPIAN_CPE_ID_VENDOR = xapian +XAPIAN_CPE_ID_PRODUCT = xapian-core XAPIAN_INSTALL_STAGING = YES XAPIAN_DEPENDENCIES = zlib diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index cb1ea23ba..3a758b7b2 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -8,6 +8,8 @@ XEN_VERSION = 4.14.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING +XEN_CPE_ID_VENDOR = xen +XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 # Calculate XEN_ARCH diff --git a/buildroot/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch b/buildroot/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch new file mode 100644 index 000000000..e4addea85 --- /dev/null +++ b/buildroot/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch @@ -0,0 +1,1721 @@ +From 8acdbd718b7828b5d8903a6254b2fa198b866491 Mon Sep 17 00:00:00 2001 +From: Florian Bezdeka +Date: Thu, 12 Nov 2020 11:45:28 +0000 +Subject: [PATCH] lib/boilerplate/iniparser: Allow building with GCC 10.2 + 2020101 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Updating to upstream revision f858275f7f307eecba84c2f5429483f9f28007f8. +Upstream repository is located at [1]. + +The reason for updating was the following compiler error when trying +to compile with GCC 10.2 10.2.1 20201016. As it turned out the problem +was already addressed upstream: + +iniparser/iniparser.c: In function ‘iniparser_load’: +iniparser/iniparser.c:616:13: error: ‘sprintf’ arguments 3, 4 may +overlap destination object ‘buf’ [-Werror=restrict] + 616 | sprintf(tmp, "%s:%s", section, key); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +I reviewed especially the API changes. Most of them are cleanups only +but two things should be pointed out: + + - The type of the size field of struct _dictionary_ changed from int + to ssize_t. The only user of this struct is + lib/analogy/calibration.c which uses this structure for internal + things only. It is never exposed to any public API so updating is + OK and fully backward compatible. + + - dictionary_new changed its signature + from dictionary_new(int size) + to dictionary_new(size_t size). + This function is not part of any public API. So updating does not + break backward compatibility. + +[1] https://github.com/ndevilla/iniparser + +Signed-off-by: Florian Bezdeka +Signed-off-by: Jan Kiszka + +[Retrieved from: +https://gitlab.denx.de/Xenomai/xenomai/-/commit/8acdbd718b7828b5d8903a6254b2fa198b866491] +Signed-off-by: Fabrice Fontaine +--- + lib/boilerplate/iniparser/dictionary.c | 409 ++++++++++---------- + lib/boilerplate/iniparser/dictionary.h | 43 ++- + lib/boilerplate/iniparser/iniparser.c | 491 +++++++++++++++++-------- + lib/boilerplate/iniparser/iniparser.h | 131 +++++-- + 4 files changed, 646 insertions(+), 428 deletions(-) + +diff --git a/lib/boilerplate/iniparser/dictionary.c b/lib/boilerplate/iniparser/dictionary.c +index 5299b77ed..cb7ccd49e 100644 +--- a/lib/boilerplate/iniparser/dictionary.c ++++ b/lib/boilerplate/iniparser/dictionary.c +@@ -1,10 +1,8 @@ + /*-------------------------------------------------------------------------*/ + /** +- @file dictionary.c +- @author N. Devillard +- @date Sep 2007 +- @version $Revision: 1.27 $ +- @brief Implements a dictionary for string variables. ++ @file dictionary.c ++ @author N. Devillard ++ @brief Implements a dictionary for string variables. + + This module implements a simple dictionary object, i.e. a list + of string/string associations. This object is useful to store e.g. +@@ -12,12 +10,8 @@ + */ + /*--------------------------------------------------------------------------*/ + +-/* +- $Id: dictionary.c,v 1.27 2007-11-23 21:39:18 ndevilla Exp $ +- $Revision: 1.27 $ +-*/ + /*--------------------------------------------------------------------------- +- Includes ++ Includes + ---------------------------------------------------------------------------*/ + #include "dictionary.h" + +@@ -27,33 +21,18 @@ + #include + + /** Maximum value size for integers and doubles. */ +-#define MAXVALSZ 1024 ++#define MAXVALSZ 1024 + + /** Minimal allocated number of entries in a dictionary */ +-#define DICTMINSZ 128 ++#define DICTMINSZ 128 + + /** Invalid key token */ + #define DICT_INVALID_KEY ((char*)-1) + + /*--------------------------------------------------------------------------- +- Private functions ++ Private functions + ---------------------------------------------------------------------------*/ + +-/* Doubles the allocated size associated to a pointer */ +-/* 'size' is the current allocated size. */ +-static void * mem_double(void * ptr, int size) +-{ +- void * newptr ; +- +- newptr = calloc(2*size, 1); +- if (newptr==NULL) { +- return NULL ; +- } +- memcpy(newptr, ptr, size); +- free(ptr); +- return newptr ; +-} +- + /*-------------------------------------------------------------------------*/ + /** + @brief Duplicate a string +@@ -67,23 +46,68 @@ static void * mem_double(void * ptr, int size) + static char * xstrdup(const char * s) + { + char * t ; ++ size_t len ; + if (!s) + return NULL ; +- t = malloc(strlen(s)+1) ; ++ ++ len = strlen(s) + 1 ; ++ t = (char*) malloc(len) ; + if (t) { +- strcpy(t,s); ++ memcpy(t, s, len) ; + } + return t ; + } + ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Double the size of the dictionary ++ @param d Dictionary to grow ++ @return This function returns non-zero in case of failure ++ */ ++/*--------------------------------------------------------------------------*/ ++static int dictionary_grow(dictionary * d) ++{ ++ char ** new_val ; ++ char ** new_key ; ++ unsigned * new_hash ; ++ ++ new_val = (char**) calloc(d->size * 2, sizeof *d->val); ++ new_key = (char**) calloc(d->size * 2, sizeof *d->key); ++ new_hash = (unsigned*) calloc(d->size * 2, sizeof *d->hash); ++ if (!new_val || !new_key || !new_hash) { ++ /* An allocation failed, leave the dictionary unchanged */ ++ if (new_val) ++ free(new_val); ++ if (new_key) ++ free(new_key); ++ if (new_hash) ++ free(new_hash); ++ return -1 ; ++ } ++ /* Initialize the newly allocated space */ ++ memcpy(new_val, d->val, d->size * sizeof(char *)); ++ memcpy(new_key, d->key, d->size * sizeof(char *)); ++ memcpy(new_hash, d->hash, d->size * sizeof(unsigned)); ++ /* Delete previous data */ ++ free(d->val); ++ free(d->key); ++ free(d->hash); ++ /* Actually update the dictionary */ ++ d->size *= 2 ; ++ d->val = new_val; ++ d->key = new_key; ++ d->hash = new_hash; ++ return 0 ; ++} ++ + /*--------------------------------------------------------------------------- +- Function codes ++ Function codes + ---------------------------------------------------------------------------*/ + /*-------------------------------------------------------------------------*/ + /** +- @brief Compute the hash key for a string. +- @param key Character string to use for key. +- @return 1 unsigned int on at least 32 bits. ++ @brief Compute the hash key for a string. ++ @param key Character string to use for key. ++ @return 1 unsigned int on at least 32 bits. + + This hash function has been taken from an Article in Dr Dobbs Journal. + This is normally a collision-free function, distributing keys evenly. +@@ -93,84 +117,88 @@ static char * xstrdup(const char * s) + /*--------------------------------------------------------------------------*/ + unsigned dictionary_hash(const char * key) + { +- int len ; +- unsigned hash ; +- int i ; +- +- len = strlen(key); +- for (hash=0, i=0 ; i>6) ; +- } +- hash += (hash <<3); +- hash ^= (hash >>11); +- hash += (hash <<15); +- return hash ; ++ size_t len ; ++ unsigned hash ; ++ size_t i ; ++ ++ if (!key) ++ return 0 ; ++ ++ len = strlen(key); ++ for (hash=0, i=0 ; i>6) ; ++ } ++ hash += (hash <<3); ++ hash ^= (hash >>11); ++ hash += (hash <<15); ++ return hash ; + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Create a new dictionary object. +- @param size Optional initial size of the dictionary. +- @return 1 newly allocated dictionary objet. ++ @brief Create a new dictionary object. ++ @param size Optional initial size of the dictionary. ++ @return 1 newly allocated dictionary objet. + + This function allocates a new dictionary object of given size and returns + it. If you do not know in advance (roughly) the number of entries in the + dictionary, give size=0. + */ +-/*--------------------------------------------------------------------------*/ +-dictionary * dictionary_new(int size) ++/*-------------------------------------------------------------------------*/ ++dictionary * dictionary_new(size_t size) + { +- dictionary * d ; +- +- /* If no size was specified, allocate space for DICTMINSZ */ +- if (sizesize = size ; +- d->val = (char **)calloc(size, sizeof(char*)); +- d->key = (char **)calloc(size, sizeof(char*)); +- d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); +- return d ; ++ dictionary * d ; ++ ++ /* If no size was specified, allocate space for DICTMINSZ */ ++ if (sizesize = size ; ++ d->val = (char**) calloc(size, sizeof *d->val); ++ d->key = (char**) calloc(size, sizeof *d->key); ++ d->hash = (unsigned*) calloc(size, sizeof *d->hash); ++ } ++ return d ; + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Delete a dictionary object +- @param d dictionary object to deallocate. +- @return void ++ @brief Delete a dictionary object ++ @param d dictionary object to deallocate. ++ @return void + + Deallocate a dictionary object and all memory associated to it. + */ + /*--------------------------------------------------------------------------*/ + void dictionary_del(dictionary * d) + { +- int i ; +- +- if (d==NULL) return ; +- for (i=0 ; isize ; i++) { +- if (d->key[i]!=NULL) +- free(d->key[i]); +- if (d->val[i]!=NULL) +- free(d->val[i]); +- } +- free(d->val); +- free(d->key); +- free(d->hash); +- free(d); +- return ; ++ ssize_t i ; ++ ++ if (d==NULL) return ; ++ for (i=0 ; isize ; i++) { ++ if (d->key[i]!=NULL) ++ free(d->key[i]); ++ if (d->val[i]!=NULL) ++ free(d->val[i]); ++ } ++ free(d->val); ++ free(d->key); ++ free(d->hash); ++ free(d); ++ return ; + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Get a value from a dictionary. +- @param d dictionary object to search. +- @param key Key to look for in the dictionary. ++ @brief Get a value from a dictionary. ++ @param d dictionary object to search. ++ @param key Key to look for in the dictionary. + @param def Default value to return if key not found. +- @return 1 pointer to internally allocated character string. ++ @return 1 pointer to internally allocated character string. + + This function locates a key in a dictionary and returns a pointer to its + value, or the passed 'def' pointer if no such key can be found in +@@ -178,24 +206,24 @@ void dictionary_del(dictionary * d) + dictionary object, you should not try to free it or modify it. + */ + /*--------------------------------------------------------------------------*/ +-const char * dictionary_get(dictionary * d, const char * key, const char * def) ++const char * dictionary_get(const dictionary * d, const char * key, const char * def) + { +- unsigned hash ; +- int i ; ++ unsigned hash ; ++ ssize_t i ; + +- hash = dictionary_hash(key); +- for (i=0 ; isize ; i++) { ++ hash = dictionary_hash(key); ++ for (i=0 ; isize ; i++) { + if (d->key[i]==NULL) + continue ; + /* Compare hash */ +- if (hash==d->hash[i]) { ++ if (hash==d->hash[i]) { + /* Compare string, to avoid hash collisions */ + if (!strcmp(key, d->key[i])) { +- return d->val[i] ; +- } +- } +- } +- return def ; ++ return d->val[i] ; ++ } ++ } ++ } ++ return def ; + } + + /*-------------------------------------------------------------------------*/ +@@ -226,66 +254,57 @@ const char * dictionary_get(dictionary * d, const char * key, const char * def) + /*--------------------------------------------------------------------------*/ + int dictionary_set(dictionary * d, const char * key, const char * val) + { +- int i ; +- unsigned hash ; +- +- if (d==NULL || key==NULL) return -1 ; +- +- /* Compute hash for this key */ +- hash = dictionary_hash(key) ; +- /* Find if value is already in dictionary */ +- if (d->n>0) { +- for (i=0 ; isize ; i++) { ++ ssize_t i ; ++ unsigned hash ; ++ ++ if (d==NULL || key==NULL) return -1 ; ++ ++ /* Compute hash for this key */ ++ hash = dictionary_hash(key) ; ++ /* Find if value is already in dictionary */ ++ if (d->n>0) { ++ for (i=0 ; isize ; i++) { + if (d->key[i]==NULL) + continue ; +- if (hash==d->hash[i]) { /* Same hash value */ +- if (!strcmp(key, d->key[i])) { /* Same key */ +- /* Found a value: modify and return */ +- if (d->val[i]!=NULL) +- free(d->val[i]); +- d->val[i] = val ? xstrdup(val) : NULL ; ++ if (hash==d->hash[i]) { /* Same hash value */ ++ if (!strcmp(key, d->key[i])) { /* Same key */ ++ /* Found a value: modify and return */ ++ if (d->val[i]!=NULL) ++ free(d->val[i]); ++ d->val[i] = (val ? xstrdup(val) : NULL); + /* Value has been modified: return */ +- return 0 ; +- } +- } +- } +- } +- /* Add a new value */ +- /* See if dictionary needs to grow */ +- if (d->n==d->size) { +- +- /* Reached maximum size: reallocate dictionary */ +- d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; +- d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; +- d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; +- if ((d->val==NULL) || (d->key==NULL) || (d->hash==NULL)) { +- /* Cannot grow dictionary */ +- return -1 ; ++ return 0 ; ++ } ++ } + } +- /* Double size */ +- d->size *= 2 ; +- } ++ } ++ /* Add a new value */ ++ /* See if dictionary needs to grow */ ++ if (d->n==d->size) { ++ /* Reached maximum size: reallocate dictionary */ ++ if (dictionary_grow(d) != 0) ++ return -1; ++ } + +- /* Insert key in the first empty slot */ +- for (i=0 ; isize ; i++) { +- if (d->key[i]==NULL) { +- /* Add key here */ +- break ; +- } ++ /* Insert key in the first empty slot. Start at d->n and wrap at ++ d->size. Because d->n < d->size this will necessarily ++ terminate. */ ++ for (i=d->n ; d->key[i] ; ) { ++ if(++i == d->size) i = 0; + } +- /* Copy key */ +- d->key[i] = xstrdup(key); +- d->val[i] = val ? xstrdup(val) : NULL ; +- d->hash[i] = hash; +- d->n ++ ; +- return 0 ; ++ /* Copy key */ ++ d->key[i] = xstrdup(key); ++ d->val[i] = (val ? xstrdup(val) : NULL) ; ++ d->hash[i] = hash; ++ d->n ++ ; ++ return 0 ; + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Delete a key in a dictionary +- @param d dictionary object to modify. +- @param key Key to remove. ++ @brief Delete a key in a dictionary ++ @param d dictionary object to modify. ++ @param key Key to remove. + @return void + + This function deletes a key in a dictionary. Nothing is done if the +@@ -294,26 +313,26 @@ int dictionary_set(dictionary * d, const char * key, const char * val) + /*--------------------------------------------------------------------------*/ + void dictionary_unset(dictionary * d, const char * key) + { +- unsigned hash ; +- int i ; ++ unsigned hash ; ++ ssize_t i ; + +- if (key == NULL) { +- return; +- } ++ if (key == NULL || d == NULL) { ++ return; ++ } + +- hash = dictionary_hash(key); +- for (i=0 ; isize ; i++) { ++ hash = dictionary_hash(key); ++ for (i=0 ; isize ; i++) { + if (d->key[i]==NULL) + continue ; + /* Compare hash */ +- if (hash==d->hash[i]) { ++ if (hash==d->hash[i]) { + /* Compare string, to avoid hash collisions */ + if (!strcmp(key, d->key[i])) { + /* Found key */ + break ; +- } +- } +- } ++ } ++ } ++ } + if (i>=d->size) + /* Key not found */ + return ; +@@ -331,75 +350,31 @@ void dictionary_unset(dictionary * d, const char * key) + + /*-------------------------------------------------------------------------*/ + /** +- @brief Dump a dictionary to an opened file pointer. +- @param d Dictionary to dump +- @param out Opened file pointer. +- @return void ++ @brief Dump a dictionary to an opened file pointer. ++ @param d Dictionary to dump ++ @param f Opened file pointer. ++ @return void + + Dumps a dictionary onto an opened file pointer. Key pairs are printed out + as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as + output file pointers. + */ + /*--------------------------------------------------------------------------*/ +-void dictionary_dump(dictionary * d, FILE * out) ++void dictionary_dump(const dictionary * d, FILE * out) + { +- int i ; +- +- if (d==NULL || out==NULL) return ; +- if (d->n<1) { +- fprintf(out, "empty dictionary\n"); +- return ; +- } +- for (i=0 ; isize ; i++) { ++ ssize_t i ; ++ ++ if (d==NULL || out==NULL) return ; ++ if (d->n<1) { ++ fprintf(out, "empty dictionary\n"); ++ return ; ++ } ++ for (i=0 ; isize ; i++) { + if (d->key[i]) { + fprintf(out, "%20s\t[%s]\n", + d->key[i], + d->val[i] ? d->val[i] : "UNDEF"); + } +- } +- return ; +-} +- +- +-/* Test code */ +-#ifdef TESTDIC +-#define NVALS 20000 +-int main(int argc, char *argv[]) +-{ +- dictionary * d ; +- char * val ; +- int i ; +- char cval[90] ; +- +- /* Allocate dictionary */ +- printf("allocating...\n"); +- d = dictionary_new(0); +- +- /* Set values in dictionary */ +- printf("setting %d values...\n", NVALS); +- for (i=0 ; in != 0) { +- printf("error deleting values\n"); + } +- printf("deallocating...\n"); +- dictionary_del(d); +- return 0 ; ++ return ; + } +-#endif +-/* vim: set ts=4 et sw=4 tw=75 */ +diff --git a/lib/boilerplate/iniparser/dictionary.h b/lib/boilerplate/iniparser/dictionary.h +index fa4dcb727..d04b6ce71 100644 +--- a/lib/boilerplate/iniparser/dictionary.h ++++ b/lib/boilerplate/iniparser/dictionary.h +@@ -3,8 +3,6 @@ + /** + @file dictionary.h + @author N. Devillard +- @date Sep 2007 +- @version $Revision: 1.12 $ + @brief Implements a dictionary for string variables. + + This module implements a simple dictionary object, i.e. a list +@@ -13,18 +11,11 @@ + */ + /*--------------------------------------------------------------------------*/ + +-/* +- $Id: dictionary.h,v 1.12 2007-11-23 21:37:00 ndevilla Exp $ +- $Author: ndevilla $ +- $Date: 2007-11-23 21:37:00 $ +- $Revision: 1.12 $ +-*/ +- + #ifndef _DICTIONARY_H_ + #define _DICTIONARY_H_ + + /*--------------------------------------------------------------------------- +- Includes ++ Includes + ---------------------------------------------------------------------------*/ + + #include +@@ -32,14 +23,18 @@ + #include + #include + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /*--------------------------------------------------------------------------- +- New types ++ New types + ---------------------------------------------------------------------------*/ + + + /*-------------------------------------------------------------------------*/ + /** +- @brief Dictionary object ++ @brief Dictionary object + + This object contains a list of string/string associations. Each + association is identified by a unique string key. Looking up values +@@ -48,16 +43,16 @@ + */ + /*-------------------------------------------------------------------------*/ + typedef struct _dictionary_ { +- int n ; /** Number of entries in dictionary */ +- int size ; /** Storage size */ +- char ** val ; /** List of string values */ +- char ** key ; /** List of string keys */ +- unsigned * hash ; /** List of hash values for keys */ ++ int n ; /** Number of entries in dictionary */ ++ ssize_t size ; /** Storage size */ ++ char ** val ; /** List of string values */ ++ char ** key ; /** List of string keys */ ++ unsigned * hash ; /** List of hash values for keys */ + } dictionary ; + + + /*--------------------------------------------------------------------------- +- Function prototypes ++ Function prototypes + ---------------------------------------------------------------------------*/ + + /*-------------------------------------------------------------------------*/ +@@ -85,7 +80,7 @@ unsigned dictionary_hash(const char * key); + dictionary, give size=0. + */ + /*--------------------------------------------------------------------------*/ +-dictionary * dictionary_new(int size); ++dictionary * dictionary_new(size_t size); + + /*-------------------------------------------------------------------------*/ + /** +@@ -112,7 +107,7 @@ void dictionary_del(dictionary * vd); + dictionary object, you should not try to free it or modify it. + */ + /*--------------------------------------------------------------------------*/ +-const char * dictionary_get(dictionary * d, const char * key, const char * def); ++const char * dictionary_get(const dictionary * d, const char * key, const char * def); + + + /*-------------------------------------------------------------------------*/ +@@ -161,7 +156,7 @@ void dictionary_unset(dictionary * d, const char * key); + /** + @brief Dump a dictionary to an opened file pointer. + @param d Dictionary to dump +- @param out Opened file pointer. ++ @param f Opened file pointer. + @return void + + Dumps a dictionary onto an opened file pointer. Key pairs are printed out +@@ -169,6 +164,10 @@ void dictionary_unset(dictionary * d, const char * key); + output file pointers. + */ + /*--------------------------------------------------------------------------*/ +-void dictionary_dump(dictionary * d, FILE * out); ++void dictionary_dump(const dictionary * d, FILE * out); ++ ++#ifdef __cplusplus ++} ++#endif + + #endif +diff --git a/lib/boilerplate/iniparser/iniparser.c b/lib/boilerplate/iniparser/iniparser.c +index 5b2094a00..f1d165896 100644 +--- a/lib/boilerplate/iniparser/iniparser.c ++++ b/lib/boilerplate/iniparser/iniparser.c +@@ -3,19 +3,12 @@ + /** + @file iniparser.c + @author N. Devillard +- @date Sep 2007 +- @version 3.0 + @brief Parser for ini files. + */ + /*--------------------------------------------------------------------------*/ +-/* +- $Id: iniparser.c,v 2.18 2008-01-03 18:35:39 ndevilla Exp $ +- $Revision: 2.18 $ +- $Date: 2008-01-03 18:35:39 $ +-*/ + /*---------------------------- Includes ------------------------------------*/ + #include +-#include ++#include + #include "iniparser.h" + + /*---------------------------- Defines -------------------------------------*/ +@@ -39,65 +32,115 @@ typedef enum _line_status_ { + + /*-------------------------------------------------------------------------*/ + /** +- @brief Convert a string to lowercase. +- @param s String to convert. +- @return ptr to statically allocated string. +- +- This function returns a pointer to a statically allocated string +- containing a lowercased version of the input string. Do not free +- or modify the returned string! Since the returned string is statically +- allocated, it will be modified at each function call (not re-entrant). ++ @brief Convert a string to lowercase. ++ @param in String to convert. ++ @param out Output buffer. ++ @param len Size of the out buffer. ++ @return ptr to the out buffer or NULL if an error occured. ++ ++ This function convert a string into lowercase. ++ At most len - 1 elements of the input string will be converted. + */ + /*--------------------------------------------------------------------------*/ +- +-static char strbuf[ASCIILINESZ+1]; +- +-static char * strlwc(const char * s) ++static const char * strlwc(const char * in, char *out, unsigned len) + { +- int i ; ++ unsigned i ; + +- if (s==NULL) return NULL ; +- memset(strbuf, 0, ASCIILINESZ+1); ++ if (in==NULL || out == NULL || len==0) return NULL ; + i=0 ; +- while (s[i] && i s) { ++ if (!isspace((int)*(last-1))) ++ break ; ++ last -- ; ++ } ++ *last = (char)0; ++ ++ memmove(dest,s,last - s + 1); ++ return last - s; ++} ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Default error callback for iniparser: wraps `fprintf(stderr, ...)`. ++ */ ++/*--------------------------------------------------------------------------*/ ++static int default_error_callback(const char *format, ...) ++{ ++ int ret; ++ va_list argptr; ++ va_start(argptr, format); ++ ret = vfprintf(stderr, format, argptr); ++ va_end(argptr); ++ return ret; + } + ++static int (*iniparser_error_callback)(const char*, ...) = default_error_callback; ++ + /*-------------------------------------------------------------------------*/ + /** +- @brief Remove blanks at the beginning and the end of a string. +- @param s String to parse. +- @return ptr to statically allocated string. +- +- This function returns a pointer to a statically allocated string, +- which is identical to the input string, except that all blank +- characters at the end and the beg. of the string have been removed. +- Do not free or modify the returned string! Since the returned string +- is statically allocated, it will be modified at each function call +- (not re-entrant). ++ @brief Configure a function to receive the error messages. ++ @param errback Function to call. ++ ++ By default, the error will be printed on stderr. If a null pointer is passed ++ as errback the error callback will be switched back to default. + */ + /*--------------------------------------------------------------------------*/ +-static char * strstrip(const char * s) ++void iniparser_set_error_callback(int (*errback)(const char *, ...)) + { +- char * last ; +- +- if (s==NULL) return NULL ; +- +- while (isspace((int)*s) && *s) s++; +- memset(strbuf, 0, ASCIILINESZ+1); +- strcpy(strbuf, s); +- last = strbuf + strlen(strbuf); +- while (last > strbuf) { +- if (!isspace((int)*(last-1))) +- break ; +- last -- ; +- } +- *last = (char)0; +- return (char*)strbuf ; ++ if (errback) { ++ iniparser_error_callback = errback; ++ } else { ++ iniparser_error_callback = default_error_callback; ++ } + } + + /*-------------------------------------------------------------------------*/ +@@ -118,7 +161,7 @@ static char * strstrip(const char * s) + This function returns -1 in case of error. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_getnsec(dictionary * d) ++int iniparser_getnsec(const dictionary * d) + { + int i ; + int nsec ; +@@ -149,7 +192,7 @@ int iniparser_getnsec(dictionary * d) + This function returns NULL in case of error. + */ + /*--------------------------------------------------------------------------*/ +-const char * iniparser_getsecname(dictionary * d, int n) ++const char * iniparser_getsecname(const dictionary * d, int n) + { + int i ; + int foundsec ; +@@ -184,7 +227,7 @@ const char * iniparser_getsecname(dictionary * d, int n) + purposes mostly. + */ + /*--------------------------------------------------------------------------*/ +-void iniparser_dump(dictionary * d, FILE * f) ++void iniparser_dump(const dictionary * d, FILE * f) + { + int i ; + +@@ -212,13 +255,11 @@ void iniparser_dump(dictionary * d, FILE * f) + It is Ok to specify @c stderr or @c stdout as output files. + */ + /*--------------------------------------------------------------------------*/ +-void iniparser_dump_ini(dictionary * d, FILE * f) ++void iniparser_dump_ini(const dictionary * d, FILE * f) + { +- int i, j ; +- char keym[ASCIILINESZ+1]; +- int nsec ; +- const char * secname ; +- int seclen ; ++ int i ; ++ int nsec ; ++ const char * secname ; + + if (d==NULL || f==NULL) return ; + +@@ -234,24 +275,126 @@ void iniparser_dump_ini(dictionary * d, FILE * f) + } + for (i=0 ; isize ; j++) { +- if (d->key[j]==NULL) +- continue ; +- if (!strncmp(d->key[j], keym, seclen+1)) { +- fprintf(f, +- "%-30s = %s\n", +- d->key[j]+seclen+1, +- d->val[j] ? d->val[j] : ""); +- } ++ iniparser_dumpsection_ini(d, secname, f); ++ } ++ fprintf(f, "\n"); ++ return ; ++} ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Save a dictionary section to a loadable ini file ++ @param d Dictionary to dump ++ @param s Section name of dictionary to dump ++ @param f Opened file pointer to dump to ++ @return void ++ ++ This function dumps a given section of a given dictionary into a loadable ini ++ file. It is Ok to specify @c stderr or @c stdout as output files. ++ */ ++/*--------------------------------------------------------------------------*/ ++void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f) ++{ ++ int j ; ++ char keym[ASCIILINESZ+1]; ++ int seclen ; ++ ++ if (d==NULL || f==NULL) return ; ++ if (! iniparser_find_entry(d, s)) return ; ++ ++ seclen = (int)strlen(s); ++ fprintf(f, "\n[%s]\n", s); ++ sprintf(keym, "%s:", s); ++ for (j=0 ; jsize ; j++) { ++ if (d->key[j]==NULL) ++ continue ; ++ if (!strncmp(d->key[j], keym, seclen+1)) { ++ fprintf(f, ++ "%-30s = %s\n", ++ d->key[j]+seclen+1, ++ d->val[j] ? d->val[j] : ""); + } + } + fprintf(f, "\n"); + return ; + } + ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the number of keys in a section of a dictionary. ++ @param d Dictionary to examine ++ @param s Section name of dictionary to examine ++ @return Number of keys in section ++ */ ++/*--------------------------------------------------------------------------*/ ++int iniparser_getsecnkeys(const dictionary * d, const char * s) ++{ ++ int seclen, nkeys ; ++ char keym[ASCIILINESZ+1]; ++ int j ; ++ ++ nkeys = 0; ++ ++ if (d==NULL) return nkeys; ++ if (! iniparser_find_entry(d, s)) return nkeys; ++ ++ seclen = (int)strlen(s); ++ strlwc(s, keym, sizeof(keym)); ++ keym[seclen] = ':'; ++ ++ for (j=0 ; jsize ; j++) { ++ if (d->key[j]==NULL) ++ continue ; ++ if (!strncmp(d->key[j], keym, seclen+1)) ++ nkeys++; ++ } ++ ++ return nkeys; ++ ++} ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the number of keys in a section of a dictionary. ++ @param d Dictionary to examine ++ @param s Section name of dictionary to examine ++ @param keys Already allocated array to store the keys in ++ @return The pointer passed as `keys` argument or NULL in case of error ++ ++ This function queries a dictionary and finds all keys in a given section. ++ The keys argument should be an array of pointers which size has been ++ determined by calling `iniparser_getsecnkeys` function prior to this one. ++ ++ Each pointer in the returned char pointer-to-pointer is pointing to ++ a string allocated in the dictionary; do not free or modify them. ++ */ ++/*--------------------------------------------------------------------------*/ ++const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys) ++{ ++ int i, j, seclen ; ++ char keym[ASCIILINESZ+1]; ++ ++ if (d==NULL || keys==NULL) return NULL; ++ if (! iniparser_find_entry(d, s)) return NULL; ++ ++ seclen = (int)strlen(s); ++ strlwc(s, keym, sizeof(keym)); ++ keym[seclen] = ':'; ++ ++ i = 0; ++ ++ for (j=0 ; jsize ; j++) { ++ if (d->key[j]==NULL) ++ continue ; ++ if (!strncmp(d->key[j], keym, seclen+1)) { ++ keys[i] = d->key[j]; ++ i++; ++ } ++ } ++ ++ return keys; ++} ++ + /*-------------------------------------------------------------------------*/ + /** + @brief Get the string associated to a key +@@ -267,24 +410,27 @@ void iniparser_dump_ini(dictionary * d, FILE * f) + the dictionary, do not free or modify it. + */ + /*--------------------------------------------------------------------------*/ +-const char * iniparser_getstring(dictionary * d, const char * key, const char * def) ++const char * iniparser_getstring(const dictionary * d, const char * key, const char * def) + { +- char * lc_key ; ++ const char * lc_key ; ++ const char * sval ; ++ char tmp_str[ASCIILINESZ+1]; + + if (d==NULL || key==NULL) + return def ; + +- lc_key = strlwc(key); +- return dictionary_get(d, lc_key, def); ++ lc_key = strlwc(key, tmp_str, sizeof(tmp_str)); ++ sval = dictionary_get(d, lc_key, def); ++ return sval ; + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Get the string associated to a key, convert to an int ++ @brief Get the string associated to a key, convert to an long int + @param d Dictionary to search + @param key Key string to look for + @param notfound Value to return in case of error +- @return integer ++ @return long integer + + This function queries a dictionary for a key. A key as read from an + ini file is given as "section:key". If the key cannot be found, +@@ -305,13 +451,46 @@ const char * iniparser_getstring(dictionary * d, const char * key, const char * + Credits: Thanks to A. Becker for suggesting strtol() + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_getint(dictionary * d, const char * key, int notfound) ++long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound) + { +- const char * str ; ++ const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); + if (str==INI_INVALID_KEY) return notfound ; +- return (int)strtol(str, NULL, 0); ++ return strtol(str, NULL, 0); ++} ++ ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the string associated to a key, convert to an int ++ @param d Dictionary to search ++ @param key Key string to look for ++ @param notfound Value to return in case of error ++ @return integer ++ ++ This function queries a dictionary for a key. A key as read from an ++ ini file is given as "section:key". If the key cannot be found, ++ the notfound value is returned. ++ ++ Supported values for integers include the usual C notation ++ so decimal, octal (starting with 0) and hexadecimal (starting with 0x) ++ are supported. Examples: ++ ++ "42" -> 42 ++ "042" -> 34 (octal -> decimal) ++ "0x42" -> 66 (hexa -> decimal) ++ ++ Warning: the conversion may overflow in various ways. Conversion is ++ totally outsourced to strtol(), see the associated man page for overflow ++ handling. ++ ++ Credits: Thanks to A. Becker for suggesting strtol() ++ */ ++/*--------------------------------------------------------------------------*/ ++int iniparser_getint(const dictionary * d, const char * key, int notfound) ++{ ++ return (int)iniparser_getlongint(d, key, notfound); + } + + /*-------------------------------------------------------------------------*/ +@@ -327,9 +506,9 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) + the notfound value is returned. + */ + /*--------------------------------------------------------------------------*/ +-double iniparser_getdouble(dictionary * d, const char * key, double notfound) ++double iniparser_getdouble(const dictionary * d, const char * key, double notfound) + { +- const char * str ; ++ const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); + if (str==INI_INVALID_KEY) return notfound ; +@@ -368,10 +547,10 @@ double iniparser_getdouble(dictionary * d, const char * key, double notfound) + necessarily have to be 0 or 1. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_getboolean(dictionary * d, const char * key, int notfound) ++int iniparser_getboolean(const dictionary * d, const char * key, int notfound) + { +- const char * c ; +- int ret ; ++ int ret ; ++ const char * c ; + + c = iniparser_getstring(d, key, INI_INVALID_KEY); + if (c==INI_INVALID_KEY) return notfound ; +@@ -397,10 +576,7 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound) + of querying for the presence of sections in a dictionary. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_find_entry( +- dictionary * ini, +- const char * entry +-) ++int iniparser_find_entry(const dictionary * ini, const char * entry) + { + int found=0 ; + if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) { +@@ -418,13 +594,14 @@ int iniparser_find_entry( + @return int 0 if Ok, -1 otherwise. + + If the given entry can be found in the dictionary, it is modified to +- contain the provided value. If it cannot be found, -1 is returned. ++ contain the provided value. If it cannot be found, the entry is created. + It is Ok to set val to NULL. + */ + /*--------------------------------------------------------------------------*/ + int iniparser_set(dictionary * ini, const char * entry, const char * val) + { +- return dictionary_set(ini, strlwc(entry), val) ; ++ char tmp_str[ASCIILINESZ+1]; ++ return dictionary_set(ini, strlwc(entry, tmp_str, sizeof(tmp_str)), val) ; + } + + /*-------------------------------------------------------------------------*/ +@@ -439,12 +616,13 @@ int iniparser_set(dictionary * ini, const char * entry, const char * val) + /*--------------------------------------------------------------------------*/ + void iniparser_unset(dictionary * ini, const char * entry) + { +- dictionary_unset(ini, strlwc(entry)); ++ char tmp_str[ASCIILINESZ+1]; ++ dictionary_unset(ini, strlwc(entry, tmp_str, sizeof(tmp_str))); + } + + /*-------------------------------------------------------------------------*/ + /** +- @brief Load a single line from an INI file ++ @brief Load a single line from an INI file + @param input_line Input line, may be concatenated multi-line input + @param section Output space to store section + @param key Output space to store key +@@ -457,34 +635,39 @@ static line_status iniparser_line( + char * section, + char * key, + char * value) +-{ ++{ + line_status sta ; +- char line[ASCIILINESZ+1]; +- int len ; ++ char * line = NULL; ++ size_t len ; + +- strcpy(line, strstrip(input_line)); +- len = (int)strlen(line); ++ line = xstrdup(input_line); ++ len = strstrip(line); + + sta = LINE_UNPROCESSED ; + if (len<1) { + /* Empty line */ + sta = LINE_EMPTY ; +- } else if (line[0]=='#') { ++ } else if (line[0]=='#' || line[0]==';') { + /* Comment line */ +- sta = LINE_COMMENT ; ++ sta = LINE_COMMENT ; + } else if (line[0]=='[' && line[len-1]==']') { + /* Section name */ + sscanf(line, "[%[^]]", section); +- strcpy(section, strstrip(section)); +- strcpy(section, strlwc(section)); ++ strstrip(section); ++ strlwc(section, section, len); + sta = LINE_SECTION ; + } else if (sscanf (line, "%[^=] = \"%[^\"]\"", key, value) == 2 +- || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2 +- || sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { +- /* Usual key=value, with or without comments */ +- strcpy(key, strstrip(key)); +- strcpy(key, strlwc(key)); +- strcpy(value, strstrip(value)); ++ || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2) { ++ /* Usual key=value with quotes, with or without comments */ ++ strstrip(key); ++ strlwc(key, key, len); ++ /* Don't strip spaces from values surrounded with quotes */ ++ sta = LINE_VALUE ; ++ } else if (sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { ++ /* Usual key=value without quotes, with or without comments */ ++ strstrip(key); ++ strlwc(key, key, len); ++ strstrip(value); + /* + * sscanf cannot handle '' or "" as empty values + * this is done here +@@ -501,14 +684,16 @@ static line_status iniparser_line( + * key=; + * key=# + */ +- strcpy(key, strstrip(key)); +- strcpy(key, strlwc(key)); ++ strstrip(key); ++ strlwc(key, key, len); + value[0]=0 ; + sta = LINE_VALUE ; + } else { + /* Generate syntax error */ + sta = LINE_ERROR ; + } ++ ++ free(line); + return sta ; + } + +@@ -528,44 +713,33 @@ static line_status iniparser_line( + /*--------------------------------------------------------------------------*/ + dictionary * iniparser_load(const char * ininame) + { +- char *buf; + FILE * in ; + +- char *line; +- char *section; +- char *key; +- char *tmp; +- char *val; ++ char line [ASCIILINESZ+1] ; ++ char section [ASCIILINESZ+1] ; ++ char key [ASCIILINESZ+1] ; ++ char tmp [(ASCIILINESZ * 2) + 2] ; ++ char val [ASCIILINESZ+1] ; + + int last=0 ; + int len ; + int lineno=0 ; + int errs=0; +- int ret; ++ int mem_err=0; + + dictionary * dict ; + +- if ((in=fopen(ininame, "r"))==NULL) ++ if ((in=fopen(ininame, "r"))==NULL) { ++ iniparser_error_callback("iniparser: cannot open %s\n", ininame); + return NULL ; ++ } + + dict = dictionary_new(0) ; + if (!dict) { + fclose(in); +- errno = ENOMEM; + return NULL ; + } + +- buf = malloc((ASCIILINESZ+1) * 5); +- if (buf == NULL) { +- errno = -ENOMEM; +- return NULL; +- } +- line = buf; +- section = line + ASCIILINESZ + 1; +- key = section + ASCIILINESZ + 1; +- tmp = key + ASCIILINESZ + 1; +- val = tmp + ASCIILINESZ + 1; +- + memset(line, 0, ASCIILINESZ); + memset(section, 0, ASCIILINESZ); + memset(key, 0, ASCIILINESZ); +@@ -575,18 +749,16 @@ dictionary * iniparser_load(const char * ininame) + while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { + lineno++ ; + len = (int)strlen(line)-1; ++ if (len<=0) ++ continue; + /* Safety check against buffer overflows */ +- if (last > 0 && line[len]!='\n') { +-#if 0 +- warning(anon_scope, +- "iniparser: input line too long in %s (%d)\n", +- ininame, +- lineno); +-#endif ++ if (line[len]!='\n' && !feof(in)) { ++ iniparser_error_callback( ++ "iniparser: input line too long in %s (%d)\n", ++ ininame, ++ lineno); + dictionary_del(dict); + fclose(in); +- free(buf); +- errno = EINVAL; + return NULL ; + } + /* Get rid of \n and spaces at end of line */ +@@ -595,8 +767,11 @@ dictionary * iniparser_load(const char * ininame) + line[len]=0 ; + len-- ; + } ++ if (len < 0) { /* Line was entirely \n and/or spaces */ ++ len = 0; ++ } + /* Detect multi-line */ +- if (len >= 0 && line[len]=='\\') { ++ if (line[len]=='\\') { + /* Multi-line value */ + last=len ; + continue ; +@@ -609,24 +784,20 @@ dictionary * iniparser_load(const char * ininame) + break ; + + case LINE_SECTION: +- errs = dictionary_set(dict, section, NULL); ++ mem_err = dictionary_set(dict, section, NULL); + break ; + + case LINE_VALUE: + sprintf(tmp, "%s:%s", section, key); +- errs = dictionary_set(dict, tmp, val) ; ++ mem_err = dictionary_set(dict, tmp, val); + break ; + +- case LINE_ERROR: +-#if 0 +- printf("iniparser: syntax error in %s (%d):\n", +- ininame, +- lineno); +- printf( "-> %s\n", line); +- +-#endif +- +- ret = EINVAL; ++ case LINE_ERROR: ++ iniparser_error_callback( ++ "iniparser: syntax error in %s (%d):\n-> %s\n", ++ ininame, ++ lineno, ++ line); + errs++ ; + break; + +@@ -635,18 +806,16 @@ dictionary * iniparser_load(const char * ininame) + } + memset(line, 0, ASCIILINESZ); + last=0; +- if (errs<0) { +- ret = ENOMEM; ++ if (mem_err<0) { ++ iniparser_error_callback("iniparser: memory allocation failure\n"); + break ; + } + } +- fclose(in); +- free(buf); + if (errs) { + dictionary_del(dict); + dict = NULL ; +- errno = ret; + } ++ fclose(in); + return dict ; + } + +@@ -665,5 +834,3 @@ void iniparser_freedict(dictionary * d) + { + dictionary_del(d); + } +- +-/* vim: set ts=4 et sw=4 tw=75 */ +diff --git a/lib/boilerplate/iniparser/iniparser.h b/lib/boilerplate/iniparser/iniparser.h +index d454cef34..37ff7b71b 100644 +--- a/lib/boilerplate/iniparser/iniparser.h ++++ b/lib/boilerplate/iniparser/iniparser.h +@@ -3,22 +3,15 @@ + /** + @file iniparser.h + @author N. Devillard +- @date Sep 2007 +- @version 3.0 + @brief Parser for ini files. + */ + /*--------------------------------------------------------------------------*/ + +-/* +- $Id: iniparser.h,v 1.24 2007-11-23 21:38:19 ndevilla Exp $ +- $Revision: 1.24 $ +-*/ +- + #ifndef _INIPARSER_H_ + #define _INIPARSER_H_ + + /*--------------------------------------------------------------------------- +- Includes ++ Includes + ---------------------------------------------------------------------------*/ + + #include +@@ -34,12 +27,21 @@ + + #include "dictionary.h" + +-/*--------------------------------------------------------------------------- +- Macros +- ---------------------------------------------------------------------------*/ +-/** For backwards compatibility only */ +-#define iniparser_getstr(d, k) iniparser_getstring(d, k, NULL) +-#define iniparser_setstr iniparser_setstring ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Configure a function to receive the error messages. ++ @param errback Function to call. ++ ++ By default, the error will be printed on stderr. If a null pointer is passed ++ as errback the error callback will be switched back to default. ++ */ ++/*--------------------------------------------------------------------------*/ ++ ++void iniparser_set_error_callback(int (*errback)(const char *, ...)); + + /*-------------------------------------------------------------------------*/ + /** +@@ -60,7 +62,7 @@ + */ + /*--------------------------------------------------------------------------*/ + +-int iniparser_getnsec(dictionary * d); ++int iniparser_getnsec(const dictionary * d); + + + /*-------------------------------------------------------------------------*/ +@@ -78,7 +80,7 @@ int iniparser_getnsec(dictionary * d); + */ + /*--------------------------------------------------------------------------*/ + +-const char * iniparser_getsecname(dictionary * d, int n); ++const char * iniparser_getsecname(const dictionary * d, int n); + + + /*-------------------------------------------------------------------------*/ +@@ -93,7 +95,22 @@ const char * iniparser_getsecname(dictionary * d, int n); + */ + /*--------------------------------------------------------------------------*/ + +-void iniparser_dump_ini(dictionary * d, FILE * f); ++void iniparser_dump_ini(const dictionary * d, FILE * f); ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Save a dictionary section to a loadable ini file ++ @param d Dictionary to dump ++ @param s Section name of dictionary to dump ++ @param f Opened file pointer to dump to ++ @return void ++ ++ This function dumps a given section of a given dictionary into a loadable ini ++ file. It is Ok to specify @c stderr or @c stdout as output files. ++ */ ++/*--------------------------------------------------------------------------*/ ++ ++void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f); + + /*-------------------------------------------------------------------------*/ + /** +@@ -108,7 +125,36 @@ void iniparser_dump_ini(dictionary * d, FILE * f); + purposes mostly. + */ + /*--------------------------------------------------------------------------*/ +-void iniparser_dump(dictionary * d, FILE * f); ++void iniparser_dump(const dictionary * d, FILE * f); ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the number of keys in a section of a dictionary. ++ @param d Dictionary to examine ++ @param s Section name of dictionary to examine ++ @return Number of keys in section ++ */ ++/*--------------------------------------------------------------------------*/ ++int iniparser_getsecnkeys(const dictionary * d, const char * s); ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the number of keys in a section of a dictionary. ++ @param d Dictionary to examine ++ @param s Section name of dictionary to examine ++ @param keys Already allocated array to store the keys in ++ @return The pointer passed as `keys` argument or NULL in case of error ++ ++ This function queries a dictionary and finds all keys in a given section. ++ The keys argument should be an array of pointers which size has been ++ determined by calling `iniparser_getsecnkeys` function prior to this one. ++ ++ Each pointer in the returned char pointer-to-pointer is pointing to ++ a string allocated in the dictionary; do not free or modify them. ++ */ ++/*--------------------------------------------------------------------------*/ ++const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys); ++ + + /*-------------------------------------------------------------------------*/ + /** +@@ -125,7 +171,7 @@ void iniparser_dump(dictionary * d, FILE * f); + the dictionary, do not free or modify it. + */ + /*--------------------------------------------------------------------------*/ +-const char * iniparser_getstring(dictionary * d, const char * key, const char * def); ++const char * iniparser_getstring(const dictionary * d, const char * key, const char * def); + + /*-------------------------------------------------------------------------*/ + /** +@@ -154,7 +200,35 @@ const char * iniparser_getstring(dictionary * d, const char * key, const char * + Credits: Thanks to A. Becker for suggesting strtol() + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_getint(dictionary * d, const char * key, int notfound); ++int iniparser_getint(const dictionary * d, const char * key, int notfound); ++ ++/*-------------------------------------------------------------------------*/ ++/** ++ @brief Get the string associated to a key, convert to an long int ++ @param d Dictionary to search ++ @param key Key string to look for ++ @param notfound Value to return in case of error ++ @return integer ++ ++ This function queries a dictionary for a key. A key as read from an ++ ini file is given as "section:key". If the key cannot be found, ++ the notfound value is returned. ++ ++ Supported values for integers include the usual C notation ++ so decimal, octal (starting with 0) and hexadecimal (starting with 0x) ++ are supported. Examples: ++ ++ - "42" -> 42 ++ - "042" -> 34 (octal -> decimal) ++ - "0x42" -> 66 (hexa -> decimal) ++ ++ Warning: the conversion may overflow in various ways. Conversion is ++ totally outsourced to strtol(), see the associated man page for overflow ++ handling. ++ */ ++/*--------------------------------------------------------------------------*/ ++long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound); ++ + + /*-------------------------------------------------------------------------*/ + /** +@@ -169,7 +243,7 @@ int iniparser_getint(dictionary * d, const char * key, int notfound); + the notfound value is returned. + */ + /*--------------------------------------------------------------------------*/ +-double iniparser_getdouble(dictionary * d, const char * key, double notfound); ++double iniparser_getdouble(const dictionary * d, const char * key, double notfound); + + /*-------------------------------------------------------------------------*/ + /** +@@ -203,7 +277,7 @@ double iniparser_getdouble(dictionary * d, const char * key, double notfound); + necessarily have to be 0 or 1. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_getboolean(dictionary * d, const char * key, int notfound); ++int iniparser_getboolean(const dictionary * d, const char * key, int notfound); + + + /*-------------------------------------------------------------------------*/ +@@ -212,17 +286,16 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound); + @param ini Dictionary to modify. + @param entry Entry to modify (entry name) + @param val New value to associate to the entry. +- @return int 0 if Ok, -1 otherwise. ++ @return int 0 if Ok, -1 otherwise. + + If the given entry can be found in the dictionary, it is modified to +- contain the provided value. If it cannot be found, -1 is returned. ++ contain the provided value. If it cannot be found, the entry is created. + It is Ok to set val to NULL. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_setstring(dictionary * ini, const char * entry, const char * val); +- + int iniparser_set(dictionary * ini, const char * entry, const char * val); + ++ + /*-------------------------------------------------------------------------*/ + /** + @brief Delete an entry in a dictionary +@@ -247,7 +320,7 @@ void iniparser_unset(dictionary * ini, const char * entry); + of querying for the presence of sections in a dictionary. + */ + /*--------------------------------------------------------------------------*/ +-int iniparser_find_entry(dictionary * ini, const char * entry) ; ++int iniparser_find_entry(const dictionary * ini, const char * entry) ; + + /*-------------------------------------------------------------------------*/ + /** +@@ -278,4 +351,8 @@ dictionary * iniparser_load(const char * ininame); + /*--------------------------------------------------------------------------*/ + void iniparser_freedict(dictionary * d); + ++#ifdef __cplusplus ++} ++#endif ++ + #endif +-- +GitLab + diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in index 452b45203..ec6d9e5d2 100644 --- a/buildroot/package/xenomai/Config.in +++ b/buildroot/package/xenomai/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS bool - default y - depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \ - BR2_powerpc + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_powerpc + default y if BR2_arm && !BR2_ARM_CPU_ARMV7M && !BR2_ARM_CPU_ARMV8A comment "xenomai needs a glibc or uClibc toolchain w/ threads" depends on BR2_USE_MMU @@ -69,9 +70,11 @@ config BR2_PACKAGE_XENOMAI_REPOSITORY depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION + string "Custom Xenomai version" if \ + !BR2_PACKAGE_XENOMAI_LATEST_VERSION && \ + !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION - depends on !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + default "custom" if BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL string "URL of custom tarball" @@ -108,6 +111,8 @@ endchoice config BR2_PACKAGE_XENOMAI_ENABLE_SMP bool "Enable SMP support" default y + # SMP not supported below armv6 + depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 help This option enables SMP support in Xenomai userspace. diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk index 11c69000d..7e3b13008 100644 --- a/buildroot/package/xenomai/xenomai.mk +++ b/buildroot/package/xenomai/xenomai.mk @@ -37,7 +37,7 @@ 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/ --disable-doc-install +XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) XENOMAI_CONF_OPTS += --with-core=mercury diff --git a/buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch b/buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch deleted file mode 100644 index 8bed7711c..000000000 --- a/buildroot/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c9bfe786331647237b90f5f9e35b4d2cad7aaa69 Mon Sep 17 00:00:00 2001 -From: Roger Leigh -Date: Fri, 12 Oct 2018 12:02:58 +0000 -Subject: [PATCH] cmake: Allow thread checks to fail and fall back to nothreads - -Closes: #2155 - - -git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1843653 13f79535-47bb-0310-9956-ffa450edef68 -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://github.com/apache/xerces-c/commit/c9bfe786331647237b90f5f9e35b4d2cad7aaa69] ---- - cmake/XercesMutexMgrSelection.cmake | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/cmake/XercesMutexMgrSelection.cmake b/cmake/XercesMutexMgrSelection.cmake -index 2f1d71c50..ad698840d 100644 ---- a/cmake/XercesMutexMgrSelection.cmake -+++ b/cmake/XercesMutexMgrSelection.cmake -@@ -19,11 +19,15 @@ - - # mutexmgr selection - --option(threads "Threading support" ON) -+set(xerces_thread_default ON) -+find_package(Threads) -+if(NOT TARGET Threads::Threads) -+ set(xerces_thread_default ON) -+endif() - --include(CheckCXXSourceCompiles) -+option(threads "Threading support" ${xerces_thread_default}) - --find_package(Threads REQUIRED) -+include(CheckCXXSourceCompiles) - - function(thread_test outvar) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/buildroot/package/xerces/0002-fix-static-linking-with-curl.patch b/buildroot/package/xerces/0001-fix-static-linking-with-curl.patch similarity index 100% rename from buildroot/package/xerces/0002-fix-static-linking-with-curl.patch rename to buildroot/package/xerces/0001-fix-static-linking-with-curl.patch diff --git a/buildroot/package/xerces/xerces.hash b/buildroot/package/xerces/xerces.hash index 28db0c606..c75ce860e 100644 --- a/buildroot/package/xerces/xerces.hash +++ b/buildroot/package/xerces/xerces.hash @@ -1,5 +1,5 @@ -# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.2.tar.xz.sha256 -sha256 6daca3b23364d8d883dc77a73f681242f69389e3564543287ed3d073007e0a8e xerces-c-3.2.2.tar.xz +# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.3.tar.xz.sha256 +sha256 12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 xerces-c-3.2.3.tar.xz # Hash for license file -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/xerces/xerces.mk b/buildroot/package/xerces/xerces.mk index ae42b1e62..a3e5361b2 100644 --- a/buildroot/package/xerces/xerces.mk +++ b/buildroot/package/xerces/xerces.mk @@ -4,11 +4,13 @@ # ################################################################################ -XERCES_VERSION = 3.2.2 +XERCES_VERSION = 3.2.3 XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 XERCES_LICENSE_FILES = LICENSE +XERCES_CPE_ID_VENDOR = apache +XERCES_CPE_ID_PRODUCT = xerces-c\+\+ XERCES_INSTALL_STAGING = YES define XERCES_DISABLE_SAMPLES @@ -17,11 +19,6 @@ endef XERCES_POST_PATCH_HOOKS += XERCES_DISABLE_SAMPLES -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -XERCES_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_ICU),y) XERCES_DEPENDENCIES += icu endif diff --git a/buildroot/package/xfsprogs/Config.in b/buildroot/package/xfsprogs/Config.in index 024cde9fe..b8e07cc83 100644 --- a/buildroot/package/xfsprogs/Config.in +++ b/buildroot/package/xfsprogs/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_INIH select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/buildroot/package/xfsprogs/xfsprogs.hash b/buildroot/package/xfsprogs/xfsprogs.hash index 79f953b33..b379839e7 100644 --- a/buildroot/package/xfsprogs/xfsprogs.hash +++ b/buildroot/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b xfsprogs-5.8.0.tar.xz +sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/buildroot/package/xfsprogs/xfsprogs.mk b/buildroot/package/xfsprogs/xfsprogs.mk index bfaf9fd71..71d02278e 100644 --- a/buildroot/package/xfsprogs/xfsprogs.mk +++ b/buildroot/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.8.0 +XFSPROGS_VERSION = 5.10.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = util-linux +XFSPROGS_DEPENDENCIES = inih util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \ diff --git a/buildroot/package/xinetd/xinetd.hash b/buildroot/package/xinetd/xinetd.hash index 1b7ee09b0..ce5a93f57 100644 --- a/buildroot/package/xinetd/xinetd.hash +++ b/buildroot/package/xinetd/xinetd.hash @@ -1,3 +1,3 @@ # locally computed -sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-2-3-15.tar.gz +sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-2.3.15.tar.gz sha256 2f3dd19831b1837f7360f80a7700a130c04a59e387d4359299d6df712308bbed COPYRIGHT diff --git a/buildroot/package/xinetd/xinetd.mk b/buildroot/package/xinetd/xinetd.mk index 6d6767766..f58c26f02 100644 --- a/buildroot/package/xinetd/xinetd.mk +++ b/buildroot/package/xinetd/xinetd.mk @@ -4,10 +4,12 @@ # ################################################################################ -XINETD_VERSION = 2-3-15 -XINETD_SITE = $(call github,xinetd-org,xinetd,xinetd-$(XINETD_VERSION)) +XINETD_VERSION = 2.3.15 +XINETD_SITE = \ + $(call github,xinetd-org,xinetd,xinetd-$(subst .,-,$(XINETD_VERSION))) XINETD_LICENSE = xinetd license XINETD_LICENSE_FILES = COPYRIGHT +XINETD_CPE_ID_VENDOR = xinetd # 0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch XINETD_IGNORE_CVES += CVE-2013-4342 diff --git a/buildroot/package/xorcurses/Config.in b/buildroot/package/xorcurses/Config.in new file mode 100644 index 000000000..6a94a2eef --- /dev/null +++ b/buildroot/package/xorcurses/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_XORCURSES + bool "xorcurses" + select BR2_PACKAGE_NCURSES + help + XorCurses is a game remake of the 8-bit game 'Xor'. Your task + is to roam around a series of mazes where you have to collect + all blue masks before finding the exit. Note that the game + needs a terminal with colors, i.e. make sure that the TERM + environment variable is set to "linux" ("vt100" won't work). + + https://github.com/jwm-art-net/XorCurses/ diff --git a/buildroot/package/xorcurses/xorcurses.hash b/buildroot/package/xorcurses/xorcurses.hash new file mode 100644 index 000000000..549b5adf1 --- /dev/null +++ b/buildroot/package/xorcurses/xorcurses.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 6c60a41b9a74ecd5f6ded337b9982e81eaf7b31a654a4a32b219e3a2ff638ae3 xorcurses-04b664826c5bd30dd483f6a5c8c189ef97e255da.tar.gz +sha256 8632a67e5a76be4cdf7fd0fc6509e21bd6c647183bd9d2325310d5098c652a3a README diff --git a/buildroot/package/xorcurses/xorcurses.mk b/buildroot/package/xorcurses/xorcurses.mk new file mode 100644 index 000000000..10b746f2e --- /dev/null +++ b/buildroot/package/xorcurses/xorcurses.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# xorcurses +# +################################################################################ + +XORCURSES_VERSION = 04b664826c5bd30dd483f6a5c8c189ef97e255da +XORCURSES_SITE = $(call github,jwm-art-net,XorCurses,$(XORCURSES_VERSION)) +XORCURSES_DEPENDENCIES = ncurses +XORCURSES_LICENSE = GPL-3.0 +XORCURSES_LICENSE_FILES = README + +define XORCURSES_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99 \ + -DDATADIR='\"/usr/share/xorcurses\"' \ + -DVERSION='\"$(XORCURSES_VERSION)\"'" +endef + +define XORCURSES_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/xorcurses $(TARGET_DIR)/usr/bin/xorcurses + mkdir -p $(TARGET_DIR)/usr/share/xorcurses/maps + $(INSTALL) -D -m 0644 $(@D)/maps/*.xcm \ + $(TARGET_DIR)/usr/share/xorcurses/maps/ +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/xscreensaver/Config.in b/buildroot/package/xscreensaver/Config.in index c1d6a03f5..d773c6991 100644 --- a/buildroot/package/xscreensaver/Config.in +++ b/buildroot/package/xscreensaver/Config.in @@ -2,13 +2,15 @@ config BR2_PACKAGE_XSCREENSAVER bool "xscreensaver" depends on BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> glib2 - depends on BR2_USE_WCHAR # libgtk2 -> glib2 - depends on BR2_USE_MMU # libgtk2 -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2 + depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 + depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + select BR2_PACKAGE_GDK_PIXBUF + select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBGLADE + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT diff --git a/buildroot/package/xscreensaver/xscreensaver.hash b/buildroot/package/xscreensaver/xscreensaver.hash index 51f418a89..26ecd8bbb 100644 --- a/buildroot/package/xscreensaver/xscreensaver.hash +++ b/buildroot/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95 xscreensaver-5.44.tar.gz +sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/buildroot/package/xscreensaver/xscreensaver.mk b/buildroot/package/xscreensaver/xscreensaver.mk index 8f61dd1e1..cb1e440ea 100644 --- a/buildroot/package/xscreensaver/xscreensaver.mk +++ b/buildroot/package/xscreensaver/xscreensaver.mk @@ -4,15 +4,23 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.44 +XSCREENSAVER_VERSION = 5.45 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h +XSCREENSAVER_CPE_ID_VALID = YES -XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ - $(TARGET_NLS_DEPENDENCIES) host-intltool +XSCREENSAVER_DEPENDENCIES = \ + gdk-pixbuf \ + jpeg \ + libgtk2 \ + libxml2 \ + xlib_libX11 \ + xlib_libXt \ + $(TARGET_NLS_DEPENDENCIES) \ + host-intltool # otherwise we end up with host include/library dirs passed to the # compiler/linker @@ -20,6 +28,62 @@ XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ --libdir=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XSCREENSAVER_CONF_OPTS += --with-gl=yes +XSCREENSAVER_DEPENDENCIES += libgl libglu +else +XSCREENSAVER_CONF_OPTS += --with-gl=no +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +XSCREENSAVER_CONF_OPTS += --with-png=yes +XSCREENSAVER_DEPENDENCIES += libpng +else +XSCREENSAVER_CONF_OPTS += --with-png=no +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +XSCREENSAVER_CONF_OPTS += --with-systemd=yes +XSCREENSAVER_DEPENDENCIES += systemd +else +XSCREENSAVER_CONF_OPTS += --with-systemd=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +XSCREENSAVER_CONF_OPTS += --with-xft=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXft +else +XSCREENSAVER_CONF_OPTS += --with-xft=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) +XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXi +else +XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXinerama +else +XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) +XSCREENSAVER_CONF_OPTS += --with-randr-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXrandr +else +XSCREENSAVER_CONF_OPTS += --with-randr-ext=no +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) +XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=yes +XSCREENSAVER_DEPENDENCIES += xlib_libXxf86vm +else +XSCREENSAVER_CONF_OPTS += --with-xf86vmode-ext=no +endif + XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install $(eval $(autotools-package)) diff --git a/buildroot/package/xtables-addons/Config.in b/buildroot/package/xtables-addons/Config.in index 39fafe72b..36a42c7ef 100644 --- a/buildroot/package/xtables-addons/Config.in +++ b/buildroot/package/xtables-addons/Config.in @@ -16,4 +16,4 @@ config BR2_PACKAGE_XTABLES_ADDONS Likewise, it contains extensions that were not, or are not yet, accepted in the main kernel/iptables packages. - http://xtables-addons.sourceforge.net/ + https://inai.de/projects/xtables-addons/ diff --git a/buildroot/package/xtables-addons/xtables-addons.hash b/buildroot/package/xtables-addons/xtables-addons.hash index 33cc139b3..2cfb91178 100644 --- a/buildroot/package/xtables-addons/xtables-addons.hash +++ b/buildroot/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 064dd68937d98e6cfcbdf51ef459310d9810c17ab31b21285bc7a76cdcef7c49 xtables-addons-3.9.tar.xz +sha256 893c0c4ea09759cda1ab7e68f1281d125e59270f7b59e446204ce686c6a76d65 xtables-addons-3.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/xtables-addons/xtables-addons.mk b/buildroot/package/xtables-addons/xtables-addons.mk index c9e5bfdde..55e1a5d01 100644 --- a/buildroot/package/xtables-addons/xtables-addons.mk +++ b/buildroot/package/xtables-addons/xtables-addons.mk @@ -4,9 +4,9 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.9 +XTABLES_ADDONS_VERSION = 3.13 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz -XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons +XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf XTABLES_ADDONS_LICENSE = GPL-2.0+ XTABLES_ADDONS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/xterm/xterm.hash b/buildroot/package/xterm/xterm.hash index 7f2ff2c30..588b7fca5 100644 --- a/buildroot/package/xterm/xterm.hash +++ b/buildroot/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 7cdb106962910a99700b3c45fa1a1493e46e97a5aa3785093a786e07196fbf7b xterm-358.tgz +sha256 858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e xterm-366.tgz # Locally calculated -sha256 c655a5fa3dec936543e02f863b8c1343d08522a2821cb484df6c5f62afa7354d COPYING +sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING diff --git a/buildroot/package/xterm/xterm.mk b/buildroot/package/xterm/xterm.mk index 5e3e64fff..6f142a0b5 100644 --- a/buildroot/package/xterm/xterm.mk +++ b/buildroot/package/xterm/xterm.mk @@ -4,12 +4,13 @@ # ################################################################################ -XTERM_VERSION = 358 +XTERM_VERSION = 366 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf XTERM_LICENSE = MIT XTERM_LICENSE_FILES = COPYING +XTERM_CPE_ID_VENDOR = invisible-island XTERM_CONF_OPTS = --enable-256-color \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/buildroot/package/xutil_util-macros/xutil_util-macros.hash b/buildroot/package/xutil_util-macros/xutil_util-macros.hash index 49c057fd2..3f28743e6 100644 --- a/buildroot/package/xutil_util-macros/xutil_util-macros.hash +++ b/buildroot/package/xutil_util-macros/xutil_util-macros.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002845.html -md5 58edef899364f78fbde9479ded20211e util-macros-1.19.2.tar.bz2 -sha1 e8b3a6f2bfde22440fca0974da53da18821a4ee6 util-macros-1.19.2.tar.bz2 -sha256 d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712 util-macros-1.19.2.tar.bz2 -sha512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 util-macros-1.19.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html +sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 +sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 # Locally computed sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING diff --git a/buildroot/package/xutil_util-macros/xutil_util-macros.mk b/buildroot/package/xutil_util-macros/xutil_util-macros.mk index 6f66c7669..b0ce14ee5 100644 --- a/buildroot/package/xutil_util-macros/xutil_util-macros.mk +++ b/buildroot/package/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.2 +XUTIL_UTIL_MACROS_VERSION = 1.19.3 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT diff --git a/buildroot/package/xz/xz.mk b/buildroot/package/xz/xz.mk index 487dac461..ffbae4c87 100644 --- a/buildroot/package/xz/xz.mk +++ b/buildroot/package/xz/xz.mk @@ -11,6 +11,7 @@ XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XZ_CONF_OPTS = --enable-threads diff --git a/buildroot/package/yaml-cpp/yaml-cpp.mk b/buildroot/package/yaml-cpp/yaml-cpp.mk index beb8d6f55..d95380e62 100644 --- a/buildroot/package/yaml-cpp/yaml-cpp.mk +++ b/buildroot/package/yaml-cpp/yaml-cpp.mk @@ -9,6 +9,7 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE +YAML_CPP_CPE_ID_VALID = YES # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ diff --git a/buildroot/package/ytree/ytree.hash b/buildroot/package/ytree/ytree.hash index 1e620e30e..17d0d24c7 100644 --- a/buildroot/package/ytree/ytree.hash +++ b/buildroot/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e5bf41ab6bee59cf1e8fc0ca429e9a18e6aa83823f30f5807042b04c88a0e0ec ytree-2.02.tar.gz +sha256 583aa71552d1347e0eabe39a236fa5a174bf67dde98871853b9fe2a233bcaef1 ytree-2.03.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/buildroot/package/ytree/ytree.mk b/buildroot/package/ytree/ytree.mk index 48b3f7eff..fdecc0b19 100644 --- a/buildroot/package/ytree/ytree.mk +++ b/buildroot/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.02 +YTREE_VERSION = 2.03 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING diff --git a/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch b/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch deleted file mode 100644 index ea1166fd5..000000000 --- a/buildroot/package/zeromq/0001-src-compat.hpp-fix-build-with-libbsd-and-strlcpy.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 8cb5708829df9eacd58e1215ce7a1c135eb912b1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 2 Nov 2020 00:04:14 +0100 -Subject: [PATCH] src/compat.hpp: fix build with libbsd and strlcpy - -Don't include bsd/string.h if strlcpy is also defined in string.h to -avoid the following build failure on uclibc: - -In file included from src/compat.hpp:41:0, - from src/ipc_address.cpp:31: -/tmp/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/bsd/string.h:44:54: error: declaration of 'size_t strlcpy(char*, const char*, size_t)' has a different exception specifier - size_t strlcpy(char *dst, const char *src, size_t siz); - ^ -In file included from src/compat.hpp:34:0, - from src/ipc_address.cpp:31: -/tmp/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/string.h:424:15: error: from previous declaration 'size_t strlcpy(char*, const char*, size_t) throw ()' - extern size_t strlcpy(char *__restrict dst, const char *__restrict src, - ^ - -Fixes: - - http://autobuild.buildroot.org/results/51220b1b82774e8f6f6ed8593c58d2e3c31a1531 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/zeromq/libzmq/commit/b2a0842063aaa464ca2d182f9d3fefc6493906d0] ---- - CMakeLists.txt | 4 +--- - configure.ac | 26 ++++++++++++-------------- - src/compat.hpp | 4 +++- - 3 files changed, 16 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85747f626..74dd99ae0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -250,9 +250,7 @@ if(NOT MSVC) - set(ZMQ_HAVE_LIBBSD 1) - endif() - endif() -- if(NOT WITH_LIBBSD OR NOT LIBBSD_FOUND) -- check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY) -- endif() -+ check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY) - endif() - - # Select curve encryption library, defaults to tweetnacl To use libsodium instead, use --with-libsodium(must be -diff --git a/configure.ac b/configure.ac -index 58a78e75e..a7a1609af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -812,20 +812,18 @@ if test "x$enable_libbsd" != "xno"; then - fi - ]) - fi --if test "x$found_libbsd" != "xyes"; then -- AC_MSG_CHECKING([whether strlcpy is available]) -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include ]], -- [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]]) -- ],[ -- AC_MSG_RESULT([yes]) -- AC_DEFINE(ZMQ_HAVE_STRLCPY, [1], -- [strlcpy is available]) -- ],[ -- AC_MSG_RESULT([no]) -- ]) --fi -+AC_MSG_CHECKING([whether strlcpy is available]) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include ]], -+ [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]]) -+ ],[ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE(ZMQ_HAVE_STRLCPY, [1], -+ [strlcpy is available]) -+ ],[ -+ AC_MSG_RESULT([no]) -+]) - - # pthread_setname is non-posix, and there are at least 4 different implementations - AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument]) -diff --git a/src/compat.hpp b/src/compat.hpp -index 7c7a89275..47744b98e 100644 ---- a/src/compat.hpp -+++ b/src/compat.hpp -@@ -37,9 +37,10 @@ - #define strcasecmp _stricmp - #define strtok_r strtok_s - #else -+#ifndef ZMQ_HAVE_STRLCPY - #ifdef ZMQ_HAVE_LIBBSD - #include --#elif !defined(ZMQ_HAVE_STRLCPY) -+#else - static inline size_t - strlcpy (char *dest_, const char *src_, const size_t dest_size_) - { -@@ -50,6 +51,7 @@ strlcpy (char *dest_, const char *src_, const size_t dest_size_) - return dest_size_ - remain; - } - #endif -+#endif - template - static inline int strcpy_s (char (&dest_)[size], const char *const src_) - { diff --git a/buildroot/package/zeromq/Config.in b/buildroot/package/zeromq/Config.in index aeedff17b..cf5c644c3 100644 --- a/buildroot/package/zeromq/Config.in +++ b/buildroot/package/zeromq/Config.in @@ -59,4 +59,9 @@ config BR2_PACKAGE_ZEROMQ_DRAFTS https://pyzmq.readthedocs.io/en/latest/draft.html +config BR2_PACKAGE_ZEROMQ_WEBSOCKET + bool "WebSocket support" + help + Enable WebSocket transport + endif diff --git a/buildroot/package/zeromq/zeromq.hash b/buildroot/package/zeromq/zeromq.hash index 17ffff876..5085fbca3 100644 --- a/buildroot/package/zeromq/zeromq.hash +++ b/buildroot/package/zeromq/zeromq.hash @@ -1,7 +1,7 @@ # From https://github.com/zeromq/libzmq/releases -md5 78acc277d95e10812d71b2b3c3c3c9a9 zeromq-4.3.3.tar.gz -sha1 d78bc504194d6908df40a2b9e41849b181b02491 zeromq-4.3.3.tar.gz +md5 c897d4005a3f0b8276b00b7921412379 zeromq-4.3.4.tar.gz +sha1 47277a64749049123d1401600e8cfbab10a3ae28 zeromq-4.3.4.tar.gz # Locally computed -sha256 9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2 zeromq-4.3.3.tar.gz +sha256 c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 zeromq-4.3.4.tar.gz sha256 4fd86507c9b486764343065a9e035222869a27b5789efeb4fd93edc85412d7a3 COPYING sha256 83f32abe61ee58ffb1b007412c08415168c052501dbf56d7a47aaaac52b03ef6 COPYING.LESSER diff --git a/buildroot/package/zeromq/zeromq.mk b/buildroot/package/zeromq/zeromq.mk index 954964717..182699403 100644 --- a/buildroot/package/zeromq/zeromq.mk +++ b/buildroot/package/zeromq/zeromq.mk @@ -4,15 +4,15 @@ # ################################################################################ -ZEROMQ_VERSION = 4.3.3 +ZEROMQ_VERSION = 4.3.4 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# We're patching configure.ac -ZEROMQ_AUTORECONF = YES +ZEROMQ_CPE_ID_VENDOR = zeromq +ZEROMQ_CPE_ID_PRODUCT = libzmq # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27. @@ -55,6 +55,19 @@ else ZEROMQ_CONF_OPTS += --disable-drafts endif +ifeq ($(BR2_PACKAGE_ZEROMQ_WEBSOCKET),y) +ZEROMQ_CONF_OPTS += --enable-ws +else +ZEROMQ_CONF_OPTS += --disable-ws +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf gnutls +ZEROMQ_CONF_OPTS += --with-tls +else +ZEROMQ_CONF_OPTS += --without-tls +endif + ifeq ($(BR2_PACKAGE_LIBBSD),y) ZEROMQ_DEPENDENCIES += host-pkgconf libbsd ZEROMQ_CONF_OPTS += --enable-libbsd @@ -62,6 +75,13 @@ else ZEROMQ_CONF_OPTS += --disable-libbsd endif +ifeq ($(BR2_PACKAGE_LIBNSS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf libnss +ZEROMQ_CONF_OPTS += --with-nss +else +ZEROMQ_CONF_OPTS += --without-nss +endif + # ZeroMQ uses libsodium if it's available. ifeq ($(BR2_PACKAGE_LIBSODIUM),y) ZEROMQ_DEPENDENCIES += libsodium diff --git a/buildroot/package/zip/zip.mk b/buildroot/package/zip/zip.mk index c78efedc2..2d11e1c76 100644 --- a/buildroot/package/zip/zip.mk +++ b/buildroot/package/zip/zip.mk @@ -10,6 +10,7 @@ ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE +ZIP_CPE_ID_VENDOR = info-zip_project ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) diff --git a/buildroot/package/znc/znc.mk b/buildroot/package/znc/znc.mk index 799efa8dc..07fced840 100644 --- a/buildroot/package/znc/znc.mk +++ b/buildroot/package/znc/znc.mk @@ -8,14 +8,10 @@ ZNC_VERSION = 1.8.2 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE +ZNC_CPE_ID_VENDOR = znc ZNC_DEPENDENCIES = host-pkgconf ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF -# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to -# disable a try_run() call in the FindThreads tests, which caused a -# build failure when cross-compiling. -ZNC_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - ifeq ($(BR2_PACKAGE_ICU),y) ZNC_DEPENDENCIES += icu ZNC_CONF_OPTS += -DWANT_ICU=ON diff --git a/buildroot/package/zsh/zsh.mk b/buildroot/package/zsh/zsh.mk index c3d9e5215..1a0483321 100644 --- a/buildroot/package/zsh/zsh.mk +++ b/buildroot/package/zsh/zsh.mk @@ -12,6 +12,7 @@ ZSH_CONF_OPTS = --bindir=/bin ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE +ZSH_CPE_ID_VENDOR = zsh ifeq ($(BR2_PACKAGE_GDBM),y) ZSH_CONF_OPTS += --enable-gdbm diff --git a/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch b/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch deleted file mode 100644 index 0f735b884..000000000 --- a/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 26d01bdb26f1c7487ad4ba0151221dfe28cd878d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 Jul 2020 21:19:14 +0200 -Subject: [PATCH] programs/util.c: fix build without st_mtime - -Since version 1.4.5 and commit -5af8cb7aea8d890b4801e50e5274371510f2cf33, if st_mtime is not defined, -programs/util.c uses utime without including utime.h which will raise -the following build failure on some of the buildroot autobuilders: - -util.c: In function 'UTIL_setFileStat': -util.c:161:24: error: storage size of 'timebuf' isn't known - struct utimbuf timebuf; - ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be902c5d110f37bce622a2215191f155b7d3e7e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/facebook/zstd/pull/2246] ---- - programs/util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/programs/util.c b/programs/util.c -index a0d45745..2493a4ad 100644 ---- a/programs/util.c -+++ b/programs/util.c -@@ -28,7 +28,7 @@ extern "C" { - # include /* _chmod */ - #else - # include /* chown, stat */ --# if PLATFORM_POSIX_VERSION < 200809L -+# if PLATFORM_POSIX_VERSION < 200809L || !defined(st_mtime) - # include /* utime */ - # else - # include /* AT_FDCWD */ --- -2.27.0 - diff --git a/buildroot/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash index b764917c8..c370bf8c4 100644 --- a/buildroot/package/zstd/zstd.hash +++ b/buildroot/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz.sha256 -sha256 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e zstd-1.4.5.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.4.8/zstd-1.4.8.tar.gz.sha256 +sha256 32478297ca1500211008d596276f5367c54198495cf677e9439f4791a4c69f24 zstd-1.4.8.tar.gz -# License files (locally computed as well) +# License files (locally computed) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/buildroot/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk index 35002da33..dba76b090 100644 --- a/buildroot/package/zstd/zstd.mk +++ b/buildroot/package/zstd/zstd.mk @@ -4,11 +4,13 @@ # ################################################################################ -ZSTD_VERSION = 1.4.5 +ZSTD_VERSION = 1.4.8 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING +ZSTD_CPE_ID_VENDOR = facebook +ZSTD_CPE_ID_PRODUCT = zstandard ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ZSTD_OPTS += HAVE_THREAD=1 @@ -48,6 +50,14 @@ ZSTD_BUILD_LIBS = libzstd.a libzstd ZSTD_INSTALL_LIBS = install-static install-shared endif +# The HAVE_THREAD flag is read by the 'programs' makefile but not by the 'lib' +# one. Building a multi-threaded binary with a library (which defaults to +# single-threaded) gives a runtime error when compressing files. +# The 'lib' makefile provides specific '%-mt' targets for this purpose. +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ZSTD_BUILD_LIBS := $(addsuffix -mt,$(ZSTD_BUILD_LIBS)) +endif + define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ -C $(@D)/lib $(ZSTD_BUILD_LIBS) @@ -68,18 +78,20 @@ define ZSTD_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib $(ZSTD_INSTALL_LIBS) endef -# note: no 'HAVE_...' options for host library build only +# note: only limited 'HAVE_...' options for host library build only +HOST_ZSTD_OPTS = HAVE_THREAD=1 + define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/lib libzstd.a libzstd - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + -C $(@D)/lib libzstd.a-mt libzstd-mt + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) zstd endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/programs install endef diff --git a/buildroot/package/zziplib/zziplib.hash b/buildroot/package/zziplib/zziplib.hash index b667b9537..b6a75ae0c 100644 --- a/buildroot/package/zziplib/zziplib.hash +++ b/buildroot/package/zziplib/zziplib.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 2ee1e0fbbb78ec7cc46bde5b62857bc51f8d665dd265577cf93584344b8b9de2 zziplib-0.13.71.tar.gz +sha256 93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc zziplib-0.13.72.tar.gz sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm diff --git a/buildroot/package/zziplib/zziplib.mk b/buildroot/package/zziplib/zziplib.mk index aab091ac6..6cb9dedce 100644 --- a/buildroot/package/zziplib/zziplib.mk +++ b/buildroot/package/zziplib/zziplib.mk @@ -4,14 +4,27 @@ # ################################################################################ -ZZIPLIB_VERSION = 0.13.71 +ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm +ZZIPLIB_CPE_ID_VALID = YES ZZIPLIB_INSTALL_STAGING = YES +ZZIPLIB_CONF_OPTS += \ + -DZZIPDOCS=OFF \ + -DZZIPTEST=OFF +ZZIPLIB_DEPENDENCIES = host-pkgconf zlib -ZZIPLIB_DEPENDENCIES = host-pkgconf host-python3 zlib +define ZZIPLIB_POST_EXTRACT_FIXUP + rm $(@D)/GNUmakefile +endef +ZZIPLIB_POST_EXTRACT_HOOKS += ZZIPLIB_POST_EXTRACT_FIXUP -ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 +ifeq ($(BR2_PACKAGE_SDL2),y) +ZZIPLIB_CONF_OPTS += -DZZIPSDL=ON +ZZIPLIB_DEPENDENCIES += sdl2 +else +ZZIPLIB_CONF_OPTS += -DZZIPSDL=OFF +endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/support/config-fragments/autobuild/bootlin-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-aarch64-glibc.config new file mode 100644 index 000000000..fe167e23a --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-aarch64-glibc.config @@ -0,0 +1,4 @@ +BR2_aarch64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config new file mode 100644 index 000000000..c9e1d19e4 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config @@ -0,0 +1,5 @@ +BR2_arcle=y +BR2_archs38=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-armv5-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-armv5-uclibc.config new file mode 100644 index 000000000..c179c75d7 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-armv5-uclibc.config @@ -0,0 +1,4 @@ +BR2_arm=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-armv7-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-armv7-glibc.config new file mode 100644 index 000000000..11ae28ff6 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-armv7-glibc.config @@ -0,0 +1,6 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_VFP=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-armv7-musl.config b/buildroot/support/config-fragments/autobuild/bootlin-armv7-musl.config new file mode 100644 index 000000000..7ae72b21c --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-armv7-musl.config @@ -0,0 +1,6 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_VFP=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config new file mode 100644 index 000000000..8d0540964 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config @@ -0,0 +1,4 @@ +BR2_arm=y +BR2_cortex_m4=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config new file mode 100644 index 000000000..c6000beb0 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config @@ -0,0 +1,4 @@ +BR2_m68k=y +BR2_m68k_cf5208=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config new file mode 100644 index 000000000..f2c59e9de --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config @@ -0,0 +1,4 @@ +BR2_m68k=y +BR2_m68k_68040=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config new file mode 100644 index 000000000..206fb777f --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config @@ -0,0 +1,3 @@ +BR2_microblazeel=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-mipsel-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-mipsel-uclibc.config new file mode 100644 index 000000000..ff523b258 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-mipsel-uclibc.config @@ -0,0 +1,4 @@ +BR2_mipsel=y +# BR2_MIPS_SOFT_FLOAT is not set +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config new file mode 100644 index 000000000..58a50121a --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config @@ -0,0 +1,6 @@ +BR2_mipsel=y +BR2_mips_32r6=y +# BR2_MIPS_SOFT_FLOAT is not set +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-nios2-glibc.config new file mode 100644 index 000000000..575a1b30e --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-nios2-glibc.config @@ -0,0 +1,4 @@ +BR2_nios2=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-openrisc-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-openrisc-uclibc.config new file mode 100644 index 000000000..bad086274 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-openrisc-uclibc.config @@ -0,0 +1,3 @@ +BR2_or1k=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config new file mode 100644 index 000000000..96461856f --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config @@ -0,0 +1,4 @@ +BR2_powerpc=y +BR2_powerpc_e500mc=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config new file mode 100644 index 000000000..44f00963c --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config @@ -0,0 +1,4 @@ +BR2_powerpc64le=y +BR2_powerpc_power8=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-riscv32-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-riscv32-glibc.config new file mode 100644 index 000000000..cc45d0182 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-riscv32-glibc.config @@ -0,0 +1,5 @@ +BR2_riscv=y +BR2_RISCV_32=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-riscv64-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-riscv64-glibc.config new file mode 100644 index 000000000..f6c6fcaa3 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-riscv64-glibc.config @@ -0,0 +1,5 @@ +BR2_riscv=y +BR2_RISCV_ABI_LP64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-riscv64-musl.config b/buildroot/support/config-fragments/autobuild/bootlin-riscv64-musl.config new file mode 100644 index 000000000..2b6a6e56d --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-riscv64-musl.config @@ -0,0 +1,4 @@ +BR2_riscv=y +BR2_RISCV_ABI_LP64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-sh4-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-sh4-uclibc.config new file mode 100644 index 000000000..8b4d40b5c --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-sh4-uclibc.config @@ -0,0 +1,3 @@ +BR2_sh=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-sparc-uclibc.config new file mode 100644 index 000000000..cbe722402 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-sparc-uclibc.config @@ -0,0 +1,3 @@ +BR2_sparc=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/bootlin-sparc64-glibc.config new file mode 100644 index 000000000..4f851d105 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-sparc64-glibc.config @@ -0,0 +1,3 @@ +BR2_sparc64=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-musl.config new file mode 100644 index 000000000..9763d8a6a --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-musl.config @@ -0,0 +1,4 @@ +BR2_x86_64=y +BR2_x86_corei7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-x86-64-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-uclibc.config new file mode 100644 index 000000000..70b940f19 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-x86-64-uclibc.config @@ -0,0 +1,4 @@ +BR2_x86_64=y +BR2_x86_corei7=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config new file mode 100644 index 000000000..797528745 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config @@ -0,0 +1,3 @@ +BR2_xtensa=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE=y diff --git a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config deleted file mode 100644 index f1b0f2a91..000000000 --- a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_aarch64=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config deleted file mode 100644 index f8287ccd0..000000000 --- a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_arcle=y -BR2_archs38=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-basic.config b/buildroot/support/config-fragments/autobuild/br-arm-basic.config index c73aa782c..fbbeaaa77 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-basic.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config deleted file mode 100644 index a3b51138d..000000000 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_VFP=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config deleted file mode 100644 index e6a5fa64f..000000000 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_VFP=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config deleted file mode 100644 index 22e9740e4..000000000 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config +++ /dev/null @@ -1,12 +0,0 @@ -BR2_arm=y -BR2_cortex_m4=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config index 3b0267f6d..71592d688 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,9 +3,9 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config index 59e90f337..f3a4d91fd 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,8 +3,8 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full.config b/buildroot/support/config-fragments/autobuild/br-arm-full.config deleted file mode 100644 index 652c5a68e..000000000 --- a/buildroot/support/config-fragments/autobuild/br-arm-full.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_arm=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index 2f651dedf..1b3c45fe9 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,8 +2,8 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config index acc7c0942..c68069928 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,8 +2,8 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config deleted file mode 100644 index cee8a0426..000000000 --- a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_m68k=y -BR2_m68k_cf5208=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config deleted file mode 100644 index 9f600acf4..000000000 --- a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_m68k=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config deleted file mode 100644 index 60c23a202..000000000 --- a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_microblazeel=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config deleted file mode 100644 index ce61100a3..000000000 --- a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_mipsel=y -BR2_mips_32r6=y -# BR2_MIPS_SOFT_FLOAT is not set -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config index 99ace7776..b89b74e76 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,8 +3,8 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index 48ed24dac..edf04c356 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,8 +5,8 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config deleted file mode 100644 index 6099e4886..000000000 --- a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_mipsel=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config deleted file mode 100644 index c5ac68dc5..000000000 --- a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_nios2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config deleted file mode 100644 index c5391338c..000000000 --- a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_or1k=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2020.02-500-geee96b0.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index f08346265..045428c1d 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,8 +3,8 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config deleted file mode 100644 index c5edcc177..000000000 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_powerpc=y -BR2_powerpc_e500mc=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index 5d7171a06..a80047ea6 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2020.11.2.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config deleted file mode 100644 index b743bbc4a..000000000 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_powerpc64le=y -BR2_powerpc_power8=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv32.config b/buildroot/support/config-fragments/autobuild/br-riscv32.config deleted file mode 100644 index d9110a6a8..000000000 --- a/buildroot/support/config-fragments/autobuild/br-riscv32.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_riscv=y -BR2_RISCV_32=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config b/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config deleted file mode 100644 index fd6ef822a..000000000 --- a/buildroot/support/config-fragments/autobuild/br-riscv64-musl.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_riscv=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-musl-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64.config b/buildroot/support/config-fragments/autobuild/br-riscv64.config deleted file mode 100644 index c5df86392..000000000 --- a/buildroot/support/config-fragments/autobuild/br-riscv64.config +++ /dev/null @@ -1,8 +0,0 @@ -BR2_riscv=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sh4-full.config b/buildroot/support/config-fragments/autobuild/br-sh4-full.config deleted file mode 100644 index dc3190287..000000000 --- a/buildroot/support/config-fragments/autobuild/br-sh4-full.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_sh=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config deleted file mode 100644 index 8550a0126..000000000 --- a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_sparc=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config deleted file mode 100644 index 0b77bb45f..000000000 --- a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config +++ /dev/null @@ -1,8 +0,0 @@ -BR2_sparc64=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config deleted file mode 100644 index b6682da20..000000000 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config +++ /dev/null @@ -1,11 +0,0 @@ -BR2_x86_64=y -BR2_x86_core2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config deleted file mode 100644 index 03de24d35..000000000 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_x86_64=y -BR2_x86_atom=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config deleted file mode 100644 index 9d0092143..000000000 --- a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config +++ /dev/null @@ -1,9 +0,0 @@ -BR2_xtensa=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2020.02.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y -BR2_TOOLCHAIN_EXTERNAL_LOCALE=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv index f84f27ddc..f5e9bd8cf 100644 --- a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv +++ b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv @@ -4,16 +4,16 @@ # Toolchains used by default by test-pkg: # Test a regular uClibc toolchain -support/config-fragments/autobuild/br-arm-full.config,x86_64 +support/config-fragments/autobuild/bootlin-armv5-uclibc.config,x86_64 # Test a toolchain with glibc and a very recent gcc version -support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7-glibc.config,x86_64 # Test a noMMU toolchain with no dynamic library support -support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7m-uclibc.config,x86_64 # Test a musl toolchain -support/config-fragments/autobuild/br-x86-64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-musl.config,x86_64 # Test a MMU toolchain without dynamic library support support/config-fragments/autobuild/br-arm-full-static.config,x86_64 @@ -24,44 +24,44 @@ support/config-fragments/autobuild/sourcery-arm.config,x86 # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/andes-nds32.config,x86 support/config-fragments/autobuild/arm-aarch64.config,x86_64 +support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-armv7-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-m68k-68040-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-m68k-5208-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-microblazeel-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-mipsel-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-mipsel32r6-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-nios2-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-openrisc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-powerpc64le-power8-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-x86-64-glibc.config,x86_64 -support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-64-uclibc.config,x86_64 +support/config-fragments/autobuild/bootlin-xtensa-uclibc.config,x86_64 support/config-fragments/autobuild/br-arc-full-internal.config,any support/config-fragments/autobuild/br-arc-internal-glibc.config,any -support/config-fragments/autobuild/br-arcle-hs38.config,x86_64 support/config-fragments/autobuild/br-arm-basic.config,x86_64 -support/config-fragments/autobuild/br-arm-cortex-a9-musl.config,x86_64 support/config-fragments/autobuild/br-arm-full-nothread.config,x86_64 support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 -support/config-fragments/autobuild/br-m68k-5208-full.config,x86_64 -support/config-fragments/autobuild/br-m68k-68040-full.config,x86_64 -support/config-fragments/autobuild/br-microblazeel-full.config,x86_64 support/config-fragments/autobuild/br-microblazeel-full-internal.config,any support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64 -support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config,x86_64 support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64 -support/config-fragments/autobuild/br-mipsel-o32-full.config,x86_64 -support/config-fragments/autobuild/br-nios2-glibc.config,x86_64 -support/config-fragments/autobuild/br-openrisc-uclibc.config,x86_64 support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config,x86_64 -support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config,x86_64 support/config-fragments/autobuild/br-powerpc64-power7-glibc.config,x86_64 -support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64 support/config-fragments/autobuild/br-powerpc-internal-full.config,any -support/config-fragments/autobuild/br-riscv32.config,x86_64 -support/config-fragments/autobuild/br-riscv64.config,x86_64 support/config-fragments/autobuild/br-riscv64-full-internal.config,any -support/config-fragments/autobuild/br-riscv64-musl.config,x86_64 support/config-fragments/autobuild/br-s390x-z13-internal-glibc.config,any -support/config-fragments/autobuild/br-sh4-full.config,x86_64 -support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64 -support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64 -support/config-fragments/autobuild/br-x86-64-core2-full.config,x86_64 -support/config-fragments/autobuild/br-xtensa-full.config,x86_64 support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/linaro-aarch64.config,x86 support/config-fragments/autobuild/linaro-aarch64-be.config,x86 diff --git a/buildroot/support/dependencies/check-host-cmake.mk b/buildroot/support/dependencies/check-host-cmake.mk index 33281f0bc..e1bbcd62c 100644 --- a/buildroot/support/dependencies/check-host-cmake.mk +++ b/buildroot/support/dependencies/check-host-cmake.mk @@ -1,14 +1,9 @@ -# Set this to either 3.10 or higher, depending on the highest minimum +# Set this to either 3.15 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -ifeq ($(BR2_PACKAGE_GERBERA),y) -# gerbera needs 3.14+ -BR2_CMAKE_VERSION_MIN = 3.14 -else -BR2_CMAKE_VERSION_MIN = 3.10 -endif +BR2_CMAKE_VERSION_MIN = 3.15 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ diff --git a/buildroot/support/dependencies/check-host-tar.sh b/buildroot/support/dependencies/check-host-tar.sh index 934cb6129..b7d607a47 100755 --- a/buildroot/support/dependencies/check-host-tar.sh +++ b/buildroot/support/dependencies/check-host-tar.sh @@ -33,14 +33,7 @@ fi major_min=1 minor_min=27 -# Maximal version = 1.29 (1.30 changed --numeric-owner output for -# filenames > 100 characters). This is really a fix for a bug in -# earlier tar versions regarding deterministic output so it is -# unlikely to be reverted in later versions. -major_max=1 -minor_max=29 - -if [ $major -lt $major_min -o $major -gt $major_max ]; then +if [ $major -lt $major_min ]; then # echo nothing: no suitable tar found exit 1 fi @@ -50,10 +43,5 @@ if [ $major -eq $major_min -a $minor -lt $minor_min ]; then exit 1 fi -if [ $major -eq $major_max -a $minor -gt $minor_max ]; then - # echo nothing: no suitable tar found - exit 1 -fi - # valid echo $tar diff --git a/buildroot/support/download/git b/buildroot/support/download/git index 15d8c66e0..fa98198fe 100755 --- a/buildroot/support/download/git +++ b/buildroot/support/download/git @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# NOTE: if the output of this backend has to change (e.g. we change what gets +# included in the archive (e.g. LFS), or we change the format of the archive +# (e.g. tar options, compression ratio or method)), we MUST update the format +# version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. + # We want to catch any unexpected failure, and exit immediately set -E @@ -16,6 +21,8 @@ set -E # Environment: # GIT : the git command to call +. "${0%/*}/helpers" + # Save our path and options in case we need to call ourselves again myname="${0}" declare -a OPTS=("${@}") @@ -170,8 +177,8 @@ _git checkout -f -q "'${cset}'" _git clean -ffdx # Get date of commit to generate a reproducible archive. -# %cD is RFC2822, so it's fully qualified, with TZ and all. -date="$( _git log -1 --pretty=format:%cD )" +# %ci is ISO 8601, so it's fully qualified, with TZ and all. +date="$( _git log -1 --pretty=format:%ci )" # There might be submodules, so fetch them. if [ ${recurse} -eq 1 ]; then @@ -191,24 +198,12 @@ if [ ${recurse} -eq 1 ]; then done fi -# Generate the archive, sort with the C locale so that it is reproducible. +popd >/dev/null + +# Generate the archive. # We do not want the .git dir; we keep other .git files, in case they are the # only files in their directory. # The .git dir would generate non reproducible tarballs as it depends on # the state of the remote server. It also would generate large tarballs # (gigabytes for some linux trees) when a full clone took place. -find . -not -type d \ - -and -not -path "./.git/*" >"${output}.list" -LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" - -# Create GNU-format tarballs, since that's the format of the tarballs on -# sources.buildroot.org and used in the *.hash files -tar cf - --transform="s#^\./#${basename}/#" \ - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ - -T "${output}.list.sorted" >"${output}.tar" -gzip -6 -n <"${output}.tar" >"${output}" - -rm -f "${output}.list" -rm -f "${output}.list.sorted" - -popd >/dev/null +mk_tar_gz "${git_cache}" "${basename}" "${date}" "${output}" ".git/*" diff --git a/buildroot/support/download/helpers b/buildroot/support/download/helpers new file mode 100755 index 000000000..57cc9fef4 --- /dev/null +++ b/buildroot/support/download/helpers @@ -0,0 +1,76 @@ +# Generate a reproducible archive from the content of a directory +# +# $1 : input directory +# $2 : leading component in archive +# $3 : ISO8601 date: YYYY-MM-DDThh:mm:ssZZ +# $4 : output file +# $5... : globs of filenames to exclude from the archive, suitable for +# find's -path option, and relative to the input directory $1 +# +# Notes : +# - the timestamp is internally rounded to the highest entire second +# less than or equal to the timestamp (i.e. any sub-second fractional +# part is ignored) +# - must not be called with CWD as, or below, the input directory +# - some temporary files are created in CWD, and removed at the end +# +# Example: +# $ find /path/to/temp/dir +# /path/to/temp/dir/ +# /path/to/temp/dir/some-file +# /path/to/temp/dir/some-dir/ +# /path/to/temp/dir/some-dir/some-other-file +# +# $ mk_tar_gz /path/to/some/dir \ +# foo_bar-1.2.3 \ +# 1970-01-01T00:00:00Z \ +# /path/to/foo.tar.gz \ +# '.git/*' '.svn/*' +# +# $ tar tzf /path/to/foo.tar.gz +# foo_bar-1.2.3/some-file +# foo_bar-1.2.3/some-dir/some-other-file +# +mk_tar_gz() { + local in_dir="${1}" + local base_dir="${2}" + local date="${3}" + local out="${4}" + shift 4 + local glob tmp pax_options + local -a find_opts + + for glob; do + find_opts+=( -or -path "./${glob#./}" ) + done + + # Drop sub-second precision to play nice with GNU tar's valid_timespec check + date="$(date -d "${date}" -u +%Y-%m-%dT%H:%M:%S+00:00)" + + pax_options="delete=atime,delete=ctime,delete=mtime" + pax_options+=",exthdr.name=%d/PaxHeaders/%f,exthdr.mtime={${date}}" + + tmp="$(mktemp --tmpdir="$(pwd)")" + pushd "${in_dir}" >/dev/null + + # Establish list + find . -not -type d -and -not \( -false "${find_opts[@]}" \) >"${tmp}.list" + # Sort list for reproducibility + LC_ALL=C sort <"${tmp}.list" >"${tmp}.sorted" + + # Create POSIX tarballs, since that's the format the most reproducible + tar cf - --transform="s#^\./#${base_dir}/#" \ + --numeric-owner --owner=0 --group=0 --mtime="${date}" \ + --format=posix --pax-option="${pax_options}" \ + -T "${tmp}.sorted" >"${tmp}.tar" + + # Compress the archive + gzip -6 -n <"${tmp}.tar" >"${out}" + + rm -f "${tmp}"{.list,.sorted,.tar} + + popd >/dev/null +} + +# Keep this line and the following as last lines in this file. +# vim: ft=bash diff --git a/buildroot/support/download/svn b/buildroot/support/download/svn index 012f286dd..839dccaf6 100755 --- a/buildroot/support/download/svn +++ b/buildroot/support/download/svn @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# NOTE: if the output of this backend has to change (e.g. we change what gets +# included in the archive, or we change the format of the archive (e.g. tar +# options, compression ratio or method)), we MUST update the format version +# in the variable BR_FTM_VERSION_svn, in package/pkg-download.mk. + # We want to catch any unexpected failure, and exit immediately set -e @@ -15,6 +20,8 @@ set -e # Environment: # SVN : the svn command to call +. "${0%/*}/helpers" + verbose= while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do case "${OPT}" in @@ -45,19 +52,7 @@ _svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" # last line (svn outputs everything on stdout) date="$( _svn info --show-item last-changed-date "'${uri}@${rev}'" |tail -n 1 )" -# Generate the archive, sort with the C locale so that it is reproducible. -# We do not want the .svn dir; we keep other .svn files, in case they are the -# only files in their directory. -find "${basename}" -not -type d \ - -and -not -path "./.svn/*" >"${output}.list" -LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" - -# Create GNU-format tarballs, since that's the format of the tarballs on -# sources.buildroot.org and used in the *.hash files -tar cf - --transform="s#^\./#${basename}/#" \ - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ - -T "${output}.list.sorted" >"${output}.tar" -gzip -6 -n <"${output}.tar" >"${output}" - -rm -f "${output}.list" -rm -f "${output}.list.sorted" +# Generate the archive. +# We did a 'svn export' above, so it's not a working copy (there is no .svn +# directory or file to ignore). +mk_tar_gz "${basename}" "${basename}" "${date}" "${output}" diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index ed12abd2f..28a74b992 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2020.11.2' +RELEASE='2020.11.3' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/scripts/boot-qemu-image.py b/buildroot/support/scripts/boot-qemu-image.py index dbbba552a..0d4ad825f 100755 --- a/buildroot/support/scripts/boot-qemu-image.py +++ b/buildroot/support/scripts/boot-qemu-image.py @@ -18,6 +18,10 @@ def main(): if not sys.argv[1].startswith('qemu_'): sys.exit(0) + if not os.path.exists('output/images/start-qemu.sh'): + print('qemu-start.sh is missing, cannot test.') + sys.exit(0) + qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') child = pexpect.spawn(qemu_start, ['serial-only'], @@ -32,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:", pexpect.TIMEOUT], timeout=60) + child.expect(["buildroot login:"], timeout=60) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -54,7 +58,7 @@ def main(): child.sendline("root\r") try: - child.expect(["# ", pexpect.TIMEOUT], timeout=60) + child.expect(["# "], timeout=60) except pexpect.EOF: print("Cannot connect to shell") sys.exit(1) @@ -65,7 +69,7 @@ def main(): child.sendline("poweroff\r") try: - child.expect(["System halted", pexpect.TIMEOUT], timeout=60) + child.expect(["System halted"], timeout=60) child.expect(pexpect.EOF) except pexpect.EOF: pass diff --git a/buildroot/support/scripts/cpedb.py b/buildroot/support/scripts/cpedb.py new file mode 100644 index 000000000..f4daf5612 --- /dev/null +++ b/buildroot/support/scripts/cpedb.py @@ -0,0 +1,174 @@ +#!/usr/bin/env python3 + +import xml.etree.ElementTree as ET +from xml.etree.ElementTree import Element, SubElement +import gzip +import os +import requests +import time +from xml.dom import minidom + +VALID_REFS = ['VENDOR', 'VERSION', 'CHANGE_LOG', 'PRODUCT', 'PROJECT', 'ADVISORY'] + +CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" + +ns = { + '': 'http://cpe.mitre.org/dictionary/2.0', + 'cpe-23': 'http://scap.nist.gov/schema/cpe-extension/2.3', + 'xml': 'http://www.w3.org/XML/1998/namespace' +} + + +class CPE: + def __init__(self, cpe_str, titles, refs): + self.cpe_str = cpe_str + self.titles = titles + self.references = refs + self.cpe_cur_ver = "".join(self.cpe_str.split(":")[5:6]) + + def update_xml_dict(self): + ET.register_namespace('', 'http://cpe.mitre.org/dictionary/2.0') + cpes = Element('cpe-list') + cpes.set('xmlns:cpe-23', "http://scap.nist.gov/schema/cpe-extension/2.3") + cpes.set('xmlns:ns6', "http://scap.nist.gov/schema/scap-core/0.1") + cpes.set('xmlns:scap-core', "http://scap.nist.gov/schema/scap-core/0.3") + cpes.set('xmlns:config', "http://scap.nist.gov/schema/configuration/0.1") + cpes.set('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance") + cpes.set('xmlns:meta', "http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2") + cpes.set('xsi:schemaLocation', " ".join(["http://scap.nist.gov/schema/cpe-extension/2.3", + "https://scap.nist.gov/schema/cpe/2.3/cpe-dictionary-extension_2.3.xsd", + "http://cpe.mitre.org/dictionary/2.0", + "https://scap.nist.gov/schema/cpe/2.3/cpe-dictionary_2.3.xsd", + "http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2", + "https://scap.nist.gov/schema/cpe/2.1/cpe-dictionary-metadata_0.2.xsd", + "http://scap.nist.gov/schema/scap-core/0.3", + "https://scap.nist.gov/schema/nvd/scap-core_0.3.xsd", + "http://scap.nist.gov/schema/configuration/0.1", + "https://scap.nist.gov/schema/nvd/configuration_0.1.xsd", + "http://scap.nist.gov/schema/scap-core/0.1", + "https://scap.nist.gov/schema/nvd/scap-core_0.1.xsd"])) + item = SubElement(cpes, 'cpe-item') + cpe_short_name = CPE.short_name(self.cpe_str) + cpe_new_ver = CPE.version_update(self.cpe_str) + + item.set('name', 'cpe:/' + cpe_short_name) + self.titles[0].text.replace(self.cpe_cur_ver, cpe_new_ver) + for title in self.titles: + item.append(title) + if self.references: + item.append(self.references) + cpe23item = SubElement(item, 'cpe-23:cpe23-item') + cpe23item.set('name', self.cpe_str) + + # Generate the XML as a string + xmlstr = ET.tostring(cpes) + + # And use minidom to pretty print the XML + return minidom.parseString(xmlstr).toprettyxml(encoding="utf-8").decode("utf-8") + + @staticmethod + def version(cpe): + return cpe.split(":")[5] + + @staticmethod + def product(cpe): + return cpe.split(":")[4] + + @staticmethod + def short_name(cpe): + return ":".join(cpe.split(":")[2:6]) + + @staticmethod + def version_update(cpe): + return ":".join(cpe.split(":")[5:6]) + + @staticmethod + def no_version(cpe): + return ":".join(cpe.split(":")[:5]) + + +class CPEDB: + def __init__(self, nvd_path): + self.all_cpes = dict() + self.all_cpes_no_version = dict() + self.nvd_path = nvd_path + + def get_xml_dict(self): + print("CPE: Setting up NIST dictionary") + if not os.path.exists(os.path.join(self.nvd_path, "cpe")): + os.makedirs(os.path.join(self.nvd_path, "cpe")) + + cpe_dict_local = os.path.join(self.nvd_path, "cpe", os.path.basename(CPEDB_URL)) + if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: + print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") + cpe_dict = requests.get(CPEDB_URL) + open(cpe_dict_local, "wb").write(cpe_dict.content) + + print("CPE: Unzipping xml manifest...") + nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) + print("CPE: Converting xml manifest to dict...") + tree = ET.parse(nist_cpe_file) + all_cpedb = tree.getroot() + self.parse_dict(all_cpedb) + + def parse_dict(self, all_cpedb): + # Cycle through the dict and build two dict to be used for custom + # lookups of partial and complete CPE objects + # The objects are then used to create new proposed XML updates if + # if is determined one is required + # Out of the different language titles, select English + for cpe in all_cpedb.findall(".//{http://cpe.mitre.org/dictionary/2.0}cpe-item"): + cpe_titles = [] + for title in cpe.findall('.//{http://cpe.mitre.org/dictionary/2.0}title[@xml:lang="en-US"]', ns): + title.tail = None + cpe_titles.append(title) + + # Some older CPE don't include references, if they do, make + # sure we handle the case of one ref needing to be packed + # in a list + cpe_ref = cpe.find(".//{http://cpe.mitre.org/dictionary/2.0}references") + if cpe_ref: + for ref in cpe_ref.findall(".//{http://cpe.mitre.org/dictionary/2.0}reference"): + ref.tail = None + ref.text = ref.text.upper() + if ref.text not in VALID_REFS: + ref.text = ref.text + "-- UPDATE this entry, here are some examples and just one word should be used -- " + ' '.join(VALID_REFS) # noqa E501 + cpe_ref.tail = None + cpe_ref.text = None + + cpe_str = cpe.find(".//{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item").get('name') + item = CPE(cpe_str, cpe_titles, cpe_ref) + cpe_str_no_version = CPE.no_version(cpe_str) + # This dict must have a unique key for every CPE version + # which allows matching to the specific obj data of that + # NIST dict entry + self.all_cpes.update({cpe_str: item}) + # This dict has one entry for every CPE (w/o version) to allow + # partial match (no valid version) check (the obj is saved and + # used as seed for suggested xml updates. By updating the same + # non-version'd entry, it assumes the last update here is the + # latest version in the NIST dict) + self.all_cpes_no_version.update({cpe_str_no_version: item}) + + def find_partial(self, cpe_str): + cpe_str_no_version = CPE.no_version(cpe_str) + if cpe_str_no_version in self.all_cpes_no_version: + return cpe_str_no_version + + def find_partial_obj(self, cpe_str): + cpe_str_no_version = CPE.no_version(cpe_str) + if cpe_str_no_version in self.all_cpes_no_version: + return self.all_cpes_no_version[cpe_str_no_version] + + def find_partial_latest_version(self, cpe_str_partial): + cpe_obj = self.find_partial_obj(cpe_str_partial) + return cpe_obj.cpe_cur_ver + + def find(self, cpe_str): + if self.find_partial(cpe_str): + if cpe_str in self.all_cpes: + return cpe_str + + def gen_update_xml(self, cpe_str): + cpe = self.find_partial_obj(cpe_str) + return cpe.update_xml_dict() diff --git a/buildroot/support/scripts/cve.py b/buildroot/support/scripts/cve.py index 6396019e0..6e97ea193 100755 --- a/buildroot/support/scripts/cve.py +++ b/buildroot/support/scripts/cve.py @@ -47,6 +47,24 @@ ops = { } +# Check if two CPE IDs match each other +def cpe_matches(cpe1, cpe2): + cpe1_elems = cpe1.split(":") + cpe2_elems = cpe2.split(":") + + remains = filter(lambda x: x[0] not in ["*", "-"] and x[1] not in ["*", "-"] and x[0] != x[1], + zip(cpe1_elems, cpe2_elems)) + return len(list(remains)) == 0 + + +def cpe_product(cpe): + return cpe.split(':')[4] + + +def cpe_version(cpe): + return cpe.split(':')[5] + + class CVE: """An accessor class for CVE Items in NVD files""" CVE_AFFECTS = 1 @@ -134,7 +152,11 @@ class CVE: for cpe in node.get('cpe_match', ()): if not cpe['vulnerable']: return - vendor, product, version = cpe['cpe23Uri'].split(':')[3:6] + product = cpe_product(cpe['cpe23Uri']) + version = cpe_version(cpe['cpe23Uri']) + # ignore when product is '-', which means N/A + if product == '-': + return op_start = '' op_end = '' v_start = '' @@ -144,10 +166,6 @@ class CVE: # Version is defined, this is a '=' match op_start = '=' v_start = version - elif version == '-': - # no version information is available - op_start = '=' - v_start = version else: # Parse start version, end version and operators if 'versionStartIncluding' in cpe: @@ -167,8 +185,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'vendor': vendor, - 'product': product, + 'id': cpe['cpe23Uri'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -186,11 +203,11 @@ class CVE: return self.nvd_cve['cve']['CVE_data_meta']['ID'] @property - def pkg_names(self): - """The set of package names referred by this CVE definition""" - return set(p['product'] for p in self.each_cpe()) + def affected_products(self): + """The set of CPE products referred by this CVE definition""" + return set(cpe_product(p['id']) for p in self.each_cpe()) - def affects(self, name, version, cve_ignore_list): + def affects(self, name, version, cve_ignore_list, cpeid=None): """ True if the Buildroot Package object passed as argument is affected by this CVE. @@ -203,14 +220,15 @@ class CVE: print("Cannot parse package '%s' version '%s'" % (name, version)) pkg_version = None + # if we don't have a cpeid, build one based on name and version + if not cpeid: + cpeid = "cpe:2.3:*:*:%s:%s:*:*:*:*:*:*:*" % (name, version) + for cpe in self.each_cpe(): - if cpe['product'] != name: + if not cpe_matches(cpe['id'], cpeid): continue - if cpe['v_start'] == '-': - return self.CVE_AFFECTS if not cpe['v_start'] and not cpe['v_end']: - print("No CVE affected version") - continue + return self.CVE_AFFECTS if not pkg_version: continue diff --git a/buildroot/support/scripts/gen-bootlin-toolchains b/buildroot/support/scripts/gen-bootlin-toolchains index fce75c51c..fc9d57f5a 100755 --- a/buildroot/support/scripts/gen-bootlin-toolchains +++ b/buildroot/support/scripts/gen-bootlin-toolchains @@ -263,8 +263,6 @@ class Toolchain: # glibc doesn't support static only configuration depends.append("!BR2_STATIC_LIBS") selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC") - # all glibc toolchains have RPC support - selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC") elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL"): # musl needs mmu support depends.append("BR2_USE_MMU") diff --git a/buildroot/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats index f6460cf6f..6f3ddc561 100755 --- a/buildroot/support/scripts/pkg-stats +++ b/buildroot/support/scripts/pkg-stats @@ -32,7 +32,7 @@ brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) sys.path.append(os.path.join(brpath, "utils")) from getdeveloperlib import parse_developers # noqa: E402 - +from cpedb import CPEDB # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") @@ -77,6 +77,7 @@ class Package: all_license_files = list() all_versions = dict() all_ignored_cves = dict() + all_cpeids = dict() # This is the list of all possible checks. Add new checks to this list so # a tool that post-processeds the json output knows the checks before # iterating over the packages. @@ -97,7 +98,9 @@ class Package: self.current_version = None self.url = None self.url_worker = None + self.cpeid = None self.cves = list() + self.ignored_cves = list() self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None} self.status = {} @@ -142,8 +145,8 @@ class Package: self.infras = list() with open(os.path.join(brpath, self.path), 'r') as f: lines = f.readlines() - for l in lines: - match = INFRA_RE.match(l) + for line in lines: + match = INFRA_RE.match(line) if not match: continue infra = match.group(1) @@ -212,6 +215,22 @@ class Package: if var in self.all_versions: self.current_version = self.all_versions[var] + def set_cpeid(self): + """ + Fills in the .cpeid field + """ + var = self.pkgvar() + if not self.has_valid_infra: + self.status['cpe'] = ("na", "no valid package infra") + return + + if var in self.all_cpeids: + self.cpeid = self.all_cpeids[var] + # Set a preliminary status, it might be overridden by check_package_cpes() + self.status['cpe'] = ("warning", "not checked against CPE dictionnary") + else: + self.status['cpe'] = ("error", "no verified CPE identifier") + def set_check_package_warnings(self): """ Fills in the .warnings and .status['pkg-check'] fields @@ -235,12 +254,11 @@ class Package: self.status['pkg-check'] = ("error", "{} warnings".format(self.warnings)) return - @property - def ignored_cves(self): + def set_ignored_cves(self): """ Give the list of CVEs ignored by the package """ - return list(self.all_ignored_cves.get(self.pkgvar(), [])) + self.ignored_cves = list(self.all_ignored_cves.get(self.pkgvar(), [])) def set_developers(self, developers): """ @@ -258,7 +276,13 @@ class Package: self.status['developers'] = ("warning", "no developers") def is_status_ok(self, name): - return self.status[name][0] == 'ok' + return name in self.status and self.status[name][0] == 'ok' + + def is_status_error(self, name): + return name in self.status and self.status[name][0] == 'error' + + def is_status_na(self, name): + return name in self.status and self.status[name][0] == 'na' def __eq__(self, other): return self.path == other.path @@ -335,13 +359,13 @@ def get_pkglist(npackages, package_list): def get_config_packages(): cmd = ["make", "--no-print-directory", "show-info"] js = json.loads(subprocess.check_output(cmd)) - return js.keys() + return set([v["name"] for v in js.values()]) def package_init_make_info(): # Fetch all variables at once variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", - "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES"]) + "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES %_CPE_ID"]) variable_list = variables.decode().splitlines() # We process first the host package VERSION, and then the target @@ -379,6 +403,10 @@ def package_init_make_info(): pkgvar = pkgvar[:-12] Package.all_ignored_cves[pkgvar] = value.split() + elif pkgvar.endswith("_CPE_ID"): + pkgvar = pkgvar[:-7] + Package.all_cpeids[pkgvar] = value + check_url_count = 0 @@ -535,16 +563,54 @@ async def check_package_latest_version(packages): await asyncio.wait(tasks) +def check_package_cve_affects(cve, cpe_product_pkgs): + for product in cve.affected_products: + if product not in cpe_product_pkgs: + continue + for pkg in cpe_product_pkgs[product]: + if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves, pkg.cpeid) == cve.CVE_AFFECTS: + pkg.cves.append(cve.identifier) + + def check_package_cves(nvd_path, packages): if not os.path.isdir(nvd_path): os.makedirs(nvd_path) + cpe_product_pkgs = defaultdict(list) + for pkg in packages: + if not pkg.has_valid_infra: + pkg.status['cve'] = ("na", "no valid package infra") + continue + if not pkg.current_version: + pkg.status['cve'] = ("na", "no version information available") + continue + if pkg.cpeid: + cpe_product = cvecheck.cpe_product(pkg.cpeid) + cpe_product_pkgs[cpe_product].append(pkg) + else: + cpe_product_pkgs[pkg.name].append(pkg) + for cve in cvecheck.CVE.read_nvd_dir(nvd_path): - for pkg_name in cve.pkg_names: - if pkg_name in packages: - pkg = packages[pkg_name] - if cve.affects(pkg.name, pkg.current_version, pkg.ignored_cves) == cve.CVE_AFFECTS: - pkg.cves.append(cve.identifier) + check_package_cve_affects(cve, cpe_product_pkgs) + + for pkg in packages: + if 'cve' not in pkg.status: + if pkg.cves: + pkg.status['cve'] = ("error", "affected by CVEs") + else: + pkg.status['cve'] = ("ok", "not affected by CVEs") + + +def check_package_cpes(nvd_path, packages): + cpedb = CPEDB(nvd_path) + cpedb.get_xml_dict() + for p in packages: + if not p.cpeid: + continue + if cpedb.find(p.cpeid): + p.status['cpe'] = ("ok", "verified CPE identifier") + else: + p.status['cpe'] = ("error", "CPE identifier unknown in CPE database") def calculate_stats(packages): @@ -586,6 +652,10 @@ def calculate_stats(packages): stats["total-cves"] += len(pkg.cves) if len(pkg.cves) != 0: stats["pkg-cves"] += 1 + if pkg.cpeid: + stats["cpe-id"] += 1 + else: + stats["no-cpe-id"] += 1 return stats @@ -641,6 +711,30 @@ td.version-error { background: #ccc; } +td.cpe-ok { + background: #d2ffc4; +} + +td.cpe-nok { + background: #ff9a69; +} + +td.cpe-unknown { + background: #ffd870; +} + +td.cve-ok { + background: #d2ffc4; +} + +td.cve-nok { + background: #ff9a69; +} + +td.cve-unknown { + background: #ffd870; +} + Statistics of Buildroot packages @@ -799,13 +893,35 @@ def dump_html_pkg(f, pkg): # CVEs td_class = ["centered"] - if len(pkg.cves) == 0: - td_class.append("correct") + if pkg.is_status_ok("cve"): + td_class.append("cve-ok") + elif pkg.is_status_error("cve"): + td_class.append("cve-nok") else: - td_class.append("wrong") + td_class.append("cve-unknown") f.write(" \n" % " ".join(td_class)) - for cve in pkg.cves: - f.write(" %s
      \n" % (cve, cve)) + if pkg.is_status_error("cve"): + for cve in pkg.cves: + f.write("       %s
      \n" % (cve, cve)) + elif pkg.is_status_na("cve"): + f.write(" %s" % pkg.status['cve'][1]) + else: + f.write(" N/A\n") + f.write(" \n") + + # CPE ID + td_class = ["left"] + if pkg.is_status_ok("cpe"): + td_class.append("cpe-ok") + elif pkg.is_status_error("cpe"): + td_class.append("cpe-nok") + else: + td_class.append("cpe-unknown") + f.write(" \n" % " ".join(td_class)) + if pkg.cpeid: + f.write(" %s\n" % pkg.cpeid) + if not pkg.is_status_ok("cpe"): + f.write(" %s%s\n" % ("
      " if pkg.cpeid else "", pkg.status['cpe'][1])) f.write(" \n") f.write(" \n") @@ -826,6 +942,7 @@ def dump_html_all_pkgs(f, packages): Warnings Upstream URL CVEs +CPE ID """) for pkg in sorted(packages): @@ -868,6 +985,10 @@ def dump_html_stats(f, stats): stats["pkg-cves"]) f.write("Total number of CVEs affecting all packages%s\n" % stats["total-cves"]) + f.write("Packages with CPE ID%s\n" % + stats["cpe-id"]) + f.write("Packages without CPE ID%s\n" % + stats["no-cpe-id"]) f.write("\n") @@ -984,7 +1105,9 @@ def __main__(): pkg.set_patch_count() pkg.set_check_package_warnings() pkg.set_current_version() + pkg.set_cpeid() pkg.set_url() + pkg.set_ignored_cves() pkg.set_developers(developers) print("Checking URL status") loop = asyncio.get_event_loop() @@ -994,7 +1117,8 @@ def __main__(): loop.run_until_complete(check_package_latest_version(packages)) if args.nvd_path: print("Checking packages CVEs") - check_package_cves(args.nvd_path, {p.name: p for p in packages}) + check_package_cves(args.nvd_path, packages) + check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: diff --git a/buildroot/support/testing/tests/boot/test_atf.py b/buildroot/support/testing/tests/boot/test_atf.py index 08a0b7af2..e6c11aa74 100644 --- a/buildroot/support/testing/tests/boot/test_atf.py +++ b/buildroot/support/testing/tests/boot/test_atf.py @@ -41,9 +41,11 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_NEEDS_PYTHON3=y + BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -53,30 +55,3 @@ class TestATFAllwinner(infra.basetest.BRTest): def test_run(self): pass - - -class TestATFMarvell(infra.basetest.BRTest): - config = \ - """ - BR2_aarch64=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" - BR2_TARGET_BINARIES_MARVELL=y - BR2_TARGET_MV_DDR_MARVELL=y - BR2_TARGET_UBOOT=y - BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" - BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09" - BR2_TARGET_UBOOT_NEEDS_DTC=y - """ - - def test_run(self): - pass diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/Config.in b/buildroot/support/testing/tests/core/cpeid-br2-external/Config.in new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/external.desc b/buildroot/support/testing/tests/core/cpeid-br2-external/external.desc new file mode 100644 index 000000000..d19ae79e7 --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/external.desc @@ -0,0 +1 @@ +name: CPE_ID diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/external.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/external.mk new file mode 100644 index 000000000..47492d7f8 --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_CPE_ID_PATH)/package/*/*.mk)) diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg1/cpe-id-pkg1.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg1/cpe-id-pkg1.mk new file mode 100644 index 000000000..5e7460286 --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg1/cpe-id-pkg1.mk @@ -0,0 +1,4 @@ +CPE_ID_PKG1_VERSION = 42 + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg2/cpe-id-pkg2.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg2/cpe-id-pkg2.mk new file mode 100644 index 000000000..12b3f3223 --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg2/cpe-id-pkg2.mk @@ -0,0 +1,3 @@ +CPE_ID_PKG2_VERSION = 67 + +$(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk new file mode 100644 index 000000000..5added78d --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk @@ -0,0 +1,5 @@ +CPE_ID_PKG3_VERSION = 67 +CPE_ID_PKG3_CPE_ID_VALID = YES + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg4/cpe-id-pkg4.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg4/cpe-id-pkg4.mk new file mode 100644 index 000000000..557acff8a --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg4/cpe-id-pkg4.mk @@ -0,0 +1,9 @@ +CPE_ID_PKG4_VERSION = 67 +CPE_ID_PKG4_CPE_ID_VENDOR = foo +CPE_ID_PKG4_CPE_ID_PRODUCT = bar +CPE_ID_PKG4_CPE_ID_VERSION = 42 +CPE_ID_PKG4_CPE_ID_UPDATE = b2 +CPE_ID_PKG4_CPE_ID_PREFIX = cpe:2.4:a + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg5/cpe-id-pkg5.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg5/cpe-id-pkg5.mk new file mode 100644 index 000000000..d0db5f03f --- /dev/null +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg5/cpe-id-pkg5.mk @@ -0,0 +1,16 @@ +CPE_ID_PKG5_VERSION = 57 + +CPE_ID_PKG5_CPE_ID_VENDOR = foo +CPE_ID_PKG5_CPE_ID_PRODUCT = bar +CPE_ID_PKG5_CPE_ID_VERSION = 42 +CPE_ID_PKG5_CPE_ID_UPDATE = b2 +CPE_ID_PKG5_CPE_ID_PREFIX = cpe:2.4:a + +HOST_CPE_ID_PKG5_CPE_ID_VENDOR = baz +HOST_CPE_ID_PKG5_CPE_ID_PRODUCT = fuz +HOST_CPE_ID_PKG5_CPE_ID_VERSION = 43 +HOST_CPE_ID_PKG5_CPE_ID_UPDATE = b3 +HOST_CPE_ID_PKG5_CPE_ID_PREFIX = cpe:2.5:a + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/test_cpeid.py b/buildroot/support/testing/tests/core/test_cpeid.py new file mode 100644 index 000000000..190f0306e --- /dev/null +++ b/buildroot/support/testing/tests/core/test_cpeid.py @@ -0,0 +1,110 @@ +import infra +import subprocess +import json + + +class CpeIdTest(infra.basetest.BRConfigTest): + config = "" + br2_external = [infra.filepath("tests/core/cpeid-br2-external")] + + def get_vars(self, var): + cmd = ["make", "--no-print-directory", "-C", self.b.builddir, + "VARS=%s%%" % var, "printvars"] + lines = subprocess.check_output(cmd).splitlines() + return dict([str(x, "utf-8").split("=") for x in lines]) + + def get_json(self, pkg): + cmd = ["make", "--no-print-directory", "-C", self.b.builddir, + "%s-show-info" % pkg] + return json.loads(subprocess.check_output(cmd)) + + def test_pkg1(self): + # this package has no CPE ID information, it should not have + # any CPE_ID variable defined. + pkg_vars = self.get_vars("CPE_ID_PKG1_CPE_ID") + cpe_vars = ["CPE_ID_VALID", "CPE_ID_PRODUCT", "CPE_ID_VERSION", "CPE_ID_UPDATE", + "CPE_ID_PREFIX", "CPE_ID"] + for v in cpe_vars: + self.assertNotIn("CPE_ID_PKG1_%s" % v, pkg_vars) + pkg_json = self.get_json("cpe-id-pkg1") + self.assertNotIn("cpe-id", pkg_json['cpe-id-pkg1']) + + pkg_vars = self.get_vars("HOST_CPE_ID_PKG1_CPE_ID") + for v in cpe_vars: + self.assertNotIn("HOST_CPE_ID_PKG1_%s" % v, pkg_vars) + pkg_json = self.get_json("host-cpe-id-pkg1") + self.assertNotIn("cpe-id", pkg_json['host-cpe-id-pkg1']) + + def test_pkg2(self): + # this package has no CPE ID information, it should not have + # any CPE_ID variable defined. + pkg_vars = self.get_vars("HOST_CPE_ID_PKG2_CPE_ID") + cpe_vars = ["CPE_ID_VALID", "CPE_ID_PRODUCT", "CPE_ID_VERSION", "CPE_ID_UPDATE", + "CPE_ID_PREFIX", "CPE_ID"] + for v in cpe_vars: + self.assertNotIn("HOST_CPE_ID_PKG2_%s" % v, pkg_vars) + pkg_json = self.get_json("host-cpe-id-pkg2") + self.assertNotIn("cpe-id", pkg_json['host-cpe-id-pkg2']) + + def test_pkg3(self): + # this package has just _CPE_ID_VALID defined, so verify + # it has the default CPE_ID value, and that inheritance of the + # values for the host package is working + pkg_vars = self.get_vars("CPE_ID_PKG3_CPE_ID") + self.assertEqual(pkg_vars["CPE_ID_PKG3_CPE_ID"], + "cpe:2.3:a:cpe-id-pkg3_project:cpe-id-pkg3:67:*:*:*:*:*:*:*") + self.assertEqual(pkg_vars["CPE_ID_PKG3_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("cpe-id-pkg3") + self.assertEqual(pkg_json['cpe-id-pkg3']['cpe-id'], + "cpe:2.3:a:cpe-id-pkg3_project:cpe-id-pkg3:67:*:*:*:*:*:*:*") + + pkg_vars = self.get_vars("HOST_CPE_ID_PKG3_CPE_ID") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG3_CPE_ID"], + "cpe:2.3:a:cpe-id-pkg3_project:cpe-id-pkg3:67:*:*:*:*:*:*:*") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG3_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("host-cpe-id-pkg3") + self.assertEqual(pkg_json['host-cpe-id-pkg3']['cpe-id'], + "cpe:2.3:a:cpe-id-pkg3_project:cpe-id-pkg3:67:*:*:*:*:*:*:*") + + def test_pkg4(self): + # this package defines + # _CPE_ID_{VENDOR,PRODUCT,VERSION,UPDATE,PREFIX}, + # make sure we get the computed _CPE_ID, and that it is + # inherited by the host variant + pkg_vars = self.get_vars("CPE_ID_PKG4_CPE_ID") + self.assertEqual(pkg_vars["CPE_ID_PKG4_CPE_ID"], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + self.assertEqual(pkg_vars["CPE_ID_PKG4_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("cpe-id-pkg4") + self.assertEqual(pkg_json['cpe-id-pkg4']['cpe-id'], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + + pkg_vars = self.get_vars("HOST_CPE_ID_PKG4_CPE_ID") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG4_CPE_ID"], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG4_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("host-cpe-id-pkg4") + self.assertEqual(pkg_json['host-cpe-id-pkg4']['cpe-id'], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + + def test_pkg5(self): + # this package defines + # _CPE_ID_{VENDOR,PRODUCT,VERSION,UPDATE,PREFIX} and + # HOST__CPE_ID_{VENDOR,PRODUCT,VERSION,UPDATE,PREFIX} + # separately, with different values. Make sure we get the + # right _CPE_ID and HOST__CPE_ID values. + pkg_vars = self.get_vars("CPE_ID_PKG5_CPE_ID") + self.assertEqual(pkg_vars["CPE_ID_PKG5_CPE_ID"], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + self.assertEqual(pkg_vars["CPE_ID_PKG5_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("cpe-id-pkg5") + self.assertEqual(pkg_json['cpe-id-pkg5']['cpe-id'], + "cpe:2.4:a:foo:bar:42:b2:*:*:*:*:*:*") + + pkg_vars = self.get_vars("HOST_CPE_ID_PKG5_CPE_ID") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG5_CPE_ID"], + "cpe:2.5:a:baz:fuz:43:b3:*:*:*:*:*:*") + self.assertEqual(pkg_vars["HOST_CPE_ID_PKG5_CPE_ID_VALID"], "YES") + pkg_json = self.get_json("host-cpe-id-pkg5") + self.assertEqual(pkg_json['host-cpe-id-pkg5']['cpe-id'], + "cpe:2.5:a:baz:fuz:43:b3:*:*:*:*:*:*") diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash index b9e1baec8..b44b1f825 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash @@ -1 +1 @@ -sha256 0000000000000000000000000000000000000000000000000000000000000000 bad-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz +sha256 0000000000000000000000000000000000000000000000000000000000000000 bad-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash index 9e92ab8ab..fc3f60daf 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-hash/package/good/good.hash @@ -1 +1 @@ -sha256 d00ae598e9e770d607621a86766030b42eaa58156cb8d482b043969da7963c23 good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz +sha256 682ad1f39f258bfb35e26f213f3798f44bb8105bb55fad47bdc003113765b650 good-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash index 648bcceca..26a6b358e 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash @@ -1,2 +1,2 @@ -sha256 70b76187369e47db69dac02c5696e63b35199cd20490fa473d289dd377774613 git-partial-sha1-branch-head-68c197d0879d485f4f6c.tar.gz +sha256 c27041b3e874beb0d0218158e7d6507ad1515b684de5eed5fabd0f7205e9718e git-partial-sha1-branch-head-68c197d0879d485f4f6c-br1.tar.gz sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash index d064362e2..ab1edc73a 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash @@ -1,2 +1,2 @@ -sha256 9db079b9e215799d59975db7b2b26671eff1932ee6cf1075296f2ace3e2cb746 git-partial-sha1-reachable-by-branch-317406308d9259e2231b.tar.gz +sha256 1bbba9bf2788bd789ed8da4e47cabbf3467b1f706875b3f6b62df38e08fb9aba git-partial-sha1-reachable-by-branch-317406308d9259e2231b-br1.tar.gz sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash index 769608669..e4a08342a 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash @@ -1,2 +1,2 @@ -sha256 f2ef9772f13a9ef9a2c7cde0795e179defb12320d1747fc8d2408748ef5844c2 git-partial-sha1-reachable-by-tag-46bae5b639e5a18e2cc4.tar.gz +sha256 52d223f3b2d625216c259e9ff949ca8818452a531ba61557dd91f3889c7919d7 git-partial-sha1-reachable-by-tag-46bae5b639e5a18e2cc4-br1.tar.gz sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash index e627caf91..6e83e637c 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash @@ -1,2 +1,2 @@ -sha256 721143b41b8e56cfd9025833f1602e900a490627db2504e5b4907baa23e0019e git-partial-sha1-tag-itself-2b0e0d98a49c97da6a61.tar.gz +sha256 5cfc004b05f48b3fb419a5db4b7239223d670225fbbb91de2ae151c97910b36c git-partial-sha1-tag-itself-2b0e0d98a49c97da6a61-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash index f957a0e23..7d538e72d 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash @@ -1,2 +1,2 @@ -sha256 0fbf7fe935f962ceaafcf8e0ffd25dd2a83752c3f0fd055a942a53f8c9235fa7 git-partial-sha1-tag-points-to-516c9c5f64ec66534d4d.tar.gz +sha256 0f40d7f39bf2e389cc2ce03c73cc0cc9ded1119378aaa68e2a2ef8597f6fd2f3 git-partial-sha1-tag-points-to-516c9c5f64ec66534d4d-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash index 3e8f76d31..2fc4fbcb9 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash @@ -1,2 +1,2 @@ -sha256 a21a2507b6d94ad484e49e3a9ae698f672a57469aab8e1779da77df7c9d4d337 git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f.tar.gz +sha256 3ab67c485ce1825abbbf5db1d90d94dfadc89b30bb740041cfc75fc04021e218 git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f-br1.tar.gz sha256 2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash index f8d7b5dc4..38f0578fd 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash @@ -1,2 +1,2 @@ -sha256 8909e76d898e651af0bc23fae4103b87888bfe77448d71aaf1fbec3da97a3ce2 git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08.tar.gz +sha256 a5936d6d6022ea101a6076864a2afa918ab2776764012c4be589027001044041 git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08-br1.tar.gz sha256 fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash index 0eb0ca091..bd4673b15 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash @@ -1,2 +1,2 @@ -sha256 9b20256a3058221a8e91031f11700d9945ea84e8f328fa8e42e1cb9f7a30e3b2 git-sha1-reachable-by-tag-46bae5b639e5a18e2cc4dc508f080d566baeff59.tar.gz +sha256 c203f968e358ca478d4c5344b1e4ae9bf13f9fb1120f2ed96a12154dd64195a6 git-sha1-reachable-by-tag-46bae5b639e5a18e2cc4dc508f080d566baeff59-br1.tar.gz sha256 2de87d77a2f226813f2d9bda906e970e4195605cdba6680443c0c04d89c532b6 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash index 48c134853..c6862da75 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash @@ -1,2 +1,2 @@ -sha256 7d301c1a1054d6aee49193ca9e938f4da561ff73fb01719662865aa38bdc4361 git-sha1-tag-itself-2b0e0d98a49c97da6a618ab36337e2058eb733a2.tar.gz +sha256 57f08e9f3914e79a10e7fb5d346b26fef2773dd22eed0d61fd755e79e62cee93 git-sha1-tag-itself-2b0e0d98a49c97da6a618ab36337e2058eb733a2-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash index 3dcafc209..188cb6897 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash @@ -1,2 +1,2 @@ -sha256 c1f9f5734529a31140a71c031534460811f001b4db37d26833f386358150ab47 git-sha1-tag-points-to-516c9c5f64ec66534d4d069c2e408d9ae4dce023.tar.gz +sha256 1d8b565827137aa21ba37cde382aa291e33a135c697e38dcd31f14e195386327 git-sha1-tag-points-to-516c9c5f64ec66534d4d069c2e408d9ae4dce023-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash index 3bd0a4469..c0698e7b2 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash @@ -1,2 +1,2 @@ -sha256 f9d46ff8a1a344c6c31fa4211220f3085c446abd31626232540703158276f22c git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz +sha256 e8e0febc7f1408df22bce2d73d9a30081e03b45e152bc25effd14435ca8b3433 git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f-br1.tar.gz sha256 ba8b6ddc4726bfb6a05045ebfd8c43263c968ad1bc601bd46a25bc055008eddc file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash index 7f92c652d..b95c51fe2 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash @@ -1 +1 @@ -sha256 139a34c3c844c844dee74b6746418cfa75fbcc4205794ac8c0b3cd7d55a76792 git-submodule-enabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz +sha256 176c32f10ad11f290b6251d701835450292ba281eb59c7fb57b244407a55ceab git-submodule-enabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f-br1.tar.gz diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash index 1cd0b15f2..c7ebcf0e0 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash @@ -1,2 +1,2 @@ -sha256 85dcb5bcf9bed496688d0eb01c7a3ce05c5b46b984cc1e9e76a6dbefd976e6b3 git-tag-mytag.tar.gz +sha256 c66b2366d8ccb1670951012334fe8d48de3358aef39b3da2912b339448fefcde git-tag-mytag-br1.tar.gz sha256 6de8772a0a58fa62e2b8c58d4dae55c9db7534ad3b3918ecc849a9008d58f081 file diff --git a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash index 47b2b8b7d..453ffc0ab 100644 --- a/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash +++ b/buildroot/support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash @@ -1,2 +1,2 @@ - sha256 04715901977503d1df650e0959f4d31d8e7b105e2ac99a2182e0652b8f13baa1 git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz + sha256 4a230e667227310289438cd7d899276a0d45ca8778abfd043dfc0a10ed2c9085 git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d-br1.tar.gz sha256 0000000000000000000000000000000000000000000000000000000000000000 file diff --git a/buildroot/support/testing/tests/package/sample_python_pytest_asyncio.py b/buildroot/support/testing/tests/package/sample_python_pytest_asyncio.py new file mode 100644 index 000000000..cdb8cd9fb --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_pytest_asyncio.py @@ -0,0 +1,31 @@ +import asyncio +import pytest + + +x = 1 + + +@pytest.fixture() +def f1(): + global x + x = 2 + yield 15 + x = 3 + + +@pytest.mark.asyncio +async def test_1(): + assert x == 1 + + +@pytest.mark.asyncio +async def test_2(f1): + assert x == 2 + assert f1 == 15 + + +@pytest.mark.asyncio +async def test_3(): + assert x == 3 + await asyncio.sleep(0.1) + assert x == 3 diff --git a/buildroot/support/testing/tests/package/test_lualdap.py b/buildroot/support/testing/tests/package/test_lualdap.py new file mode 100644 index 000000000..2ec0d5822 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lualdap.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLuaLdap(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LUALDAP=y + """ + + def test_run(self): + self.login() + self.module_test("lualdap") + + +class TestLuajitLuaLdap(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_LUALDAP=y + """ + + def test_run(self): + self.login() + self.module_test("lualdap") diff --git a/buildroot/support/testing/tests/package/test_python_pytest_asyncio.py b/buildroot/support/testing/tests/package/test_python_pytest_asyncio.py new file mode 100644 index 000000000..caf034be7 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_pytest_asyncio.py @@ -0,0 +1,20 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3PytestAsyncio(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYTEST=y + BR2_PACKAGE_PYTHON_PYTEST_ASYNCIO=y + """ + sample_scripts = ["tests/package/sample_python_pytest_asyncio.py"] + + def run_sample_scripts(self): + for script in self.sample_scripts: + cmd = self.interpreter + " -m pytest " + os.path.basename(script) + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index 5611e5c6d..553612c4a 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -488,6 +488,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -501,6 +505,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 default "5.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 default "5.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 diff --git a/buildroot/toolchain/toolchain-buildroot/Config.in b/buildroot/toolchain/toolchain-buildroot/Config.in index 2058ff1eb..4004c0edf 100644 --- a/buildroot/toolchain/toolchain-buildroot/Config.in +++ b/buildroot/toolchain/toolchain-buildroot/Config.in @@ -56,11 +56,10 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc depends on !BR2_powerpc_SPE depends on BR2_RISCV_ISA_RVA || !BR2_riscv select BR2_TOOLCHAIN_USES_GLIBC - # our glibc.mk enables RPC support - select BR2_TOOLCHAIN_HAS_NATIVE_RPC help This option selects glibc as the C library for the cross-compilation toolchain. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index ea63687c5..bbd6a0703 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2019.12" + bool "Arm AArch64 BE 2020.11" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index a82c2ba48..8e67a9659 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc -md5 f9885977e7f949f35bc0820f4bf99ab2 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc +md5 5da75bca337de5adade5b339709f8b16 gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz # locally calculated -sha256 55fc54a63567a35fb8280dfef91d50c0b5ad65aaea267f34fe7647b02d912f56 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz +sha256 78a472aeb80f6ff56bfdef57ce165b233bac4af7aa2e12f454900518a30ddf20 gcc-arm-10.2-2020.11-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index e06f12299..384fc2efc 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 52dcb2825..b6062846a 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2019.12" + bool "Arm AArch64 2020.11" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,7 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index edc30a280..90abe56d6 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc -md5 23ecc1dc528253c43e43365c6d923ec3 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz.asc +md5 d6e6676d31c51405ae0fc7687ef0a224 gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz # locally calculated -sha256 8dfe681531f0bd04fb9c53cf3c0a3368c616aa85d48938eebe2b516376e06a66 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz +sha256 fe7f72330216612de44891ebe5e228eed7c0c051ac090c395b2b33115c6f5408 gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 51a81ec98..583e4a763 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 29509635a..e3bac38ba 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -4,7 +4,7 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2019.12" + bool "Arm ARM 2020.11" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON @@ -16,12 +16,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 9.2.1, - GDB 8.3.0, glibc 2.30, Binutils 2.33.1. It generates code + Arm toolchain for the ARM architecture. It uses GCC 10.2, + GDB 10.1, glibc 2.31, Binutils 2.35.1. It generates code that runs on all Cortex-A profile devices. The code generated uses the hard floating point calling convention, and uses the NEON FPU instructions. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index 0a28cf0d5..a46ed4e40 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc -md5 ae539d09dadacf7f22fcd6f54870e5ad gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz.asc +md5 14f706db78cfb43aafed9056174572b0 gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz # locally calculated -sha256 51bbaf22a4d3e7a393264c4ef1e45566701c516274dde19c4892c911caa85617 gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz +sha256 102825ae56c9e00142d06f35d2bdd3299edb6060e84a275a25b095e66fd3fc2a gcc-arm-10.2-2020.11-x86_64-arm-none-linux-gnueabihf.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 798573a47..88b6ae340 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2019.12 -TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2020.11 +TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index c64c4bb35..d47360ad8 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -3331,7 +3331,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC help Bootlin toolchain for the riscv32-ilp32d architecture, using the glibc C library. This is a bleeding-edge version, diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index f7aa5454e..992fd2c15 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -119,8 +119,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10 + bool "5.10.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9 - bool "5.9.x or later" + bool "5.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_8 diff --git a/buildroot/utils/getdeveloperlib.py b/buildroot/utils/getdeveloperlib.py index d7a90457e..b20581703 100644 --- a/buildroot/utils/getdeveloperlib.py +++ b/buildroot/utils/getdeveloperlib.py @@ -56,17 +56,6 @@ def fname_get_package_infra(fname): return None -def get_infras(files): - """Search in the list of files for .mk files, and collect the package - infrastructures used by those .mk files.""" - infras = set() - for fname in files: - infra = fname_get_package_infra(fname) - if infra: - infras.add(infra) - return infras - - def analyze_patches(patches): """Parse a list of patches and returns the list of files modified, added or removed by the patches, as well as the list of package @@ -77,7 +66,6 @@ def analyze_patches(patches): (files, infras) = analyze_patch(patch) allfiles = allfiles | files allinfras = allinfras | infras - allinfras = allinfras | get_infras(allfiles) return (allfiles, allinfras) diff --git a/buildroot/utils/scancpan b/buildroot/utils/scancpan index 327a58fc7..075f19356 100755 --- a/buildroot/utils/scancpan +++ b/buildroot/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.030 should be aligned with the version of perl actually +# Below, 5.032 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.030; +die <<"MSG" if $] < 5.032; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.30.0 + perlbrew install perl-5.32.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -567,7 +567,7 @@ sub find_license_files { foreach (split /\n/, $manifest) { next if m|/|; s|\s+.*$||; - push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE|LICENCE)/i; + push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|GPL\S*|LICENSE|LICENCE)/i; } if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) { @license_files = ($1); @@ -575,6 +575,9 @@ sub find_license_files { if (scalar @license_files == 0 && $manifest =~ m/(README\.md)[\n\s]/i) { @license_files = ($1); } + if (scalar @license_files == 0 && $manifest =~ m/(README\.pod)[\n\s]/i) { + @license_files = ($1); + } return @license_files; } @@ -964,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2019 by Francois Perrad +Copyright (C) 2013-2020 by Francois Perrad This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/buildroot/utils/scanpypi b/buildroot/utils/scanpypi index 51bc249f9..47c7c00c6 100755 --- a/buildroot/utils/scanpypi +++ b/buildroot/utils/scanpypi @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Utility for building Buildroot packages for existing PyPI packages