From 9c8172df4012c78690a8e4504e94c9852ad41c1a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 19 Jun 2021 19:26:55 +0200 Subject: [PATCH] Update buildroot to 2021.02.3 (#1422) Signed-off-by: Stefan Agner --- .../0001-docker-add-AppArmor-support.patch | 8 +- .../0002-network-manager-wpa_supplicant.patch | 14 +- buildroot-patches/0003-Fix-dhcp-client.patch | 16 +- ...ware-Allow-to-deploy-multiple-firmwa.patch | 12 +- ...rmware-add-RTL87XX-RTL88XX-Bluetooth.patch | 12 +- ...-proxy-bump-version-to-b3507428be5b.patch} | 12 +- ...firmware-bump-version-to-1.20210303.patch} | 12 +- ...kage-runc-bump-to-version-1.0.0-rc93.patch | 39 - buildroot/CHANGES | 45 + buildroot/Config.in | 5 + buildroot/DEVELOPERS | 16 +- buildroot/Makefile | 4 +- buildroot/README | 2 +- buildroot/docs/manual/manual.html | 10 +- buildroot/docs/manual/manual.pdf | Bin 584473 -> 584482 bytes buildroot/docs/manual/manual.text | 12 +- buildroot/docs/manual/resources.txt | 4 +- buildroot/docs/website/support.html | 10 +- buildroot/linux/Config.in | 2 +- buildroot/linux/linux.hash | 12 +- buildroot/package/acpid/acpid.mk | 2 + ...log_pid-Use-a-temporary-file-then-re.patch | 77 - buildroot/package/apache/apache.hash | 4 +- buildroot/package/apache/apache.mk | 2 +- buildroot/package/apcupsd/apcupsd.mk | 1 + ...p-to-fix-gcc-build-for-v9-2-0-32-bit.patch | 1638 +++++++++++++++++ ...ssize_t-typedef-mismatch-for-musl-co.patch | 50 - ...oses-2954-upgrade-to-latest-greatest.patch | 243 +++ ...lib-disable-dynamic-library-building.patch | 31 - buildroot/package/assimp/Config.in | 5 + buildroot/package/assimp/assimp.mk | 3 +- buildroot/package/azmq/Config.in | 3 + buildroot/package/bird/bird.mk | 1 + buildroot/package/bitcoin/bitcoin.hash | 4 +- buildroot/package/bitcoin/bitcoin.mk | 2 +- buildroot/package/blktrace/blktrace.mk | 1 + buildroot/package/boost/Config.in | 3 + ...it-architectures-using-64-bit-time_t.patch | 37 + buildroot/package/chrony/chrony.mk | 1 + buildroot/package/connman/connman.hash | 2 +- buildroot/package/connman/connman.mk | 2 +- buildroot/package/dc3dd/Config.in | 2 + buildroot/package/dhcp/dhcp.hash | 6 +- buildroot/package/dhcp/dhcp.mk | 6 +- buildroot/package/directfb/Config.in | 2 + buildroot/package/dmalloc/dmalloc.mk | 6 +- ...-port-forwarding-with-ipv6.disable-1.patch | 74 + buildroot/package/docker-engine/Config.in | 2 - ...estore-KERNEL_64_USERSPACE_32-checks.patch | 105 ++ ...-option-enable-kernel-64-userland-32.patch | 51 + buildroot/package/ebtables/ebtables.mk | 6 + buildroot/package/efibootmgr/Config.in | 2 +- buildroot/package/efl/Config.in | 1 + .../package/enlightenment/enlightenment.mk | 1 + buildroot/package/enscript/enscript.mk | 1 + .../environment-setup/environment-setup.mk | 4 +- buildroot/package/exempi/exempi.mk | 1 + buildroot/package/expat/expat.hash | 8 +- buildroot/package/expat/expat.mk | 2 +- buildroot/package/findutils/findutils.mk | 1 + buildroot/package/flatcc/flatcc.mk | 2 + buildroot/package/fluidsynth/fluidsynth.mk | 1 + .../freescale-imx/imx-gpu-viv/Config.in | 5 + buildroot/package/frr/frr.mk | 2 + ...t-build-gdbserver-with-m68k-and-ucli.patch | 41 + buildroot/package/go/go.hash | 2 +- buildroot/package/go/go.mk | 2 +- ...lly-revert-Tweaks-for-building-on-th.patch | 2 +- buildroot/package/gptfdisk/gptfdisk.hash | 7 +- buildroot/package/gptfdisk/gptfdisk.mk | 2 +- buildroot/package/grpc/grpc.mk | 1 + .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 + .../gst1-rtsp-server/gst1-rtsp-server.mk | 2 + .../gstreamer1/gstreamer1/gstreamer1.mk | 2 + ...ays-build-gupnp-binding-tool-manpage.patch | 60 - ...or-stylesheet-existence-on-doc-build.patch | 73 + buildroot/package/gupnp/gupnp.hash | 4 +- buildroot/package/gupnp/gupnp.mk | 2 +- ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 + ...-functions-for-recognizing-tag-value.patch | 37 + buildroot/package/hostapd/hostapd.hash | 1 + buildroot/package/hostapd/hostapd.mk | 6 +- buildroot/package/hwloc/hwloc.mk | 19 +- buildroot/package/i2c-tools/i2c-tools.mk | 1 + ...ame-pcap_filter-to-iftop_pcap_filter.patch | 51 + .../package/imagemagick/imagemagick.hash | 2 +- buildroot/package/imagemagick/imagemagick.mk | 2 +- ...akelists.txt-respect-MEDIA_BUILD_FAT.patch | 51 + .../intel-mediadriver/intel-mediadriver.mk | 1 + .../intel-microcode/intel-microcode.hash | 4 +- .../intel-microcode/intel-microcode.mk | 2 +- .../jquery-validation/jquery-validation.hash | 4 +- .../jquery-validation/jquery-validation.mk | 6 +- buildroot/package/keepalived/keepalived.mk | 1 + buildroot/package/kodi/Config.in | 1 + buildroot/package/kodi/kodi.mk | 6 +- buildroot/package/less/less.mk | 1 + ...ra-add-dependencies-to-libcamera_dep.patch | 37 + ...ncorrect-const-on-variable-that-is-m.patch | 32 + buildroot/package/libcurl/libcurl.hash | 4 +- buildroot/package/libcurl/libcurl.mk | 8 +- buildroot/package/libcutl/libcutl.mk | 1 + buildroot/package/libeXosip2/libeXosip2.mk | 2 + buildroot/package/libesmtp/Config.in | 2 +- buildroot/package/libesmtp/libesmtp.mk | 2 +- buildroot/package/libffi/libffi.mk | 1 - buildroot/package/libfuse/libfuse.mk | 1 + buildroot/package/libfuse3/libfuse3.mk | 2 + buildroot/package/libgeos/Config.in | 4 +- buildroot/package/libgtk2/libgtk2.mk | 2 + buildroot/package/libgtk3/libgtk3.mk | 2 + buildroot/package/libical/libical.mk | 1 + buildroot/package/libidn/libidn.mk | 1 + buildroot/package/libidn2/libidn2.mk | 1 + ...f-__NR_io_getevents-when-not-defined.patch | 42 + buildroot/package/libldns/libldns.mk | 2 + buildroot/package/libmms/libmms.mk | 1 + buildroot/package/libmodbus/libmodbus.mk | 1 + buildroot/package/libmspack/libmspack.mk | 7 +- buildroot/package/libnids/libnids.mk | 5 +- ...n-inc-asmdefs_mmi.h-fix-mips32-build.patch | 89 + buildroot/package/liboping/liboping.mk | 1 + .../0001-Add-Libs.private-to-libraw.pc.patch | 67 + buildroot/package/libraw/Config.in | 2 + buildroot/package/librelp/librelp.mk | 1 + .../package/libsamplerate/libsamplerate.mk | 1 + buildroot/package/libtirpc/libtirpc.hash | 4 +- buildroot/package/libtirpc/libtirpc.mk | 2 +- buildroot/package/libusb/libusb.mk | 1 + buildroot/package/libuv/libuv.mk | 1 + ...e-loop-in-xmlStringLenDecodeEntities.patch | 36 - ...mory-leak-in-xmlSchemaValidateStream.patch | 35 - ...of-bounds-read-with-xmllint--htmlout.patch | 40 - buildroot/package/libxml2/libxml2.hash | 4 +- buildroot/package/libxml2/libxml2.mk | 8 +- ...ml2-config-check-in-configure-script.patch | 31 + buildroot/package/libxslt/libxslt.mk | 2 + .../package/linux-headers/Config.in.host | 12 +- buildroot/package/live555/live555.hash | 4 +- buildroot/package/live555/live555.mk | 2 +- .../llvm/0001-nfc-Fix-missing-include.patch | 24 + ...c-to-prevent-memsize-from-timingout-.patch | 28 + ...bage-pointer-for-lat_rpc-S-localhost.patch | 25 + ...y-parameter-warning-for-__sigsetjmp-.patch | 155 ++ ...overflow-warning-in-pthread_cleanup_.patch | 125 ++ .../0001-configure.ac-add-disable-tests.patch | 37 + ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 - .../package/lttng-tools/lttng-tools.hash | 4 +- buildroot/package/lttng-tools/lttng-tools.mk | 5 +- buildroot/package/lvm2/Config.in | 1 - buildroot/package/lvm2/lvm2.mk | 1 + ...mory-corruption-with-negative-memmov.patch | 26 + buildroot/package/lz4/lz4.mk | 3 + .../package/mesa3d-headers/mesa3d-headers.mk | 2 + buildroot/package/mesa3d/mesa3d.mk | 2 + ...1-Fix-linking-on-gcc-10.2.0-or-newer.patch | 27 + buildroot/package/mini-snmpd/mini-snmpd.mk | 2 + buildroot/package/minidlna/minidlna.mk | 2 + buildroot/package/minissdpd/minissdpd.mk | 1 + buildroot/package/minizip/minizip.mk | 1 + .../0002-Mono-compilation-error-branch.patch | 25 + buildroot/package/mpg123/mpg123.hash | 8 +- buildroot/package/mpg123/mpg123.mk | 2 +- buildroot/package/mpv/mpv.hash | 2 +- buildroot/package/mpv/mpv.mk | 9 +- buildroot/package/msmtp/msmtp.mk | 1 + buildroot/package/musl/musl.mk | 1 + ...set-iterator-when-it-ends-in-a-comma.patch | 40 + buildroot/package/nasm/nasm.mk | 2 + buildroot/package/nbd/nbd.mk | 2 + buildroot/package/netperf/netperf.mk | 2 +- buildroot/package/netsurf/netsurf.mk | 1 + ...ff-by-one-write-in-ngx_resolver_copy.patch | 40 + buildroot/package/nginx/nginx.mk | 3 + buildroot/package/odb/odb.mk | 1 + buildroot/package/opencv3/opencv3.mk | 2 + buildroot/package/openssh/openssh.hash | 4 +- buildroot/package/openssh/openssh.mk | 2 +- buildroot/package/opentyrian/opentyrian.hash | 3 + buildroot/package/opentyrian/opentyrian.mk | 5 +- buildroot/package/oprofile/oprofile.mk | 1 + buildroot/package/p7zip/p7zip.mk | 1 + .../package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- buildroot/package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- buildroot/package/perl/perl.mk | 1 + buildroot/package/php-imagick/php-imagick.mk | 2 + buildroot/package/picocom/picocom.mk | 1 + .../0003-Makefile-fix-static-link.patch | 6 +- buildroot/package/pifmrds/pifmrds.mk | 3 +- buildroot/package/pigz/pigz.mk | 1 + buildroot/package/pngquant/pngquant.mk | 1 + buildroot/package/poco/poco.mk | 1 + buildroot/package/postgresql/postgresql.hash | 4 +- buildroot/package/postgresql/postgresql.mk | 2 +- buildroot/package/prosody/prosody.hash | 8 +- buildroot/package/prosody/prosody.mk | 2 +- .../package/proxychains-ng/proxychains-ng.mk | 1 + buildroot/package/pulseaudio/pulseaudio.mk | 1 + buildroot/package/putty/putty.mk | 3 + buildroot/package/pwgen/pwgen.mk | 1 + .../python-autobahn/python-autobahn.mk | 2 + buildroot/package/python-bluezero/Config.in | 17 +- .../python-engineio/python-engineio.mk | 1 + .../package/python-keyring/python-keyring.mk | 2 + .../package/python-pillow/python-pillow.hash | 7 +- .../package/python-pillow/python-pillow.mk | 27 +- .../python-requests/python-requests.mk | 2 + buildroot/package/python-tqdm/python-tqdm.mk | 2 + .../python3-requests/python3-requests.mk | 2 + ...-no-pie-is-no-functional-linker-flag.patch | 79 + buildroot/package/qpdf/qpdf.mk | 1 + ...Fix-build-with-GCC-11-include-limits.patch | 53 + buildroot/package/redis/redis.hash | 2 +- buildroot/package/redis/redis.mk | 2 +- buildroot/package/refpolicy/refpolicy.mk | 2 +- ...plicit-undefine-PYLIB-for-compatibil.patch | 48 + buildroot/package/runc/runc.hash | 2 +- buildroot/package/runc/runc.mk | 2 +- buildroot/package/shellinabox/shellinabox.mk | 1 + buildroot/package/squid/squid.hash | 8 +- buildroot/package/squid/squid.mk | 2 +- buildroot/package/strace/Config.in | 6 + buildroot/package/supervisor/supervisor.mk | 1 + buildroot/package/synergy/synergy.mk | 1 + buildroot/package/taglib/taglib.mk | 1 + buildroot/package/tclap/tclap.mk | 1 + buildroot/package/terminology/terminology.mk | 1 + buildroot/package/thermald/thermald.mk | 1 + buildroot/package/tini/tini.mk | 1 + buildroot/package/tinyproxy/tinyproxy.mk | 1 + buildroot/package/tinyxml2/tinyxml2.mk | 1 + buildroot/package/tpm2-tss/tpm2-tss.mk | 2 + ...PIC-builds-with-newer-gcc-binutils-w.patch | 91 + buildroot/package/uclibc/uclibc.mk | 2 + buildroot/package/udisks/udisks.mk | 1 + buildroot/package/uhd/Config.in | 4 + buildroot/package/unscd/Config.in | 2 + ...-automake-add-subdir-objects-option.patch} | 0 ...OMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch | 41 - ...d-use-pkg-config-to-get-tremor-libs.patch} | 0 ...-using-uClibc-by-adding-sys-types.h.patch} | 0 ...on-t-assume-strerror_l-is-available.patch} | 0 ...ent-run-time-fallback-to-real-time-.patch} | 0 ...ch => 0007-Add-support-for-freerdp2.patch} | 0 ...-use-AC_PATH_PROG-to-check-for-wayl.patch} | 0 ...ter-opencv_example.cpp-fix-build-wi.patch} | 0 ...ive555.cpp-fix-build-with-live555-20.patch | 36 + buildroot/package/vlc/Config.in | 2 + buildroot/package/vlc/vlc.hash | 8 +- buildroot/package/vlc/vlc.mk | 2 +- buildroot/package/waylandpp/Config.in | 6 +- buildroot/package/webkitgtk/Config.in | 3 + buildroot/package/webkitgtk/webkitgtk.mk | 1 + buildroot/package/weston/weston.mk | 1 + buildroot/package/wireshark/wireshark.hash | 6 +- buildroot/package/wireshark/wireshark.mk | 2 +- ...dbool.h-to-allow-C99-bool-to-be-used.patch | 32 + ...-functions-for-recognizing-tag-value.patch | 37 + buildroot/package/wpewebkit/Config.in | 1 + buildroot/package/x11r7/libxcb/libxcb.mk | 1 + .../package/x11r7/xlib_libFS/xlib_libFS.mk | 2 + .../package/x11r7/xlib_libICE/xlib_libICE.mk | 2 + .../x11r7/xlib_libX11/xlib_libX11.hash | 6 +- .../package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- .../x11r7/xlib_libXcursor/xlib_libXcursor.mk | 2 + .../x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 2 + .../x11r7/xlib_libXext/xlib_libXext.mk | 2 + .../x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 + .../x11r7/xlib_libXfont2/xlib_libXfont2.mk | 2 + .../xlib_libXinerama/xlib_libXinerama.mk | 2 + .../package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 + .../x11r7/xlib_libXres/xlib_libXres.mk | 2 + .../package/x11r7/xlib_libXt/xlib_libXt.mk | 2 + .../x11r7/xlib_libXtst/xlib_libXtst.mk | 2 + .../xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 + .../x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 + .../package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 + buildroot/package/xterm/xterm.hash | 2 +- buildroot/package/xterm/xterm.mk | 2 +- buildroot/support/misc/Vagrantfile | 2 +- buildroot/support/scripts/pkg-stats | 4 +- .../support/testing/conf/docker-compose.yml | 5 + .../tests/package/test_docker_compose.py | 9 +- 283 files changed, 4222 insertions(+), 700 deletions(-) rename buildroot-patches/{0009-package-docker-proxy-bump-version-to-b3507428be5b.patch => 0006-package-docker-proxy-bump-version-to-b3507428be5b.patch} (83%) rename buildroot-patches/{0011-package-rpi-firmware-bump-version-to-1.20210303.patch => 0007-package-rpi-firmware-bump-version-to-1.20210303.patch} (82%) delete mode 100644 buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch delete mode 100644 buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch create mode 100644 buildroot/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch delete mode 100644 buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch create mode 100644 buildroot/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch delete mode 100644 buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch create mode 100644 buildroot/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch create mode 100644 buildroot/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch create mode 100644 buildroot/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch create mode 100644 buildroot/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch create mode 100644 buildroot/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch delete mode 100644 buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch create mode 100644 buildroot/package/gupnp/0001-doc-Check-for-stylesheet-existence-on-doc-build.patch create mode 100644 buildroot/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch create mode 100644 buildroot/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch create mode 100644 buildroot/package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch create mode 100644 buildroot/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch create mode 100644 buildroot/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch create mode 100644 buildroot/package/libcurl/0001-bearssl-remove-incorrect-const-on-variable-that-is-m.patch create mode 100644 buildroot/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch create mode 100644 buildroot/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch create mode 100644 buildroot/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch delete mode 100644 buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch delete mode 100644 buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch delete mode 100644 buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch create mode 100644 buildroot/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch create mode 100644 buildroot/package/llvm/0001-nfc-Fix-missing-include.patch create mode 100644 buildroot/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch create mode 100644 buildroot/package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch create mode 100644 buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch create mode 100644 buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch create mode 100644 buildroot/package/lttng-tools/0001-configure.ac-add-disable-tests.patch delete mode 100644 buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch create mode 100644 buildroot/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch create mode 100644 buildroot/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch create mode 100644 buildroot/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch create mode 100644 buildroot/package/mutt/0005-Fix-seqset-iterator-when-it-ends-in-a-comma.patch create mode 100644 buildroot/package/nginx/0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch create mode 100644 buildroot/package/opentyrian/opentyrian.hash create mode 100644 buildroot/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch create mode 100644 buildroot/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch create mode 100644 buildroot/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch create mode 100644 buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch rename buildroot/package/vlc/{0003-automake-add-subdir-objects-option.patch => 0002-automake-add-subdir-objects-option.patch} (100%) delete mode 100644 buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch rename buildroot/package/vlc/{0004-build-use-pkg-config-to-get-tremor-libs.patch => 0003-build-use-pkg-config-to-get-tremor-libs.patch} (100%) rename buildroot/package/vlc/{0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch => 0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch} (100%) rename buildroot/package/vlc/{0006-Don-t-assume-strerror_l-is-available.patch => 0005-Don-t-assume-strerror_l-is-available.patch} (100%) rename buildroot/package/vlc/{0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch => 0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch} (100%) rename buildroot/package/vlc/{0008-Add-support-for-freerdp2.patch => 0007-Add-support-for-freerdp2.patch} (100%) rename buildroot/package/vlc/{0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch => 0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch} (100%) rename buildroot/package/vlc/{0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch => 0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch} (100%) create mode 100644 buildroot/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch create mode 100644 buildroot/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch create mode 100644 buildroot/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch diff --git a/buildroot-patches/0001-docker-add-AppArmor-support.patch b/buildroot-patches/0001-docker-add-AppArmor-support.patch index 0b0a4fe12..5f1f4bfa1 100644 --- a/buildroot-patches/0001-docker-add-AppArmor-support.patch +++ b/buildroot-patches/0001-docker-add-AppArmor-support.patch @@ -1,8 +1,8 @@ -From 9c98c07abbe9ee675ec588ad7c15f0285e8a0f07 Mon Sep 17 00:00:00 2001 -Message-Id: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From 09f9b55b419ef01ad24998bbacb1a49976b58bfa Mon Sep 17 00:00:00 2001 +Message-Id: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 -Subject: [PATCH 1/9] docker: add AppArmor support +Subject: [PATCH 1/7] docker: add AppArmor support Signed-off-by: Pascal Vizeli Signed-off-by: Stefan Agner @@ -27,5 +27,5 @@ index e229d9cb54..e968518a69 100644 DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf DOCKER_CONTAINERD_TAGS += seccomp -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0002-network-manager-wpa_supplicant.patch b/buildroot-patches/0002-network-manager-wpa_supplicant.patch index 91c9b1c62..8fb84bf93 100644 --- a/buildroot-patches/0002-network-manager-wpa_supplicant.patch +++ b/buildroot-patches/0002-network-manager-wpa_supplicant.patch @@ -1,10 +1,10 @@ -From dc4191d1393e2d25e1270d6b7c60d780b52f6179 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From e06ba47c59eec31475a8302fca569a0315158154 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 14:32:45 +0000 -Subject: [PATCH 2/9] network-manager: wpa_supplicant +Subject: [PATCH 2/7] 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 9402564cb4..79ae42e987 100644 +index 607c2b402b..c8351d8730 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 @@ -42,5 +42,5 @@ index 9402564cb4..79ae42e987 100644 NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING NETWORK_MANAGER_CPE_ID_VENDOR = gnome -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0003-Fix-dhcp-client.patch b/buildroot-patches/0003-Fix-dhcp-client.patch index cfbf4fd72..4481c838f 100644 --- a/buildroot-patches/0003-Fix-dhcp-client.patch +++ b/buildroot-patches/0003-Fix-dhcp-client.patch @@ -1,10 +1,10 @@ -From 3ca46afd47a195d35bca247c75f02f3c95f1c1ef Mon Sep 17 00:00:00 2001 -Message-Id: <3ca46afd47a195d35bca247c75f02f3c95f1c1ef.1618500237.git.stefan@agner.ch> -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From 654f5326428f1f442369589ce74333a44293fac2 Mon Sep 17 00:00:00 2001 +Message-Id: <654f5326428f1f442369589ce74333a44293fac2.1624118991.git.stefan@agner.ch> +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:01:44 +0000 -Subject: [PATCH 3/9] Fix dhcp client +Subject: [PATCH 3/7] 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 988c7792dc..d8f331719a 100644 +index 1edb3c5e99..b945c46b18 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk -@@ -77,8 +77,7 @@ endif +@@ -79,8 +79,7 @@ endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) define DHCP_INSTALL_CLIENT @@ -26,5 +26,5 @@ index 988c7792dc..d8f331719a 100644 install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch index d56fa2458..6be39aba0 100644 --- a/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch +++ b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch @@ -1,10 +1,10 @@ -From d6d381417d7e1aa442b27a699e790572b2b233d2 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From 81093c8655737f9208df3b75371290600625bec8 Mon Sep 17 00:00:00 2001 +Message-Id: <81093c8655737f9208df3b75371290600625bec8.1624118991.git.stefan@agner.ch> +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 8 Feb 2021 14:08:28 +0100 -Subject: [PATCH 4/9] package/rpi-firmware: Allow to deploy multiple firmware +Subject: [PATCH 4/7] package/rpi-firmware: Allow to deploy multiple firmware files Add a new config option to allow a specific list of firmware files to be @@ -72,5 +72,5 @@ index f3d28ef825..58085a8ca8 100644 $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch index 328437f3c..8d8bba7ea 100644 --- a/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch +++ b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch @@ -1,10 +1,10 @@ -From de154cd65e16420abc726bd25b5a35c70b81623f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From f93e6246fbc58814dd4547eade63102c7626b76b Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Stefan Agner Date: Wed, 17 Mar 2021 14:48:43 +0100 -Subject: [PATCH 5/9] package/linux-firmware: add RTL87XX/RTL88XX Bluetooth +Subject: [PATCH 5/7] package/linux-firmware: add RTL87XX/RTL88XX Bluetooth firmware Add firmware files for Realtek 87XX and 88XX Bluetooth chipsets. Those @@ -70,5 +70,5 @@ index f23da171c6..9c512ab750 100644 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch b/buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch similarity index 83% rename from buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch rename to buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch index 79985a1b2..7efa69448 100644 --- a/buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch +++ b/buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch @@ -1,10 +1,10 @@ -From f69e0329ecb778a680a7337024f49eda79bab5b8 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From 28a2450108743762b3b43629c86248f5fe45aa70 Mon Sep 17 00:00:00 2001 +Message-Id: <28a2450108743762b3b43629c86248f5fe45aa70.1624118991.git.stefan@agner.ch> +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 15 Apr 2021 17:22:59 +0200 -Subject: [PATCH 9/9] package/docker-proxy: bump version to b3507428be5b +Subject: [PATCH 6/7] package/docker-proxy: bump version to b3507428be5b Which is the version used by docker 20.10.6: https://github.com/moby/moby/commit/88470052e7d42f3dc774442241fd6bab817876f6 @@ -40,5 +40,5 @@ index 6600b24ed9..7270834119 100644 DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210303.patch b/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch similarity index 82% rename from buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210303.patch rename to buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch index b8f4abc58..8532d3566 100644 --- a/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210303.patch +++ b/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch @@ -1,10 +1,10 @@ -From 5cffe6f96bcab32bbe5019bc4426c1cbdd7f2593 Mon Sep 17 00:00:00 2001 -Message-Id: <5cffe6f96bcab32bbe5019bc4426c1cbdd7f2593.1618824199.git.stefan@agner.ch> -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618824199.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618824199.git.stefan@agner.ch> +From 30030f11ea80bee5f25136a3caf070a9b97e8b10 Mon Sep 17 00:00:00 2001 +Message-Id: <30030f11ea80bee5f25136a3caf070a9b97e8b10.1624118991.git.stefan@agner.ch> +In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> +References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1624118991.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 19 Apr 2021 10:59:03 +0200 -Subject: [PATCH 11/11] package/rpi-firmware: bump version to 1.20210303 +Subject: [PATCH 7/7] package/rpi-firmware: bump version to 1.20210303 Keep rpi-firmware up-to-date with the kernel version bump (tag 1.20210303). @@ -38,5 +38,5 @@ index 58085a8ca8..ea82836900 100644 RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- -2.31.1 +2.32.0 diff --git a/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch b/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch deleted file mode 100644 index 70a188508..000000000 --- a/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b169d34718e596e885c34b4fda9af4f85fbc5f1f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -From: Stefan Agner -Date: Thu, 15 Apr 2021 17:22:23 +0200 -Subject: [PATCH 7/9] package/runc: bump to version 1.0.0-rc93 - -Signed-off-by: Stefan Agner ---- - package/runc/runc.hash | 2 +- - package/runc/runc.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/runc/runc.hash b/package/runc/runc.hash -index d792947d5f..0f9cfbbe9a 100644 ---- a/package/runc/runc.hash -+++ b/package/runc/runc.hash -@@ -1,3 +1,3 @@ - # Locally computed --sha256 28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f runc-1.0.0-rc92.tar.gz -+sha256 e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8 runc-1.0.0-rc93.tar.gz - sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE -diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index 14689bbde1..c5cb57bdc8 100644 ---- a/package/runc/runc.mk -+++ b/package/runc/runc.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - RUNC_VERSION_MAJOR = 1.0.0 --RUNC_VERSION_MINOR = rc92 -+RUNC_VERSION_MINOR = rc93 - RUNC_VERSION = $(RUNC_VERSION_MAJOR)-$(RUNC_VERSION_MINOR) - RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) - RUNC_LICENSE = Apache-2.0 --- -2.31.1 - diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 35f8fbec0..80c0125b8 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,48 @@ +2021.02.3, released June 12th, 2021 + + Important / security related fixes. + + CPE meta data has been added for a large number of packages + + Updated/fixed packages: acpid, apache, apcupsd, assimp, bird, + bitcoin, blktrace, boost, capnproto, chrony, dc3dd, dhcp, + directfb, dmalloc, docker-engine, ebtables, efibootmgr, + enlightenment, enscript, environment-setup, exempi, expat, + findutils, flatcc, fluidsynth, frr, gdb, go, gptfdisk, grpc, + gst1-plugins-bad, gst1-rtsp-server, gstreamer1, gupnp, + hostapd, hwloc, i2c-tools, iftop, imagemagick, imx-gpu-viv, + intel-mediadriver, intel-microcode, jquery-validation, + keepalived, kodi, less, libcamera, libcurl, libcutl, libesmtp, + libeXosip2, libffi, libfuse, libfuse3, libgeos, libgtk2, + libgtk3, libical, libidn, libidn2, libkcapi, libldns, libmms, + libmodbus, libmspack, libnids, libopenh264, liboping, libraw, + librelp, libsamplerate, libtirpc, libusb, libuv, libxcb, + libxml2, libxslt, live555, llvm, lmbench, localedef, + lttng-tools, lvm2, lz4, mesa3d, mimic, mini-snmpd, minidlna, + minissdpd, minizip, mono-gtksharp3, mpg123, mpv, msmtp, musl, + mutt, nasm, nbd, netperf, netsurf, nginx, odb, opencv3, + openssh, opentyrian, oprofile, p7zip, paho-mqtt-c, perl, + php-imagick, pifmrds, picocom, pigz, pngquant, poco, + postgresql, prosody, proxychains-ng, pulseaudio, putty, pwgen, + python-autobahn, python-bluezero, python-engineio, + python-keyring, python-pillow, python-requests, python-tqdm, + qemu, qpdf, qt5base, redis, refpolicy, rt-tests, runc, + shellinabox, squid, strace, supervisor, synergy, taglib, + tclap, terminology, thermald, tini, tinyproxy, tinyxml2, + tpm2-tss, uclibc, udisks, uhd, unscd, vlc, waylandpp, + webkitgtk, weston, wireshark, wpa_supplicant, wpewebkit, + xlib_libdmx, xlib_libFS, xlib_libICE, xlib_libX11, + xlib_libXcursor, xlib_libXdmcp, xlib_libXext, xlib_libXfixes, + xlib_libXfont2, xlib_libXinerama, xlib_libXpm, xlib_libXres, + xlib_libXt, xlib_libXtst, xlib_libXxf86dga, xlib_libXxf86vm, + xterm + + Issues resolved (http://bugs.uclibc.org): + + #13781: isc dhcp-server package don't create file /usr/bin/dhcpd + #13801: toolchainfile.cmake CMAKE_BUILD_TYPE + #13806: Building host-localedef fails on fedora 34/gcc 11 + 2021.02.2, released May 12th, 2021 Important / security related fixes. diff --git a/buildroot/Config.in b/buildroot/Config.in index e35a78fb7..18a90b3f6 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -715,6 +715,8 @@ comment "Security Hardening Options" config BR2_PIC_PIE bool "Build code with PIC/PIE" + # Nios2 toolchains produce non working binaries with -fPIC + depends on !BR2_nios2 depends on BR2_SHARED_LIBS depends on BR2_TOOLCHAIN_SUPPORTS_PIE help @@ -722,6 +724,7 @@ config BR2_PIC_PIE Position-Independent Executables (PIE). comment "PIC/PIE needs a toolchain w/ PIE" + depends on !BR2_nios2 depends on BR2_SHARED_LIBS depends on !BR2_TOOLCHAIN_SUPPORTS_PIE @@ -808,6 +811,7 @@ config BR2_RELRO_PARTIAL config BR2_RELRO_FULL bool "Full" + depends on !BR2_nios2 # BR2_PIC_PIE depends on BR2_TOOLCHAIN_SUPPORTS_PIE select BR2_PIC_PIE help @@ -816,6 +820,7 @@ config BR2_RELRO_FULL program loading, i.e every time an executable is started. comment "RELRO Full needs a toolchain w/ PIE" + depends on !BR2_nios2 depends on !BR2_TOOLCHAIN_SUPPORTS_PIE endchoice diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 52dabb9d1..a5b325626 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -309,6 +309,7 @@ F: package/apache/ F: package/apr/ F: package/apr-util/ F: package/bcg729/ +F: package/bitcoin/ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ @@ -331,8 +332,12 @@ F: package/gkrellm/ F: package/gli/ F: package/glmark2/ F: package/gpsd/ +F: package/gptfdisk/ F: package/hdparm/ F: package/inih/ +F: package/intel-gmmlib/ +F: package/intel-mediadriver/ +F: package/intel-mediasdk/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ @@ -487,16 +492,6 @@ F: package/libsvg-cairo/ N: Cédric Chépied F: package/znc/ -N: Chakra Divi -F: board/friendlyarm/nanopi-m1 -F: board/friendlyarm/nanopi-m1-plus -F: board/olimex/a13_olinuxino -F: board/orangepi/orangepi-plus -F: configs/friendlyarm_nanopi_m1_defconfig -F: configs/friendlyarm_nanopi_m1_plus_defconfig -F: configs/olimex_a13_olinuxino_defconfig -F: configs/orangepi_plus_defconfig - N: Chris Packham F: package/coremark/ F: package/coremark-pro/ @@ -673,6 +668,7 @@ F: package/ipcalc/ N: Dick Olsson F: package/bearssl/ +F: package/bitcoin/ F: package/execline/ F: package/mdevd/ F: package/s6-dns/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 83e90317e..7e896e907 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.2 +export BR2_VERSION := 2021.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1620810000 +BR2_VERSION_EPOCH = 1623509900 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/README b/buildroot/README index c6172524d..008e996f5 100644 --- a/buildroot/README +++ b/buildroot/README @@ -20,7 +20,7 @@ Buildroot comes with a basic configuration for a number of boards. Run Please feed suggestions, bug reports, insults, and bribes back to the buildroot mailing list: buildroot@buildroot.org -You can also find us on #buildroot on Freenode IRC. +You can also find us on #buildroot on OFTC IRC. If you would like to contribute patches, please read https://buildroot.org/manual.html#submitting-patches diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 4ba10a3f8..bf02256cb 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2021.02.2 manual generated on 2021-05-12 -09:07:43 UTC from git revision 76b4f9e9b6

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.3 manual generated on 2021-06-12 +15:00:38 UTC from git revision 5293208a57

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 @@ -224,8 +224,8 @@ via Gmane, at Please search the mailing list archives before asking questions, since there is a good chance someone else has asked the same question before.

IRC -

The Buildroot IRC channel #buildroot is -hosted on Freenode. It is a useful place to +

The Buildroot IRC channel #buildroot is +hosted on OFTC. It is a useful place to ask quick questions or discuss on certain topics.

When asking for help on IRC, share relevant logs or pieces of code using a code sharing website, such as http://code.bulix.org.

Note that for certain questions, posting to the mailing list may be better as it will reach more people, both developers and users.

diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 56028ec41a6f2660a934b3b046854c753c2bf728..dc9f63ccc506cc4aa5d8618c071a925b06ef4557 100644 GIT binary patch delta 15990 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 F{{ssO?#2KB delta 15973 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 QA{Z`iSaNc4MG4sd2ltQ;i2wiq diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index b96ebc427..7b018d584 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -174,13 +174,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2021.02.2 manual generated on 2021-05-12 09:07:48 UTC from -git revision 76b4f9e9b6 +Buildroot 2021.02.3 manual generated on 2021-06-12 15:00:43 UTC from +git revision 5293208a57 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -76b4f9e9b658d3a4a72266e4aa2e63aa7a3f54f9] file in the Buildroot +5293208a57ce78f9fc958704d7df52f28532cde6] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -488,9 +488,9 @@ Mailing List IRC - The Buildroot IRC channel #buildroot [irc://freenode.net/# - buildroot] is hosted on Freenode [http://webchat.freenode.net]. - It is a useful place to ask quick questions or discuss on certain + The Buildroot IRC channel #buildroot [irc://irc.oftc.net/# + buildroot] is hosted on OFTC [https://www.oftc.net/WebChat/]. It + is a useful place to ask quick questions or discuss on certain topics. When asking for help on IRC, share relevant logs or pieces of diff --git a/buildroot/docs/manual/resources.txt b/buildroot/docs/manual/resources.txt index 69bfff8f2..374cdef94 100644 --- a/buildroot/docs/manual/resources.txt +++ b/buildroot/docs/manual/resources.txt @@ -29,8 +29,8 @@ there is a good chance someone else has asked the same question before. IRC:: + -The Buildroot IRC channel irc://freenode.net/#buildroot[#buildroot] is -hosted on http://webchat.freenode.net[Freenode]. It is a useful place to +The Buildroot IRC channel irc://irc.oftc.net/#buildroot[#buildroot] is +hosted on https://www.oftc.net/WebChat/[OFTC]. It is a useful place to ask quick questions or discuss on certain topics. + When asking for help on IRC, share relevant logs or pieces of code diff --git a/buildroot/docs/website/support.html b/buildroot/docs/website/support.html index 6c602b42d..eef969d46 100644 --- a/buildroot/docs/website/support.html +++ b/buildroot/docs/website/support.html @@ -19,15 +19,15 @@
-

The Buildroot IRC channel is - #buildroot, hosted on Freenode. If you do not have an IRC client, you can - use the Freenode web interface. +

The Buildroot IRC channel is + #buildroot, hosted on OFTC. If you do not have an IRC client, you can + use the OFTC web interface. When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on Freenode, the channel can only be +

Note that due to excessive spamming on IRC, the channel can only be joined if you are a registered user with - Freenode nickserv + OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index 2eef1f083..d8897ccc8 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.35" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.43" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.182-cip45" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.165-cip41-rt18" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index ea0b0bb31..3944f371d 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd linux-5.10.35.tar.xz -sha256 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770 linux-5.4.117.tar.xz +sha256 83b81e433ba2f8ee143064fb163699ee857e26dd789006bc1e9edf1ccd0bd403 linux-5.10.43.tar.xz +sha256 17ee750a4aeb1c883d721e730d1f7e2855124585e2f47766864a1359a7ebe33c linux-5.4.125.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 6817ad26e1621bfad48d08b638f66c5933e89c7c8c00d43195b2e0ae260233eb linux-4.4.268.tar.xz -sha256 5b66f6ce0137fb8d81004bcf2f1e3cbe01c38aab74268656c4ba015c1ccd762a linux-4.9.268.tar.xz -sha256 1dc19361f6970bc94cc62be066702483db9cbd3d63f3089a8c90dabfced74369 linux-4.14.232.tar.xz -sha256 6f9c2aee8553129d2bdbab646bbf7e88c2a5c38c0b1450f2e728831681bfc85d linux-4.19.190.tar.xz +sha256 d13fa552be602825c443fcca90d6bdd72f4ebef809889ef015dba4593d3224ab linux-4.4.272.tar.xz +sha256 f8bf0c390ae40ca736e104f10f744446bc534bf87ba1b6dbb2b7c9a8bece1058 linux-4.9.272.tar.xz +sha256 e4eae297a6fefefd8ce4781d98178a7c1ee51ca0a4c8a7e46e61b121fbab8b2a linux-4.14.236.tar.xz +sha256 aaaebdccf599f77148fe170642fa7dc2452cf994b5cbbb4d39cab9e7f4058896 linux-4.19.194.tar.xz # Locally computed sha256 9f1de83c5c2bb582a33bd4ee892d45671901cd06af9dc159f0f499f1b5265b20 linux-cip-4.19.182-cip45.tar.gz sha256 0eeba6d6ecc45cf8f16458842b64d22e7064b9de9c31c11d1c395b08a47e3855 linux-cip-4.19.165-cip41-rt18.tar.gz diff --git a/buildroot/package/acpid/acpid.mk b/buildroot/package/acpid/acpid.mk index ff6e62b5c..3473e7b5f 100644 --- a/buildroot/package/acpid/acpid.mk +++ b/buildroot/package/acpid/acpid.mk @@ -9,6 +9,8 @@ ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 ACPID_LICENSE = GPL-2.0+ ACPID_LICENSE_FILES = COPYING +ACPID_CPE_ID_VENDOR = tedfelix +ACPID_CPE_ID_PRODUCT = acpid2 define ACPID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/acpid/acpid.service \ diff --git a/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch b/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch deleted file mode 100644 index af3cd47a3..000000000 --- a/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5b95d256387b45fbe33f7ee7890ae35afdd5c371 Mon Sep 17 00:00:00 2001 -From: Joe Orton -Date: Fri, 13 Mar 2020 14:34:18 +0000 -Subject: [PATCH] * server/log.c (ap_log_pid): Use a temporary file, then - rename once successfully written; also add error checking. Avoids startup - failures if a previous httpd invocation crashed while writing the pidfile. - -Submitted by: Nicolas Carrier , jorton -Github: closes #100, closes #69 -PR: 63140 - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875153 13f79535-47bb-0310-9956-ffa450edef68 -Signed-off-by: Nicolas Carrier ---- - server/log.c | 33 ++++++++++++++++++++++++++------- - 1 file changed, 26 insertions(+), 7 deletions(-) - -diff --git a/server/log.c b/server/log.c -index f0bde6e4b8..8d54b4e057 100644 ---- a/server/log.c -+++ b/server/log.c -@@ -1598,6 +1598,9 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) - pid_t mypid; - apr_status_t rv; - const char *fname; -+ char *temp_fname; -+ apr_fileperms_t perms; -+ char pidstr[64]; - - if (!filename) { - return; -@@ -1626,19 +1629,35 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) - fname); - } - -- if ((rv = apr_file_open(&pid_file, fname, -- APR_WRITE | APR_CREATE | APR_TRUNCATE, -- APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p)) -- != APR_SUCCESS) { -+ temp_fname = apr_pstrcat(p, fname, ".XXXXXX", NULL); -+ rv = apr_file_mktemp(&pid_file, temp_fname, -+ APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE, p); -+ if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(00099) -- "could not create %s", fname); -+ "could not create %s", temp_fname); - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, APLOGNO(00100) - "%s: could not log pid to file %s", - ap_server_argv0, fname); - exit(1); - } -- apr_file_printf(pid_file, "%" APR_PID_T_FMT APR_EOL_STR, mypid); -- apr_file_close(pid_file); -+ -+ apr_snprintf(pidstr, sizeof pidstr, "%" APR_PID_T_FMT APR_EOL_STR, mypid); -+ -+ perms = APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD; -+ rv = apr_file_perms_set(temp_fname, perms); -+ if (rv == APR_SUCCESS) -+ rv = apr_file_write_full(pid_file, pidstr, strlen(pidstr), NULL); -+ if (rv == APR_SUCCESS) -+ rv = apr_file_close(pid_file); -+ if (rv == APR_SUCCESS) -+ rv = apr_file_rename(temp_fname, fname, p); -+ if (rv != APR_SUCCESS) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(10231) -+ "%s: Failed creating pid file %s", -+ ap_server_argv0, temp_fname); -+ exit(1); -+ } -+ - saved_pid = mypid; - } - --- -2.25.2 - diff --git a/buildroot/package/apache/apache.hash b/buildroot/package/apache/apache.hash index bd3f6ac7b..c03934b40 100644 --- a/buildroot/package/apache/apache.hash +++ b/buildroot/package/apache/apache.hash @@ -1,5 +1,5 @@ # From http://archive.apache.org/dist/httpd/httpd-2.4.46.tar.bz2.{sha256,sha512} -sha256 740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea httpd-2.4.46.tar.bz2 -sha512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 httpd-2.4.46.tar.bz2 +sha256 1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c httpd-2.4.48.tar.bz2 +sha512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 httpd-2.4.48.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk index 6b9d18ac0..7dbd1a451 100644 --- a/buildroot/package/apache/apache.mk +++ b/buildroot/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.46 +APACHE_VERSION = 2.4.48 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 diff --git a/buildroot/package/apcupsd/apcupsd.mk b/buildroot/package/apcupsd/apcupsd.mk index 410bce9ae..9e707e1a5 100644 --- a/buildroot/package/apcupsd/apcupsd.mk +++ b/buildroot/package/apcupsd/apcupsd.mk @@ -8,6 +8,7 @@ APCUPSD_VERSION = 3.14.14 APCUPSD_SITE = http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/$(APCUPSD_VERSION) APCUPSD_LICENSE = GPL-2.0 APCUPSD_LICENSE_FILES = COPYING +APCUPSD_CPE_ID_VENDOR = apcupsd APCUPSD_CONF_OPTS = --disable-test ifneq ($(BR2_PACKAGE_APCUPSD_MODBUS_USB)$(BR2_PACKAGE_APCUPSD_USB),) diff --git a/buildroot/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch b/buildroot/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch new file mode 100644 index 000000000..4b86cc584 --- /dev/null +++ b/buildroot/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch @@ -0,0 +1,1638 @@ +From f78446b14aff46db2ef27d062a275b6a01fd68b1 Mon Sep 17 00:00:00 2001 +From: Kim Kulling +Date: Tue, 19 Nov 2019 20:30:40 +0100 +Subject: [PATCH] closes https://github.com/assimp/assimp/issues/2733: update + of zlip to fix gcc build for v9.2.0 32 bit + +[Retrieved (and updated to remove .gitignore and appveyor.yml) from: +https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1] +Signed-off-by: Fabrice Fontaine +--- + contrib/zip/.gitignore | 2 + + contrib/zip/CMakeLists.txt | 83 +++++- + contrib/zip/README.md | 12 +- + contrib/zip/appveyor.yml | 2 +- + contrib/zip/src/miniz.h | 457 ++++++++++++++++++++++++++++---- + contrib/zip/src/zip.c | 62 +++-- + contrib/zip/src/zip.h | 457 ++++++++++++++++---------------- + contrib/zip/test/CMakeLists.txt | 27 +- + contrib/zip/test/test.c | 38 ++- + contrib/zip/test/test_miniz.c | 25 +- + 10 files changed, 821 insertions(+), 344 deletions(-) + +diff --git a/contrib/zip/CMakeLists.txt b/contrib/zip/CMakeLists.txt +index b46dbb1db0..77916d2e14 100644 +--- a/contrib/zip/CMakeLists.txt ++++ b/contrib/zip/CMakeLists.txt +@@ -1,10 +1,14 @@ +-cmake_minimum_required(VERSION 2.8) +-project(zip) +-enable_language(C) ++cmake_minimum_required(VERSION 3.0) ++ ++project(zip ++ LANGUAGES C ++ VERSION "0.1.15") + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + ++option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) ++ + if (MSVC) +- # Use secure functions by defaualt and suppress warnings about "deprecated" functions ++ # Use secure functions by default and suppress warnings about "deprecated" functions + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") +@@ -12,28 +16,80 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") ++ if(ENABLE_COVERAGE) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") ++ endif() + endif (MSVC) + + # zip + set(SRC src/miniz.h src/zip.h src/zip.c) + add_library(${PROJECT_NAME} ${SRC}) +-target_include_directories(${PROJECT_NAME} INTERFACE src) ++target_include_directories(${PROJECT_NAME} PUBLIC ++ $ ++ $ ++) + + # test + if (NOT CMAKE_DISABLE_TESTING) + enable_testing() + add_subdirectory(test) + find_package(Sanitizers) +- add_sanitizers(${PROJECT_NAME} test.exe) +- add_sanitizers(${PROJECT_NAME} test_miniz.exe) ++ add_sanitizers(${PROJECT_NAME} ${test_out} ${test_miniz_out}) + endif() + ++#### ++# Installation (https://github.com/forexample/package-example) { ++ ++set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") ++set(INCLUDE_INSTALL_DIR "include") ++ ++set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") ++ ++# Configuration ++set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") ++set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") ++set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") ++set(NAMESPACE "${PROJECT_NAME}::") ++ ++# Include module with fuction 'write_basic_package_version_file' ++include(CMakePackageConfigHelpers) ++ ++# Note: PROJECT_VERSION is used as a VERSION ++write_basic_package_version_file( ++ "${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion ++) ++ ++# Use variables: ++# * TARGETS_EXPORT_NAME ++# * PROJECT_NAME ++configure_package_config_file( ++ "cmake/Config.cmake.in" ++ "${PROJECT_CONFIG}" ++ INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++install( ++ FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" ++ DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++install( ++ EXPORT "${TARGETS_EXPORT_NAME}" ++ NAMESPACE "${NAMESPACE}" ++ DESTINATION "${CONFIG_INSTALL_DIR}" ++) ++ ++# } ++ + install(TARGETS ${PROJECT_NAME} ++ EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +- COMPONENT library) +-install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION include) ++ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} ++) ++install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION ${INCLUDE_INSTALL_DIR}/zip) + + # uninstall target (https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake) + if(NOT TARGET uninstall) +@@ -45,3 +101,12 @@ if(NOT TARGET uninstall) + add_custom_target(uninstall + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake) + endif() ++ ++find_package(Doxygen) ++if(DOXYGEN_FOUND) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) ++ add_custom_target(doc ++ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ++ COMMENT "Generating API documentation with Doxygen" VERBATIM) ++endif() +diff --git a/contrib/zip/README.md b/contrib/zip/README.md +index d5fb8cd203..14eb9a34c8 100644 +--- a/contrib/zip/README.md ++++ b/contrib/zip/README.md +@@ -71,7 +71,7 @@ int arg = 2; + zip_extract("foo.zip", "/tmp", on_extract_entry, &arg); + ``` + +-* Extract a zip entry into memory. ++* Extract a zip entry into memory. + ```c + void *buf = NULL; + size_t bufsize; +@@ -89,7 +89,7 @@ zip_close(zip); + free(buf); + ``` + +-* Extract a zip entry into memory (no internal allocation). ++* Extract a zip entry into memory (no internal allocation). + ```c + unsigned char *buf; + size_t bufsize; +@@ -110,7 +110,7 @@ zip_close(zip); + free(buf); + ``` + +-* Extract a zip entry into memory using callback. ++* Extract a zip entry into memory using callback. + ```c + struct buffer_t { + char *data; +@@ -144,7 +144,7 @@ free(buf.data); + ``` + + +-* Extract a zip entry into a file. ++* Extract a zip entry into a file. + ```c + struct zip_t *zip = zip_open("foo.zip", 0, 'r'); + { +@@ -157,7 +157,7 @@ struct zip_t *zip = zip_open("foo.zip", 0, 'r'); + zip_close(zip); + ``` + +-* List of all zip entries ++* List of all zip entries + ```c + struct zip_t *zip = zip_open("foo.zip", 0, 'r'); + int i, n = zip_total_entries(zip); +@@ -174,7 +174,7 @@ for (i = 0; i < n; ++i) { + zip_close(zip); + ``` + +-## Bindings ++# Bindings + Compile zip library as a dynamic library. + ```shell + $ mkdir build +diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h +index 2c27a94d8d..c4fcfb83e6 100644 +--- a/contrib/zip/src/miniz.h ++++ b/contrib/zip/src/miniz.h +@@ -221,6 +221,7 @@ + #ifndef MINIZ_HEADER_INCLUDED + #define MINIZ_HEADER_INCLUDED + ++#include + #include + + // Defines to completely disable specific portions of miniz.c: +@@ -284,7 +285,8 @@ + /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ + #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) + #if MINIZ_X86_OR_X64_CPU +-/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ ++/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient ++ * integer loads and stores from unaligned addresses. */ + #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 + #define MINIZ_UNALIGNED_USE_MEMCPY + #else +@@ -354,6 +356,44 @@ enum { + MZ_FIXED = 4 + }; + ++/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or ++ * modify this enum. */ ++typedef enum { ++ MZ_ZIP_NO_ERROR = 0, ++ MZ_ZIP_UNDEFINED_ERROR, ++ MZ_ZIP_TOO_MANY_FILES, ++ MZ_ZIP_FILE_TOO_LARGE, ++ MZ_ZIP_UNSUPPORTED_METHOD, ++ MZ_ZIP_UNSUPPORTED_ENCRYPTION, ++ MZ_ZIP_UNSUPPORTED_FEATURE, ++ MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, ++ MZ_ZIP_NOT_AN_ARCHIVE, ++ MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, ++ MZ_ZIP_UNSUPPORTED_MULTIDISK, ++ MZ_ZIP_DECOMPRESSION_FAILED, ++ MZ_ZIP_COMPRESSION_FAILED, ++ MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, ++ MZ_ZIP_CRC_CHECK_FAILED, ++ MZ_ZIP_UNSUPPORTED_CDIR_SIZE, ++ MZ_ZIP_ALLOC_FAILED, ++ MZ_ZIP_FILE_OPEN_FAILED, ++ MZ_ZIP_FILE_CREATE_FAILED, ++ MZ_ZIP_FILE_WRITE_FAILED, ++ MZ_ZIP_FILE_READ_FAILED, ++ MZ_ZIP_FILE_CLOSE_FAILED, ++ MZ_ZIP_FILE_SEEK_FAILED, ++ MZ_ZIP_FILE_STAT_FAILED, ++ MZ_ZIP_INVALID_PARAMETER, ++ MZ_ZIP_INVALID_FILENAME, ++ MZ_ZIP_BUF_TOO_SMALL, ++ MZ_ZIP_INTERNAL_ERROR, ++ MZ_ZIP_FILE_NOT_FOUND, ++ MZ_ZIP_ARCHIVE_TOO_LARGE, ++ MZ_ZIP_VALIDATION_FAILED, ++ MZ_ZIP_WRITE_CALLBACK_FAILED, ++ MZ_ZIP_TOTAL_ERRORS ++} mz_zip_error; ++ + // Method + #define MZ_DEFLATED 8 + +@@ -696,6 +736,7 @@ typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, + void *pBuf, size_t n); + typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, + const void *pBuf, size_t n); ++typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); + + struct mz_zip_internal_state_tag; + typedef struct mz_zip_internal_state_tag mz_zip_internal_state; +@@ -707,13 +748,27 @@ typedef enum { + MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 + } mz_zip_mode; + +-typedef struct mz_zip_archive_tag { ++typedef enum { ++ MZ_ZIP_TYPE_INVALID = 0, ++ MZ_ZIP_TYPE_USER, ++ MZ_ZIP_TYPE_MEMORY, ++ MZ_ZIP_TYPE_HEAP, ++ MZ_ZIP_TYPE_FILE, ++ MZ_ZIP_TYPE_CFILE, ++ MZ_ZIP_TOTAL_TYPES ++} mz_zip_type; ++ ++typedef struct { + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; +- mz_uint m_total_files; ++ ++ /* We only support up to UINT32_MAX files in zip64 mode. */ ++ mz_uint32 m_total_files; + mz_zip_mode m_zip_mode; ++ mz_zip_type m_zip_type; ++ mz_zip_error m_last_error; + +- mz_uint m_file_offset_alignment; ++ mz_uint64 m_file_offset_alignment; + + mz_alloc_func m_pAlloc; + mz_free_func m_pFree; +@@ -722,6 +777,7 @@ typedef struct mz_zip_archive_tag { + + mz_file_read_func m_pRead; + mz_file_write_func m_pWrite; ++ mz_file_needs_keepalive m_pNeeds_keepalive; + void *m_pIO_opaque; + + mz_zip_internal_state *m_pState; +@@ -1263,6 +1319,9 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, + int strategy); + #endif // #ifndef MINIZ_NO_ZLIB_APIS + ++#define MZ_UINT16_MAX (0xFFFFU) ++#define MZ_UINT32_MAX (0xFFFFFFFFU) ++ + #ifdef __cplusplus + } + #endif +@@ -1311,6 +1370,11 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; + ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) + #endif + ++#define MZ_READ_LE64(p) \ ++ (((mz_uint64)MZ_READ_LE32(p)) | \ ++ (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) \ ++ << 32U)) ++ + #ifdef _MSC_VER + #define MZ_FORCEINLINE __forceinline + #elif defined(__GNUC__) +@@ -4160,6 +4224,17 @@ enum { + MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, ++ ++ /* ZIP64 archive identifier and record sizes */ ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, ++ MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, ++ MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, ++ MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, ++ MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, ++ + // Central directory header record offsets + MZ_ZIP_CDH_SIG_OFS = 0, + MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, +@@ -4199,6 +4274,31 @@ enum { + MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, + MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, + MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, ++ ++ /* ZIP64 End of central directory locator offsets */ ++ MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ ++ MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ ++ MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ ++ MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ ++ ++ /* ZIP64 End of central directory header offsets */ ++ MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ ++ MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ ++ MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ ++ MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ ++ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ ++ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ ++ MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ ++ MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ ++ MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, ++ MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, ++ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 + }; + + typedef struct { +@@ -4211,7 +4311,24 @@ struct mz_zip_internal_state_tag { + mz_zip_array m_central_dir; + mz_zip_array m_central_dir_offsets; + mz_zip_array m_sorted_central_dir_offsets; ++ ++ /* The flags passed in when the archive is initially opened. */ ++ uint32_t m_init_flags; ++ ++ /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. ++ */ ++ mz_bool m_zip64; ++ ++ /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 ++ * will also be slammed to true too, even if we didn't find a zip64 end of ++ * central dir header, etc.) */ ++ mz_bool m_zip64_has_extended_info_fields; ++ ++ /* These fields are used by the file, FILE, memory, and memory/heap read/write ++ * helpers. */ + MZ_FILE *m_pFile; ++ mz_uint64 m_file_archive_start_ofs; ++ + void *m_pMem; + size_t m_mem_size; + size_t m_mem_capacity; +@@ -4363,6 +4480,13 @@ static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time, + #endif /* #ifndef MINIZ_NO_STDIO */ + #endif /* #ifndef MINIZ_NO_TIME */ + ++static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, ++ mz_zip_error err_num) { ++ if (pZip) ++ pZip->m_last_error = err_num; ++ return MZ_FALSE; ++} ++ + static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, + mz_uint32 flags) { + (void)flags; +@@ -4480,127 +4604,346 @@ mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) { + } + } + +-static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, +- mz_uint32 flags) { +- mz_uint cdir_size, num_this_disk, cdir_disk_index; +- mz_uint64 cdir_ofs; ++static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, ++ mz_uint32 record_sig, ++ mz_uint32 record_size, ++ mz_int64 *pOfs) { + mz_int64 cur_file_ofs; +- const mz_uint8 *p; + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; +- mz_bool sort_central_dir = +- ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); +- // Basic sanity checks - reject files which are too small, and check the first +- // 4 bytes of the file to make sure a local header is there. +- if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) ++ ++ /* Basic sanity checks - reject files which are too small */ ++ if (pZip->m_archive_size < record_size) + return MZ_FALSE; +- // Find the end of central directory record by scanning the file from the end +- // towards the beginning. ++ ++ /* Find the record by scanning the file from the end towards the beginning. */ + cur_file_ofs = + MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); + for (;;) { + int i, + n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); ++ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) + return MZ_FALSE; +- for (i = n - 4; i >= 0; --i) +- if (MZ_READ_LE32(pBuf + i) == MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) +- break; ++ ++ for (i = n - 4; i >= 0; --i) { ++ mz_uint s = MZ_READ_LE32(pBuf + i); ++ if (s == record_sig) { ++ if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) ++ break; ++ } ++ } ++ + if (i >= 0) { + cur_file_ofs += i; + break; + } ++ ++ /* Give up if we've searched the entire file, or we've gone back "too far" ++ * (~64kb) */ + if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= +- (0xFFFF + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) ++ (MZ_UINT16_MAX + record_size))) + return MZ_FALSE; ++ + cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); + } +- // Read and verify the end of central directory record. ++ ++ *pOfs = cur_file_ofs; ++ return MZ_TRUE; ++} ++ ++static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, ++ mz_uint flags) { ++ mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, ++ cdir_disk_index = 0; ++ mz_uint64 cdir_ofs = 0; ++ mz_int64 cur_file_ofs = 0; ++ const mz_uint8 *p; ++ ++ mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; ++ mz_uint8 *pBuf = (mz_uint8 *)buf_u32; ++ mz_bool sort_central_dir = ++ ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); ++ mz_uint32 zip64_end_of_central_dir_locator_u32 ++ [(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / ++ sizeof(mz_uint32)]; ++ mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; ++ ++ mz_uint32 zip64_end_of_central_dir_header_u32 ++ [(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / ++ sizeof(mz_uint32)]; ++ mz_uint8 *pZip64_end_of_central_dir = ++ (mz_uint8 *)zip64_end_of_central_dir_header_u32; ++ ++ mz_uint64 zip64_end_of_central_dir_ofs = 0; ++ ++ /* Basic sanity checks - reject files which are too small, and check the first ++ * 4 bytes of the file to make sure a local header is there. */ ++ if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (!mz_zip_reader_locate_header_sig( ++ pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, ++ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) ++ return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); ++ ++ /* Read and verify the end of central directory record. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) +- return MZ_FALSE; +- if ((MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != +- MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) || +- ((pZip->m_total_files = +- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS)) != +- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); ++ ++ if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != ++ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) { ++ if (pZip->m_pRead(pZip->m_pIO_opaque, ++ cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, ++ pZip64_locator, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) { ++ if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) { ++ zip64_end_of_central_dir_ofs = MZ_READ_LE64( ++ pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); ++ if (zip64_end_of_central_dir_ofs > ++ (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) ++ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); ++ ++ if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, ++ pZip64_end_of_central_dir, ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) { ++ if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == ++ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) { ++ pZip->m_pState->m_zip64 = MZ_TRUE; ++ } ++ } ++ } ++ } ++ } + ++ pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); ++ cdir_entries_on_this_disk = ++ MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); + cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); ++ cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); ++ cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); ++ ++ if (pZip->m_pState->m_zip64) { ++ mz_uint32 zip64_total_num_of_disks = ++ MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); ++ mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); ++ mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); ++ mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64( ++ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); ++ mz_uint64 zip64_size_of_central_directory = ++ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); ++ ++ if (zip64_size_of_end_of_central_dir_record < ++ (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ ++ if (zip64_total_num_of_disks != 1U) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ ++ /* Check for miniz's practical limits */ ++ if (zip64_cdir_total_entries > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); ++ ++ pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; ++ ++ if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); ++ ++ cdir_entries_on_this_disk = ++ (mz_uint32)zip64_cdir_total_entries_on_this_disk; ++ ++ /* Check for miniz's current practical limits (sorry, this should be enough ++ * for millions of files) */ ++ if (zip64_size_of_central_directory > MZ_UINT32_MAX) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); ++ ++ cdir_size = (mz_uint32)zip64_size_of_central_directory; ++ ++ num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + ++ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); ++ ++ cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + ++ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); ++ ++ cdir_ofs = ++ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); ++ } ++ ++ if (pZip->m_total_files != cdir_entries_on_this_disk) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ + if (((num_this_disk | cdir_disk_index) != 0) && + ((num_this_disk != 1) || (cdir_disk_index != 1))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + +- if ((cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS)) < +- pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) +- return MZ_FALSE; ++ if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + +- cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); + if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pZip->m_central_directory_file_ofs = cdir_ofs; + + if (pZip->m_total_files) { + mz_uint i, n; +- +- // Read the entire central directory into a heap block, and allocate another +- // heap block to hold the unsorted central dir file record offsets, and +- // another to hold the sorted indices. ++ /* Read the entire central directory into a heap block, and allocate another ++ * heap block to hold the unsorted central dir file record offsets, and ++ * possibly another to hold the sorted indices. */ + if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, + MZ_FALSE)) || + (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, + pZip->m_total_files, MZ_FALSE))) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (sort_central_dir) { + if (!mz_zip_array_resize(pZip, + &pZip->m_pState->m_sorted_central_dir_offsets, + pZip->m_total_files, MZ_FALSE)) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, + pZip->m_pState->m_central_dir.m_p, + cdir_size) != cdir_size) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + +- // Now create an index into the central directory file records, do some +- // basic sanity checking on each record, and check for zip64 entries (which +- // are not yet supported). ++ /* Now create an index into the central directory file records, do some ++ * basic sanity checking on each record */ + p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; + for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) { +- mz_uint total_header_size, comp_size, decomp_size, disk_index; ++ mz_uint total_header_size, disk_index, bit_flags, filename_size, ++ ext_data_size; ++ mz_uint64 comp_size, decomp_size, local_header_ofs; ++ + if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || + (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, + i) = + (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); ++ + if (sort_central_dir) + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, + mz_uint32, i) = i; ++ + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); +- if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && +- (decomp_size != comp_size)) || +- (decomp_size && !comp_size) || (decomp_size == 0xFFFFFFFF) || +- (comp_size == 0xFFFFFFFF)) +- return MZ_FALSE; ++ local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); ++ filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); ++ ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); ++ ++ if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && ++ (ext_data_size) && ++ (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == ++ MZ_UINT32_MAX)) { ++ /* Attempt to find zip64 extended information field in the entry's extra ++ * data */ ++ mz_uint32 extra_size_remaining = ext_data_size; ++ ++ if (extra_size_remaining) { ++ const mz_uint8 *pExtra_data; ++ void *buf = NULL; ++ ++ if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > ++ n) { ++ buf = MZ_MALLOC(ext_data_size); ++ if (buf == NULL) ++ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); ++ ++ if (pZip->m_pRead(pZip->m_pIO_opaque, ++ cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + ++ filename_size, ++ buf, ext_data_size) != ext_data_size) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); ++ } ++ ++ pExtra_data = (mz_uint8 *)buf; ++ } else { ++ pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; ++ } ++ ++ do { ++ mz_uint32 field_id; ++ mz_uint32 field_data_size; ++ ++ if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ field_id = MZ_READ_LE16(pExtra_data); ++ field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); ++ ++ if ((field_data_size + sizeof(mz_uint16) * 2) > ++ extra_size_remaining) { ++ MZ_FREE(buf); ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { ++ /* Ok, the archive didn't have any zip64 headers but it uses a ++ * zip64 extended information field so mark it as zip64 anyway ++ * (this can occur with infozip's zip util when it reads ++ * compresses files from stdin). */ ++ pZip->m_pState->m_zip64 = MZ_TRUE; ++ pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; ++ break; ++ } ++ ++ pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; ++ extra_size_remaining = ++ extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; ++ } while (extra_size_remaining); ++ ++ MZ_FREE(buf); ++ } ++ } ++ ++ /* I've seen archives that aren't marked as zip64 that uses zip64 ext ++ * data, argh */ ++ if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX)) { ++ if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && ++ (decomp_size != comp_size)) || ++ (decomp_size && !comp_size)) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ + disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS); +- if ((disk_index != num_this_disk) && (disk_index != 1)) +- return MZ_FALSE; +- if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + +- MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) +- return MZ_FALSE; ++ if ((disk_index == MZ_UINT16_MAX) || ++ ((disk_index != num_this_disk) && (disk_index != 1))) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); ++ ++ if (comp_size != MZ_UINT32_MAX) { ++ if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + ++ MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ } ++ ++ bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); ++ if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED) ++ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); ++ + if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > + n) +- return MZ_FALSE; ++ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); ++ + n -= total_header_size; + p += total_header_size; + } +diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c +index ff3a8fe1e6..1abcfd8fd1 100644 +--- a/contrib/zip/src/zip.c ++++ b/contrib/zip/src/zip.c +@@ -24,7 +24,6 @@ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) && \ + (P)[1] == ':') + #define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE(P) ? 2 : 0) +-#define ISSLASH(C) ((C) == '/' || (C) == '\\') + + #else + +@@ -48,7 +47,7 @@ int symlink(const char *target, const char *linkpath); // needed on Linux + #endif + + #ifndef ISSLASH +-#define ISSLASH(C) ((C) == '/') ++#define ISSLASH(C) ((C) == '/' || (C) == '\\') + #endif + + #define CLEANUP(ptr) \ +@@ -78,26 +77,34 @@ static const char *base_name(const char *name) { + return base; + } + +-static int mkpath(const char *path) { +- char const *p; ++static int mkpath(char *path) { ++ char *p; + char npath[MAX_PATH + 1]; + int len = 0; + int has_device = HAS_DEVICE(path); + + memset(npath, 0, MAX_PATH + 1); +- +-#ifdef _WIN32 +- // only on windows fix the path +- npath[0] = path[0]; +- npath[1] = path[1]; +- len = 2; +-#endif // _WIN32 +- ++ if (has_device) { ++ // only on windows ++ npath[0] = path[0]; ++ npath[1] = path[1]; ++ len = 2; ++ } + for (p = path + len; *p && len < MAX_PATH; p++) { + if (ISSLASH(*p) && ((!has_device && len > 0) || (has_device && len > 2))) { +- if (MKDIR(npath) == -1) +- if (errno != EEXIST) ++#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ ++ defined(__MINGW32__) ++#else ++ if ('\\' == *p) { ++ *p = '/'; ++ } ++#endif ++ ++ if (MKDIR(npath) == -1) { ++ if (errno != EEXIST) { + return -1; ++ } ++ } + } + npath[len++] = *p; + } +@@ -279,7 +286,14 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) { + zip->entry.header_offset = zip->archive.m_archive_size; + memset(zip->entry.header, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE * sizeof(mz_uint8)); + zip->entry.method = 0; ++ ++ // UNIX or APPLE ++#if MZ_PLATFORM == 3 || MZ_PLATFORM == 19 ++ // regular file with rw-r--r-- persmissions ++ zip->entry.external_attr = (mz_uint32)(0100644) << 16; ++#else + zip->entry.external_attr = 0; ++#endif + + num_alignment_padding_bytes = + mz_zip_writer_compute_padding_needed_for_file_alignment(pzip); +@@ -660,7 +674,7 @@ ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) { + } + + if (!mz_zip_reader_extract_to_mem_no_alloc(pzip, (mz_uint)zip->entry.index, +- buf, bufsize, 0, NULL, 0)) { ++ buf, bufsize, 0, NULL, 0)) { + return -1; + } + +@@ -670,10 +684,7 @@ ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) { + int zip_entry_fread(struct zip_t *zip, const char *filename) { + mz_zip_archive *pzip = NULL; + mz_uint idx; +-#if defined(_MSC_VER) +-#else + mz_uint32 xattr = 0; +-#endif + mz_zip_archive_file_stat info; + + if (!zip) { +@@ -875,12 +886,19 @@ int zip_extract(const char *zipname, const char *dir, + goto out; + } + +- if ((((info.m_version_made_by >> 8) == 3) || ((info.m_version_made_by >> 8) == 19)) // if zip is produced on Unix or macOS (3 and 19 from section 4.4.2.2 of zip standard) +- && info.m_external_attr & (0x20 << 24)) { // and has sym link attribute (0x80 is file, 0x40 is directory) ++ if ((((info.m_version_made_by >> 8) == 3) || ++ ((info.m_version_made_by >> 8) == ++ 19)) // if zip is produced on Unix or macOS (3 and 19 from ++ // section 4.4.2.2 of zip standard) ++ && info.m_external_attr & ++ (0x20 << 24)) { // and has sym link attribute (0x80 is file, 0x40 ++ // is directory) + #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ + defined(__MINGW32__) +-#else +- if (info.m_uncomp_size > MAX_PATH || !mz_zip_reader_extract_to_mem_no_alloc(&zip_archive, i, symlink_to, MAX_PATH, 0, NULL, 0)) { ++#else ++ if (info.m_uncomp_size > MAX_PATH || ++ !mz_zip_reader_extract_to_mem_no_alloc(&zip_archive, i, symlink_to, ++ MAX_PATH, 0, NULL, 0)) { + goto out; + } + symlink_to[info.m_uncomp_size] = '\0'; +diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h +index 5f39df50ad..a48d64d6de 100644 +--- a/contrib/zip/src/zip.h ++++ b/contrib/zip/src/zip.h +@@ -20,241 +20,240 @@ extern "C" { + #endif + + #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ +- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) +-#define _SSIZE_T ++ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ ++ !defined(_SSIZE_T) && !defined(_SSIZE_T_) ++ + // 64-bit Windows is the only mainstream platform + // where sizeof(long) != sizeof(void*) + #ifdef _WIN64 +-typedef long long ssize_t; /* byte count or error */ ++typedef long long ssize_t; /* byte count or error */ + #else +-typedef long ssize_t; /* byte count or error */ ++typedef long ssize_t; /* byte count or error */ + #endif ++ ++#define _SSIZE_T_DEFINED ++#define _SSIZE_T_DEFINED_ ++#define __DEFINED_ssize_t ++#define __ssize_t_defined ++#define _SSIZE_T ++#define _SSIZE_T_ ++ + #endif + + #ifndef MAX_PATH + #define MAX_PATH 32767 /* # chars in a path name including NULL */ + #endif + ++/** ++ * @mainpage ++ * ++ * Documenation for @ref zip. ++ */ ++ ++/** ++ * @addtogroup zip ++ * @{ ++ */ ++ ++/** ++ * Default zip compression level. ++ */ ++ + #define ZIP_DEFAULT_COMPRESSION_LEVEL 6 + +-/* +- This data structure is used throughout the library to represent zip archive +- - forward declaration. +-*/ ++/** ++ * @struct zip_t ++ * ++ * This data structure is used throughout the library to represent zip archive - ++ * forward declaration. ++ */ + struct zip_t; + +-/* +- Opens zip archive with compression level using the given mode. +- +- Args: +- zipname: zip archive file name. +- level: compression level (0-9 are the standard zlib-style levels). +- mode: file access mode. +- 'r': opens a file for reading/extracting (the file must exists). +- 'w': creates an empty file for writing. +- 'a': appends to an existing archive. +- +- Returns: +- The zip archive handler or NULL on error +-*/ ++/** ++ * Opens zip archive with compression level using the given mode. ++ * ++ * @param zipname zip archive file name. ++ * @param level compression level (0-9 are the standard zlib-style levels). ++ * @param mode file access mode. ++ * - 'r': opens a file for reading/extracting (the file must exists). ++ * - 'w': creates an empty file for writing. ++ * - 'a': appends to an existing archive. ++ * ++ * @return the zip archive handler or NULL on error ++ */ + extern struct zip_t *zip_open(const char *zipname, int level, char mode); + +-/* +- Closes the zip archive, releases resources - always finalize. +- +- Args: +- zip: zip archive handler. +-*/ ++/** ++ * Closes the zip archive, releases resources - always finalize. ++ * ++ * @param zip zip archive handler. ++ */ + extern void zip_close(struct zip_t *zip); + +-/* +- Opens an entry by name in the zip archive. +- For zip archive opened in 'w' or 'a' mode the function will append +- a new entry. In readonly mode the function tries to locate the entry +- in global dictionary. +- +- Args: +- zip: zip archive handler. +- entryname: an entry name in local dictionary. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Opens an entry by name in the zip archive. ++ * ++ * For zip archive opened in 'w' or 'a' mode the function will append ++ * a new entry. In readonly mode the function tries to locate the entry ++ * in global dictionary. ++ * ++ * @param zip zip archive handler. ++ * @param entryname an entry name in local dictionary. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_open(struct zip_t *zip, const char *entryname); + +-/* +- Opens a new entry by index in the zip archive. +- This function is only valid if zip archive was opened in 'r' (readonly) mode. +- +- Args: +- zip: zip archive handler. +- index: index in local dictionary. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Opens a new entry by index in the zip archive. ++ * ++ * This function is only valid if zip archive was opened in 'r' (readonly) mode. ++ * ++ * @param zip zip archive handler. ++ * @param index index in local dictionary. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_openbyindex(struct zip_t *zip, int index); + +-/* +- Closes a zip entry, flushes buffer and releases resources. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Closes a zip entry, flushes buffer and releases resources. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_close(struct zip_t *zip); + +-/* +- Returns a local name of the current zip entry. +- The main difference between user's entry name and local entry name +- is optional relative path. +- Following .ZIP File Format Specification - the path stored MUST not contain +- a drive or device letter, or a leading slash. +- All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' +- for compatibility with Amiga and UNIX file systems etc. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The pointer to the current zip entry name, or NULL on error. +-*/ ++/** ++ * Returns a local name of the current zip entry. ++ * ++ * The main difference between user's entry name and local entry name ++ * is optional relative path. ++ * Following .ZIP File Format Specification - the path stored MUST not contain ++ * a drive or device letter, or a leading slash. ++ * All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' ++ * for compatibility with Amiga and UNIX file systems etc. ++ * ++ * @param zip: zip archive handler. ++ * ++ * @return the pointer to the current zip entry name, or NULL on error. ++ */ + extern const char *zip_entry_name(struct zip_t *zip); + +-/* +- Returns an index of the current zip entry. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The index on success, negative number (< 0) on error. +-*/ ++/** ++ * Returns an index of the current zip entry. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the index on success, negative number (< 0) on error. ++ */ + extern int zip_entry_index(struct zip_t *zip); + +-/* +- Determines if the current zip entry is a directory entry. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The return code - 1 (true), 0 (false), negative number (< 0) on error. +-*/ ++/** ++ * Determines if the current zip entry is a directory entry. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the return code - 1 (true), 0 (false), negative number (< 0) on ++ * error. ++ */ + extern int zip_entry_isdir(struct zip_t *zip); + +-/* +- Returns an uncompressed size of the current zip entry. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The uncompressed size in bytes. +-*/ ++/** ++ * Returns an uncompressed size of the current zip entry. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the uncompressed size in bytes. ++ */ + extern unsigned long long zip_entry_size(struct zip_t *zip); + +-/* +- Returns CRC-32 checksum of the current zip entry. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The CRC-32 checksum. +-*/ ++/** ++ * Returns CRC-32 checksum of the current zip entry. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the CRC-32 checksum. ++ */ + extern unsigned int zip_entry_crc32(struct zip_t *zip); + +-/* +- Compresses an input buffer for the current zip entry. +- +- Args: +- zip: zip archive handler. +- buf: input buffer. +- bufsize: input buffer size (in bytes). +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Compresses an input buffer for the current zip entry. ++ * ++ * @param zip zip archive handler. ++ * @param buf input buffer. ++ * @param bufsize input buffer size (in bytes). ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize); + +-/* +- Compresses a file for the current zip entry. +- +- Args: +- zip: zip archive handler. +- filename: input file. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Compresses a file for the current zip entry. ++ * ++ * @param zip zip archive handler. ++ * @param filename input file. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_fwrite(struct zip_t *zip, const char *filename); + +-/* +- Extracts the current zip entry into output buffer. +- The function allocates sufficient memory for a output buffer. +- +- Args: +- zip: zip archive handler. +- buf: output buffer. +- bufsize: output buffer size (in bytes). +- +- Note: +- - remember to release memory allocated for a output buffer. +- - for large entries, please take a look at zip_entry_extract function. +- +- Returns: +- The return code - the number of bytes actually read on success. +- Otherwise a -1 on error. +-*/ ++/** ++ * Extracts the current zip entry into output buffer. ++ * ++ * The function allocates sufficient memory for a output buffer. ++ * ++ * @param zip zip archive handler. ++ * @param buf output buffer. ++ * @param bufsize output buffer size (in bytes). ++ * ++ * @note remember to release memory allocated for a output buffer. ++ * for large entries, please take a look at zip_entry_extract function. ++ * ++ * @return the return code - the number of bytes actually read on success. ++ * Otherwise a -1 on error. ++ */ + extern ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize); + +-/* +- Extracts the current zip entry into a memory buffer using no memory +- allocation. +- +- Args: +- zip: zip archive handler. +- buf: preallocated output buffer. +- bufsize: output buffer size (in bytes). +- +- Note: +- - ensure supplied output buffer is large enough. +- - zip_entry_size function (returns uncompressed size for the current entry) +- can be handy to estimate how big buffer is needed. +- - for large entries, please take a look at zip_entry_extract function. +- +- Returns: +- The return code - the number of bytes actually read on success. +- Otherwise a -1 on error (e.g. bufsize is not large enough). +-*/ +-extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize); +- +-/* +- Extracts the current zip entry into output file. +- +- Args: +- zip: zip archive handler. +- filename: output file. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Extracts the current zip entry into a memory buffer using no memory ++ * allocation. ++ * ++ * @param zip zip archive handler. ++ * @param buf preallocated output buffer. ++ * @param bufsize output buffer size (in bytes). ++ * ++ * @note ensure supplied output buffer is large enough. ++ * zip_entry_size function (returns uncompressed size for the current ++ * entry) can be handy to estimate how big buffer is needed. for large ++ * entries, please take a look at zip_entry_extract function. ++ * ++ * @return the return code - the number of bytes actually read on success. ++ * Otherwise a -1 on error (e.g. bufsize is not large enough). ++ */ ++extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, ++ size_t bufsize); ++ ++/** ++ * Extracts the current zip entry into output file. ++ * ++ * @param zip zip archive handler. ++ * @param filename output file. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_entry_fread(struct zip_t *zip, const char *filename); + +-/* +- Extracts the current zip entry using a callback function (on_extract). +- +- Args: +- zip: zip archive handler. +- on_extract: callback function. +- arg: opaque pointer (optional argument, +- which you can pass to the on_extract callback) +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. ++/** ++ * Extracts the current zip entry using a callback function (on_extract). ++ * ++ * @param zip zip archive handler. ++ * @param on_extract callback function. ++ * @param arg opaque pointer (optional argument, which you can pass to the ++ * on_extract callback) ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. + */ + extern int + zip_entry_extract(struct zip_t *zip, +@@ -262,53 +261,49 @@ zip_entry_extract(struct zip_t *zip, + const void *data, size_t size), + void *arg); + +-/* +- Returns the number of all entries (files and directories) in the zip archive. +- +- Args: +- zip: zip archive handler. +- +- Returns: +- The return code - the number of entries on success, +- negative number (< 0) on error. +-*/ ++/** ++ * Returns the number of all entries (files and directories) in the zip archive. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the return code - the number of entries on success, negative number ++ * (< 0) on error. ++ */ + extern int zip_total_entries(struct zip_t *zip); + +-/* +- Creates a new archive and puts files into a single zip archive. +- +- Args: +- zipname: zip archive file. +- filenames: input files. +- len: number of input files. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Creates a new archive and puts files into a single zip archive. ++ * ++ * @param zipname zip archive file. ++ * @param filenames input files. ++ * @param len: number of input files. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_create(const char *zipname, const char *filenames[], size_t len); + +-/* +- Extracts a zip archive file into directory. +- +- If on_extract_entry is not NULL, the callback will be called after +- successfully extracted each zip entry. +- Returning a negative value from the callback will cause abort and return an +- error. The last argument (void *arg) is optional, which you can use to pass +- data to the on_extract_entry callback. +- +- Args: +- zipname: zip archive file. +- dir: output directory. +- on_extract_entry: on extract callback. +- arg: opaque pointer. +- +- Returns: +- The return code - 0 on success, negative number (< 0) on error. +-*/ ++/** ++ * Extracts a zip archive file into directory. ++ * ++ * If on_extract_entry is not NULL, the callback will be called after ++ * successfully extracted each zip entry. ++ * Returning a negative value from the callback will cause abort and return an ++ * error. The last argument (void *arg) is optional, which you can use to pass ++ * data to the on_extract_entry callback. ++ * ++ * @param zipname zip archive file. ++ * @param dir output directory. ++ * @param on_extract_entry on extract callback. ++ * @param arg opaque pointer. ++ * ++ * @return the return code - 0 on success, negative number (< 0) on error. ++ */ + extern int zip_extract(const char *zipname, const char *dir, + int (*on_extract_entry)(const char *filename, void *arg), + void *arg); + ++/** @} */ ++ + #ifdef __cplusplus + } + #endif +diff --git a/contrib/zip/test/CMakeLists.txt b/contrib/zip/test/CMakeLists.txt +index 9b2a8db106..cc060b00fe 100644 +--- a/contrib/zip/test/CMakeLists.txt ++++ b/contrib/zip/test/CMakeLists.txt +@@ -1,19 +1,16 @@ + cmake_minimum_required(VERSION 2.8) + +-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") +- if(ENABLE_COVERAGE) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g ") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") +- endif() +-endif () +- + # test +-include_directories(../src) +-add_executable(test.exe test.c ../src/zip.c) +-add_executable(test_miniz.exe test_miniz.c) ++set(test_out test.out) ++set(test_miniz_out test_miniz.out) ++ ++add_executable(${test_out} test.c) ++target_link_libraries(${test_out} zip) ++add_executable(${test_miniz_out} test_miniz.c) ++target_link_libraries(${test_miniz_out} zip) ++ ++add_test(NAME ${test_out} COMMAND ${test_out}) ++add_test(NAME ${test_miniz_out} COMMAND ${test_miniz_out}) + +-add_test(NAME test COMMAND test.exe) +-add_test(NAME test_miniz COMMAND test_miniz.exe) ++set(test_out ${test_out} PARENT_SCOPE) ++set(test_miniz_out ${test_miniz_out} PARENT_SCOPE) +diff --git a/contrib/zip/test/test.c b/contrib/zip/test/test.c +index 454430533a..a9b2ddab1e 100644 +--- a/contrib/zip/test/test.c ++++ b/contrib/zip/test/test.c +@@ -29,6 +29,8 @@ + #define XFILE "7.txt\0" + #define XMODE 0100777 + ++#define UNIXMODE 0100644 ++ + #define UNUSED(x) (void)x + + static int total_entries = 0; +@@ -102,7 +104,8 @@ static void test_read(void) { + assert(0 == zip_entry_close(zip)); + free(buf); + buf = NULL; +- ++ bufsize = 0; ++ + assert(0 == zip_entry_open(zip, "test/test-2.txt")); + assert(strlen(TESTDATA2) == zip_entry_size(zip)); + assert(CRC32DATA2 == zip_entry_crc32(zip)); +@@ -131,7 +134,8 @@ static void test_read(void) { + assert(0 == zip_entry_close(zip)); + free(buf); + buf = NULL; +- ++ bufsize = 0; ++ + buftmp = strlen(TESTDATA1); + buf = calloc(buftmp, sizeof(char)); + assert(0 == zip_entry_open(zip, "test/test-1.txt")); +@@ -433,6 +437,35 @@ static void test_mtime(void) { + remove(ZIPNAME); + } + ++static void test_unix_permissions(void) { ++#if defined(_WIN64) || defined(_WIN32) || defined(__WIN32__) ++#else ++ // UNIX or APPLE ++ struct MZ_FILE_STAT_STRUCT file_stats; ++ ++ remove(ZIPNAME); ++ ++ struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w'); ++ assert(zip != NULL); ++ ++ assert(0 == zip_entry_open(zip, RFILE)); ++ assert(0 == zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1))); ++ assert(0 == zip_entry_close(zip)); ++ ++ zip_close(zip); ++ ++ remove(RFILE); ++ ++ assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL)); ++ ++ assert(0 == MZ_FILE_STAT(RFILE, &file_stats)); ++ assert(UNIXMODE == file_stats.st_mode); ++ ++ remove(RFILE); ++ remove(ZIPNAME); ++#endif ++} ++ + int main(int argc, char *argv[]) { + UNUSED(argc); + UNUSED(argv); +@@ -453,6 +486,7 @@ int main(int argc, char *argv[]) { + test_write_permissions(); + test_exe_permissions(); + test_mtime(); ++ test_unix_permissions(); + + remove(ZIPNAME); + return 0; +diff --git a/contrib/zip/test/test_miniz.c b/contrib/zip/test/test_miniz.c +index ebc0564dc3..babcaecdb6 100644 +--- a/contrib/zip/test/test_miniz.c ++++ b/contrib/zip/test/test_miniz.c +@@ -23,16 +23,39 @@ int main(int argc, char *argv[]) { + uint step = 0; + int cmp_status; + uLong src_len = (uLong)strlen(s_pStr); +- uLong cmp_len = compressBound(src_len); + uLong uncomp_len = src_len; ++ uLong cmp_len; + uint8 *pCmp, *pUncomp; ++ size_t sz; + uint total_succeeded = 0; + (void)argc, (void)argv; + + printf("miniz.c version: %s\n", MZ_VERSION); + + do { ++ pCmp = (uint8 *)tdefl_compress_mem_to_heap(s_pStr, src_len, &cmp_len, 0); ++ if (!pCmp) { ++ printf("tdefl_compress_mem_to_heap failed\n"); ++ return EXIT_FAILURE; ++ } ++ if (src_len <= cmp_len) { ++ printf("tdefl_compress_mem_to_heap failed: from %u to %u bytes\n", ++ (mz_uint32)uncomp_len, (mz_uint32)cmp_len); ++ free(pCmp); ++ return EXIT_FAILURE; ++ } ++ ++ sz = tdefl_compress_mem_to_mem(pCmp, cmp_len, s_pStr, src_len, 0); ++ if (sz != cmp_len) { ++ printf("tdefl_compress_mem_to_mem failed: expected %u, got %u\n", ++ (mz_uint32)cmp_len, (mz_uint32)sz); ++ free(pCmp); ++ return EXIT_FAILURE; ++ } ++ + // Allocate buffers to hold compressed and uncompressed data. ++ free(pCmp); ++ cmp_len = compressBound(src_len); + pCmp = (mz_uint8 *)malloc((size_t)cmp_len); + pUncomp = (mz_uint8 *)malloc((size_t)src_len); + if ((!pCmp) || (!pUncomp)) { diff --git a/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch b/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch deleted file mode 100644 index a9a30c483..000000000 --- a/buildroot/package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3fef857a570d1ef2c96401358fe8e239625b48c9 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 10 Apr 2020 18:11:50 +0200 -Subject: [PATCH] contrib/zip: fix ssize_t typedef mismatch for musl compile - -Musl uses defines __DEFINED_ssize_t to indicate ssize_t -availability. So backport this part of upstream commit [1] -to fixl musl compile. - -https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1 - -Signed-off-by: Peter Seiderer ---- - contrib/zip/src/zip.h | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h -index 5f39df50..4672eb3e 100644 ---- a/contrib/zip/src/zip.h -+++ b/contrib/zip/src/zip.h -@@ -20,8 +20,9 @@ extern "C" { - #endif - - #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ -- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) --#define _SSIZE_T -+ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ -+ !defined(_SSIZE_T) && !defined(_SSIZE_T_) -+ - // 64-bit Windows is the only mainstream platform - // where sizeof(long) != sizeof(void*) - #ifdef _WIN64 -@@ -29,6 +30,14 @@ typedef long long ssize_t; /* byte count or error */ - #else - typedef long ssize_t; /* byte count or error */ - #endif -+ -+#define _SSIZE_T_DEFINED -+#define _SSIZE_T_DEFINED_ -+#define __DEFINED_ssize_t -+#define __ssize_t_defined -+#define _SSIZE_T -+#define _SSIZE_T_ -+ - #endif - - #ifndef MAX_PATH --- -2.26.0 - diff --git a/buildroot/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch b/buildroot/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch new file mode 100644 index 000000000..9bd24630c --- /dev/null +++ b/buildroot/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch @@ -0,0 +1,243 @@ +From bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f Mon Sep 17 00:00:00 2001 +From: kimkulling +Date: Mon, 9 Mar 2020 10:51:26 +0100 +Subject: [PATCH] closes https://github.com/assimp/assimp/issues/2954: upgrade + to latest greatest. + +[Retrieved from: +https://github.com/assimp/assimp/commit/bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f] +Signed-off-by: Fabrice Fontaine +--- + contrib/zip/CMakeLists.txt | 8 ++---- + contrib/zip/README.md | 51 +++++++++++++++++++++++++++++++-- + contrib/zip/src/zip.c | 17 ++++++++++- + contrib/zip/src/zip.h | 13 ++++++++- + contrib/zip/test/CMakeLists.txt | 5 ---- + contrib/zip/test/test.c | 4 ++- + 6 files changed, 81 insertions(+), 17 deletions(-) + +diff --git a/contrib/zip/CMakeLists.txt b/contrib/zip/CMakeLists.txt +index 77916d2e14..f194649ede 100644 +--- a/contrib/zip/CMakeLists.txt ++++ b/contrib/zip/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) + + project(zip + LANGUAGES C +- VERSION "0.1.15") ++ VERSION "0.1.18") + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + + option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) +@@ -16,10 +16,6 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") +- if(ENABLE_COVERAGE) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") +- endif() + endif (MSVC) + + # zip +@@ -35,7 +31,7 @@ if (NOT CMAKE_DISABLE_TESTING) + enable_testing() + add_subdirectory(test) + find_package(Sanitizers) +- add_sanitizers(${PROJECT_NAME} ${test_out} ${test_miniz_out}) ++ add_sanitizers(${PROJECT_NAME} ${test_out}) + endif() + + #### +diff --git a/contrib/zip/README.md b/contrib/zip/README.md +index 14eb9a34c8..bdd0822b67 100644 +--- a/contrib/zip/README.md ++++ b/contrib/zip/README.md +@@ -1,10 +1,8 @@ + ### A portable (OSX/Linux/Windows), simple zip library written in C + This is done by hacking awesome [miniz](https://code.google.com/p/miniz) library and layering functions on top of the miniz v1.15 API. + +-[![Windows](https://ci.appveyor.com/api/projects/status/bph8dr3jacgmjv32/branch/master?svg=true&label=windows)](https://ci.appveyor.com/project/kuba--/zip) +-[![Linux](https://travis-ci.org/kuba--/zip.svg?branch=master&label=linux%2fosx)](https://travis-ci.org/kuba--/zip) ++[![Build](https://github.com/kuba--/zip/workflows/build/badge.svg)](https://github.com/kuba--/zip/actions?query=workflow%3Abuild) + [![Version](https://badge.fury.io/gh/kuba--%2Fzip.svg)](https://github.com/kuba--/zip/releases) +-[![Codecov](https://codecov.io/gh/kuba--/zip/branch/master/graph/badge.svg)](https://codecov.io/gh/kuba--/zip) + + + # The Idea +@@ -213,6 +211,53 @@ func main() { + } + ``` + ++### Rust (ffi) ++```rust ++extern crate libc; ++use std::ffi::CString; ++ ++#[repr(C)] ++pub struct Zip { ++ _private: [u8; 0], ++} ++ ++#[link(name = "zip")] ++extern "C" { ++ fn zip_open(path: *const libc::c_char, level: libc::c_int, mode: libc::c_char) -> *mut Zip; ++ fn zip_close(zip: *mut Zip) -> libc::c_void; ++ ++ fn zip_entry_open(zip: *mut Zip, entryname: *const libc::c_char) -> libc::c_int; ++ fn zip_entry_close(zip: *mut Zip) -> libc::c_int; ++ fn zip_entry_write( ++ zip: *mut Zip, ++ buf: *const libc::c_void, ++ bufsize: libc::size_t, ++ ) -> libc::c_int; ++} ++ ++fn main() { ++ let path = CString::new("/tmp/test.zip").unwrap(); ++ let mode: libc::c_char = 'w' as libc::c_char; ++ ++ let entryname = CString::new("test.txt").unwrap(); ++ let content = "test content\0"; ++ ++ unsafe { ++ let zip: *mut Zip = zip_open(path.as_ptr(), 5, mode); ++ { ++ zip_entry_open(zip, entryname.as_ptr()); ++ { ++ let buf = content.as_ptr() as *const libc::c_void; ++ let bufsize = content.len() as libc::size_t; ++ zip_entry_write(zip, buf, bufsize); ++ } ++ zip_entry_close(zip); ++ } ++ zip_close(zip); ++ } ++} ++``` ++ + ### Ruby (ffi) + Install _ffi_ gem. + ```shell +diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c +index 1abcfd8fd1..3b2821e6a3 100644 +--- a/contrib/zip/src/zip.c ++++ b/contrib/zip/src/zip.c +@@ -222,6 +222,20 @@ void zip_close(struct zip_t *zip) { + } + } + ++int zip_is64(struct zip_t *zip) { ++ if (!zip) { ++ // zip_t handler is not initialized ++ return -1; ++ } ++ ++ if (!zip->archive.m_pState) { ++ // zip state is not initialized ++ return -1; ++ } ++ ++ return (int)zip->archive.m_pState->m_zip64; ++} ++ + int zip_entry_open(struct zip_t *zip, const char *entryname) { + size_t entrylen = 0; + mz_zip_archive *pzip = NULL; +@@ -794,7 +808,8 @@ int zip_create(const char *zipname, const char *filenames[], size_t len) { + + if (MZ_FILE_STAT(name, &file_stat) != 0) { + // problem getting information - check errno +- return -1; ++ status = -1; ++ break; + } + + if ((file_stat.st_mode & 0200) == 0) { +diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h +index a48d64d6de..cd3ab5cd00 100644 +--- a/contrib/zip/src/zip.h ++++ b/contrib/zip/src/zip.h +@@ -21,7 +21,7 @@ extern "C" { + + #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ + !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ +- !defined(_SSIZE_T) && !defined(_SSIZE_T_) ++ !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(_SSIZE_T_DECLARED) + + // 64-bit Windows is the only mainstream platform + // where sizeof(long) != sizeof(void*) +@@ -37,6 +37,7 @@ typedef long ssize_t; /* byte count or error */ + #define __ssize_t_defined + #define _SSIZE_T + #define _SSIZE_T_ ++#define _SSIZE_T_DECLARED + + #endif + +@@ -90,6 +91,16 @@ extern struct zip_t *zip_open(const char *zipname, int level, char mode); + */ + extern void zip_close(struct zip_t *zip); + ++/** ++ * Determines if the archive has a zip64 end of central directory headers. ++ * ++ * @param zip zip archive handler. ++ * ++ * @return the return code - 1 (true), 0 (false), negative number (< 0) on ++ * error. ++ */ ++extern int zip_is64(struct zip_t *zip); ++ + /** + * Opens an entry by name in the zip archive. + * +diff --git a/contrib/zip/test/CMakeLists.txt b/contrib/zip/test/CMakeLists.txt +index cc060b00fe..1224115858 100644 +--- a/contrib/zip/test/CMakeLists.txt ++++ b/contrib/zip/test/CMakeLists.txt +@@ -2,15 +2,10 @@ cmake_minimum_required(VERSION 2.8) + + # test + set(test_out test.out) +-set(test_miniz_out test_miniz.out) + + add_executable(${test_out} test.c) + target_link_libraries(${test_out} zip) +-add_executable(${test_miniz_out} test_miniz.c) +-target_link_libraries(${test_miniz_out} zip) + + add_test(NAME ${test_out} COMMAND ${test_out}) +-add_test(NAME ${test_miniz_out} COMMAND ${test_miniz_out}) + + set(test_out ${test_out} PARENT_SCOPE) +-set(test_miniz_out ${test_miniz_out} PARENT_SCOPE) +diff --git a/contrib/zip/test/test.c b/contrib/zip/test/test.c +index a9b2ddab1e..9cc2248ac0 100644 +--- a/contrib/zip/test/test.c ++++ b/contrib/zip/test/test.c +@@ -47,7 +47,7 @@ static void test_write(void) { + assert(CRC32DATA1 == zip_entry_crc32(zip)); + ++total_entries; + assert(0 == zip_entry_close(zip)); +- ++ assert(0 == zip_is64(zip)); + zip_close(zip); + } + +@@ -92,6 +92,7 @@ static void test_read(void) { + size_t buftmp; + struct zip_t *zip = zip_open(ZIPNAME, 0, 'r'); + assert(zip != NULL); ++ assert(0 == zip_is64(zip)); + + assert(0 == zip_entry_open(zip, "test\\test-1.txt")); + assert(strlen(TESTDATA1) == zip_entry_size(zip)); +@@ -310,6 +311,7 @@ static void test_fwrite(void) { + assert(0 == zip_entry_open(zip, WFILE)); + assert(0 == zip_entry_fwrite(zip, WFILE)); + assert(0 == zip_entry_close(zip)); ++ assert(0 == zip_is64(zip)); + + zip_close(zip); + remove(WFILE); diff --git a/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch b/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch deleted file mode 100644 index 8661311be..000000000 --- a/buildroot/package/assimp/0003-contrib-zlib-disable-dynamic-library-building.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2b8684aded0c383be64bac0fa59e39870252963f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 12 Apr 2020 18:19:13 +0200 -Subject: [PATCH] contrib/zlib: disable dynamic library building - -Fixes compile failure for static only toolchains (and assimp -links against the static one). - -Signed-off-by: Peter Seiderer ---- - contrib/zlib/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt -index 9d1fcc94..78346233 100644 ---- a/contrib/zlib/CMakeLists.txt -+++ b/contrib/zlib/CMakeLists.txt -@@ -195,10 +195,7 @@ if(MINGW) - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) - endif(MINGW) - --add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) --set_target_properties(zlib PROPERTIES SOVERSION 1) - - INSTALL( TARGETS zlibstatic - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} --- -2.26.0 - diff --git a/buildroot/package/assimp/Config.in b/buildroot/package/assimp/Config.in index 9bdc05490..c535240ef 100644 --- a/buildroot/package/assimp/Config.in +++ b/buildroot/package/assimp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_PACKAGE_LIBZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a @@ -12,4 +13,8 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org comment "assimp needs a toolchain w/ C++, wchar" + depends on BR2_PACKAGE_LIBZLIB depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + +comment "assimp needs libzlib" + depends on !BR2_PACKAGE_LIBZLIB diff --git a/buildroot/package/assimp/assimp.mk b/buildroot/package/assimp/assimp.mk index e1b9a2349..eddfbc48b 100644 --- a/buildroot/package/assimp/assimp.mk +++ b/buildroot/package/assimp/assimp.mk @@ -8,6 +8,7 @@ ASSIMP_VERSION = 5.0.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE +ASSIMP_DEPENDENCIES = zlib ASSIMP_INSTALL_STAGING = YES # relocation truncated to fit: R_68K_GOT16O. We also need to disable @@ -36,7 +37,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) ASSIMP_CXXFLAGS += -O0 endif -ASSIMP_CONF_OPTS += -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF \ +ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" $(eval $(cmake-package)) diff --git a/buildroot/package/azmq/Config.in b/buildroot/package/azmq/Config.in index 37131a260..6751d533a 100644 --- a/buildroot/package/azmq/Config.in +++ b/buildroot/package/azmq/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_AZMQ bool "azmq" + depends on !BR2_RISCV_32 # boost-log depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # boost-log @@ -22,9 +23,11 @@ config BR2_PACKAGE_AZMQ https://github.com/zeromq/azmq comment "azmq needs a toolchain w/ C++11, wchar and NPTL" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL) comment "azmq needs exception_ptr" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/bird/bird.mk b/buildroot/package/bird/bird.mk index 6b2810275..b711e7de0 100644 --- a/buildroot/package/bird/bird.mk +++ b/buildroot/package/bird/bird.mk @@ -8,6 +8,7 @@ BIRD_VERSION = 2.0.7 BIRD_SITE = ftp://bird.network.cz/pub/bird BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README +BIRD_CPE_ID_VENDOR = nic BIRD_DEPENDENCIES = host-flex host-bison ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y) diff --git a/buildroot/package/bitcoin/bitcoin.hash b/buildroot/package/bitcoin/bitcoin.hash index 3c65c3d73..6ea339803 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.21.0/SHA256SUMS.asc -sha256 1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37 bitcoin-0.21.0.tar.gz +# From https://bitcoincore.org/bin/bitcoin-core-0.21.1/SHA256SUMS.asc +sha256 caff23449220cf45753f312cefede53a9eac64000bb300797916526236b6a1e0 bitcoin-0.21.1.tar.gz # Hash for license file sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING diff --git a/buildroot/package/bitcoin/bitcoin.mk b/buildroot/package/bitcoin/bitcoin.mk index 5f1684879..142521835 100644 --- a/buildroot/package/bitcoin/bitcoin.mk +++ b/buildroot/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 0.21.0 +BITCOIN_VERSION = 0.21.1 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT diff --git a/buildroot/package/blktrace/blktrace.mk b/buildroot/package/blktrace/blktrace.mk index 4ada2e8e4..1a5f59bcc 100644 --- a/buildroot/package/blktrace/blktrace.mk +++ b/buildroot/package/blktrace/blktrace.mk @@ -9,6 +9,7 @@ BLKTRACE_SITE = http://brick.kernel.dk/snaps BLKTRACE_DEPENDENCIES = libaio BLKTRACE_LICENSE = GPL-2.0+ BLKTRACE_LICENSE_FILES = COPYING +BLKTRACE_CPE_ID_VENDOR = blktrace_project # 0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch BLKTRACE_IGNORE_CVES += CVE-2018-10689 diff --git a/buildroot/package/boost/Config.in b/buildroot/package/boost/Config.in index 9248c574f..81b2b2727 100644 --- a/buildroot/package/boost/Config.in +++ b/buildroot/package/boost/Config.in @@ -231,6 +231,7 @@ comment "boost-locale needs a toolchain not affected by GCC bug 64735" config BR2_PACKAGE_BOOST_LOG bool "boost-log" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread @@ -244,10 +245,12 @@ config BR2_PACKAGE_BOOST_LOG Logging library. comment "boost-log needs a toolchain w/ NPTL" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL comment "boost-log needs a toolchain not affected by GCC bug 64735" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_MATH diff --git a/buildroot/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch b/buildroot/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch new file mode 100644 index 000000000..ce70ab8f2 --- /dev/null +++ b/buildroot/package/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit-time_t.patch @@ -0,0 +1,37 @@ +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Nov 2020 12:10:28 -0800 +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t + +mutex code uses SYS_futex, which it expects from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Signed-off-by: Khem Raj +[Retrieved from: +https://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] +Signed-off-by: Fabrice Fontaine +--- + c++/src/kj/mutex.c++ | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ +index c81cead7b..e1594b117 100644 +--- a/c++/src/kj/mutex.c++ ++++ b/c++/src/kj/mutex.c++ +@@ -39,7 +39,13 @@ + + #ifndef SYS_futex + // Missing on Android/Bionic. ++#ifdef __NR_futex + #define SYS_futex __NR_futex ++#elif defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#else ++#error "Need working SYS_futex" ++#endif + #endif + + #ifndef FUTEX_WAIT_PRIVATE diff --git a/buildroot/package/chrony/chrony.mk b/buildroot/package/chrony/chrony.mk index ef459ad38..b73ddb56b 100644 --- a/buildroot/package/chrony/chrony.mk +++ b/buildroot/package/chrony/chrony.mk @@ -8,6 +8,7 @@ CHRONY_VERSION = 4.0 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING +CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_DEPENDENCIES = host-pkgconf CHRONY_CONF_OPTS = \ diff --git a/buildroot/package/connman/connman.hash b/buildroot/package/connman/connman.hash index 338e1919d..797448337 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 9f62a7169b7491c670a1ff2e335b0d966308fb2f62e285c781105eb90f181af3 connman-1.39.tar.xz +sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/connman/connman.mk b/buildroot/package/connman/connman.mk index 77073f984..0355426e9 100644 --- a/buildroot/package/connman/connman.mk +++ b/buildroot/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.39 +CONNMAN_VERSION = 1.40 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables diff --git a/buildroot/package/dc3dd/Config.in b/buildroot/package/dc3dd/Config.in index 0383897cd..715451beb 100644 --- a/buildroot/package/dc3dd/Config.in +++ b/buildroot/package/dc3dd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DC3DD bool "dc3dd" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL help @@ -11,5 +12,6 @@ config BR2_PACKAGE_DC3DD https://sourceforge.net/projects/dc3dd/ comment "dc3dd needs a glibc or uClibc toolchain w/ threads" + depends on !BR2_RISCV_32 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/dhcp/dhcp.hash b/buildroot/package/dhcp/dhcp.hash index 92ecdfec5..ec7c4fe58 100644 --- a/buildroot/package/dhcp/dhcp.hash +++ b/buildroot/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.4.2/dhcp-4.4.2.tar.gz.sha256.asc -sha256 1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521 dhcp-4.4.2.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz.sha256.asc +sha256 b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a dhcp-4.4.2-P1.tar.gz # Locally calculated -sha256 89e7b0661134cc118bdcdeb87ff0493d544bc5723c9ca6616fa05f03539738af LICENSE +sha256 9961fce0d83a6229b9084cdadedfa723a53274c63af610c9adb61b607e0f5a76 LICENSE diff --git a/buildroot/package/dhcp/dhcp.mk b/buildroot/package/dhcp/dhcp.mk index d8f331719..b945c46b1 100644 --- a/buildroot/package/dhcp/dhcp.mk +++ b/buildroot/package/dhcp/dhcp.mk @@ -4,12 +4,12 @@ # ################################################################################ -DHCP_VERSION = 4.4.2 +DHCP_VERSION = 4.4.2-P1 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE -DHCP_DEPENDENCIES = bind +DHCP_DEPENDENCIES = bind host-gawk DHCP_CPE_ID_VENDOR = isc # use libtool-enabled configure.ac @@ -22,6 +22,8 @@ DHCP_CONF_ENV = \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' +DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk + DHCP_CONF_OPTS = \ --with-libbind=$(STAGING_DIR)/usr \ --with-randomdev=/dev/random \ diff --git a/buildroot/package/directfb/Config.in b/buildroot/package/directfb/Config.in index 20481f56d..f4d6b8cbd 100644 --- a/buildroot/package/directfb/Config.in +++ b/buildroot/package/directfb/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DIRECTFB bool "directfb" + depends on !BR2_RISCV_32 depends on !BR2_STATIC_LIBS # static link issues depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP @@ -161,6 +162,7 @@ config BR2_PACKAGE_DIRECTFB_TESTS endif # BR2_PACKAGE_DIRECTFB comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ diff --git a/buildroot/package/dmalloc/dmalloc.mk b/buildroot/package/dmalloc/dmalloc.mk index 638fe0fcd..749c35359 100644 --- a/buildroot/package/dmalloc/dmalloc.mk +++ b/buildroot/package/dmalloc/dmalloc.mk @@ -13,10 +13,12 @@ DMALLOC_LICENSE = MIT-like DMALLOC_LICENSE_FILES = dmalloc.h.1 DMALLOC_INSTALL_STAGING = YES -DMALLOC_CONF_OPTS = --enable-shlib DMALLOC_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_STATIC_LIBS),) +ifeq ($(BR2_STATIC_LIBS),y) +DMALLOC_CONF_OPTS += --disable-shlib +else +DMALLOC_CONF_OPTS += --enable-shlib DMALLOC_CFLAGS += -fPIC endif diff --git a/buildroot/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch b/buildroot/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch new file mode 100644 index 000000000..c5161ef0d --- /dev/null +++ b/buildroot/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch @@ -0,0 +1,74 @@ +From 7b9c2905883df5171fda10a364a81b8c6176c8e2 Mon Sep 17 00:00:00 2001 +From: Akihiro Suda +Date: Mon, 26 Apr 2021 15:28:40 +0900 +Subject: [PATCH] fix port forwarding with ipv6.disable=1 + +Make `docker run -p 80:80` functional again on environments with kernel boot parameter `ipv6.disable=1`. + +Fix moby/moby issue 42288 + +Signed-off-by: Akihiro Suda +[Upstream: https://github.com/moby/libnetwork/pull/2635, + https://github.com/moby/moby/pull/42322] +[Rework path/drop test for docker-engine] +Signed-off-by: Peter Korsgaard +--- + vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+), 0 deletion(-) + +diff --git a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go +index 946130ec..17bf36f9 100644 +--- a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go ++++ b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go +@@ -5,6 +5,7 @@ import ( + "errors" + "fmt" + "net" ++ "sync" + + "github.com/docker/libnetwork/types" + "github.com/ishidawataru/sctp" +@@ -50,6 +51,13 @@ func (n *bridgeNetwork) allocatePortsInternal(bindings []types.PortBinding, cont + bs = append(bs, bIPv4) + } + ++ // skip adding implicit v6 addr, when the kernel was booted with `ipv6.disable=1` ++ // https://github.com/moby/moby/issues/42288 ++ isV6Binding := c.HostIP != nil && c.HostIP.To4() == nil ++ if !isV6Binding && !IsV6Listenable() { ++ continue ++ } ++ + // Allocate IPv6 Port mappings + // If the container has no IPv6 address, allow proxying host IPv6 traffic to it + // by setting up the binding with the IPv4 interface if the userland proxy is enabled +@@ -211,3 +219,26 @@ func (n *bridgeNetwork) releasePort(bnd types.PortBinding) error { + + return portmapper.Unmap(host) + } ++ ++var ( ++ v6ListenableCached bool ++ v6ListenableOnce sync.Once ++) ++ ++// IsV6Listenable returns true when `[::1]:0` is listenable. ++// IsV6Listenable returns false mostly when the kernel was booted with `ipv6.disable=1` option. ++func IsV6Listenable() bool { ++ v6ListenableOnce.Do(func() { ++ ln, err := net.Listen("tcp6", "[::1]:0") ++ if err != nil { ++ // When the kernel was booted with `ipv6.disable=1`, ++ // we get err "listen tcp6 [::1]:0: socket: address family not supported by protocol" ++ // https://github.com/moby/moby/issues/42288 ++ logrus.Debugf("port_mapping: v6Listenable=false (%v)", err) ++ } else { ++ v6ListenableCached = true ++ ln.Close() ++ } ++ }) ++ return v6ListenableCached ++} +-- +2.20.1 + diff --git a/buildroot/package/docker-engine/Config.in b/buildroot/package/docker-engine/Config.in index 85a4bc6a0..4fa3b5a8c 100644 --- a/buildroot/package/docker-engine/Config.in +++ b/buildroot/package/docker-engine/Config.in @@ -34,9 +34,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY help Build the devicemapper filesystem driver for Docker. diff --git a/buildroot/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch b/buildroot/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch new file mode 100644 index 000000000..84b4d0f39 --- /dev/null +++ b/buildroot/package/ebtables/0002-ebtables.h-restore-KERNEL_64_USERSPACE_32-checks.patch @@ -0,0 +1,105 @@ +From 7297a8ef3cab3b0faf1426622ee902a2144e2e89 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Wed, 24 Mar 2021 11:27:14 +0100 +Subject: [PATCH] ebtables.h: restore KERNEL_64_USERSPACE_32 checks + +Commit e6359eedfbf497e52d52451072aea4713ed80a88 replaced the file ebtables.h +but removed the usage of KERNEL_64_USERSPACE_32. This breaks boards where +such flag is relevant, with following messages: + +[ 6364.971346] kernel msg: ebtables bug: please report to author: Standard target size too big + +Unable to update the kernel. Two possible causes: +1. Multiple ebtables programs were executing simultaneously. The ebtables + userspace tool doesn't by default support multiple ebtables programs running + concurrently. The ebtables option --concurrent or a tool like flock can be + used to support concurrent scripts that update the ebtables kernel tables. +2. The kernel doesn't support a certain ebtables extension, consider + recompiling your kernel or insmod the extension. + +Analysis shows that the structure 'ebt_replace' passed from userspace +ebtables to the kernel, is too small, i.e 80 bytes instead of 120 in case of +64-bit kernel. + +Note that the ebtables build system seems to assume that 'sparc64' is the +only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. +This situation can happen on many architectures, especially in embedded +systems. For example, an Aarch64 processor with kernel in 64-bit but +userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with +userland running in the 'n32' ABI. + +Signed-off-by: Thomas De Schampheleire +Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-1-patrickdepinguin@gmail.com/ +--- + include/linux/netfilter_bridge/ebtables.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h +index 5be75f2..3c2b61e 100644 +--- a/include/linux/netfilter_bridge/ebtables.h ++++ b/include/linux/netfilter_bridge/ebtables.h +@@ -49,12 +49,21 @@ struct ebt_replace { + /* total size of the entries */ + unsigned int entries_size; + /* start of the chains */ ++#ifdef KERNEL_64_USERSPACE_32 ++ uint64_t hook_entry[NF_BR_NUMHOOKS]; ++#else + struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; ++#endif + /* nr of counters userspace expects back */ + unsigned int num_counters; + /* where the kernel will put the old counters */ ++#ifdef KERNEL_64_USERSPACE_32 ++ uint64_t counters; ++ uint64_t entries; ++#else + struct ebt_counter *counters; + char *entries; ++#endif + }; + + struct ebt_replace_kernel { +@@ -129,6 +138,9 @@ struct ebt_entry_match { + } u; + /* size of data */ + unsigned int match_size; ++#ifdef KERNEL_64_USERSPACE_32 ++ unsigned int pad; ++#endif + unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + }; + +@@ -142,6 +154,9 @@ struct ebt_entry_watcher { + } u; + /* size of data */ + unsigned int watcher_size; ++#ifdef KERNEL_64_USERSPACE_32 ++ unsigned int pad; ++#endif + unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + }; + +@@ -155,6 +170,9 @@ struct ebt_entry_target { + } u; + /* size of data */ + unsigned int target_size; ++#ifdef KERNEL_64_USERSPACE_32 ++ unsigned int pad; ++#endif + unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + }; + +@@ -162,6 +180,9 @@ struct ebt_entry_target { + struct ebt_standard_target { + struct ebt_entry_target target; + int verdict; ++#ifdef KERNEL_64_USERSPACE_32 ++ unsigned int pad; ++#endif + }; + + /* one entry */ +-- +2.26.2 + diff --git a/buildroot/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch b/buildroot/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch new file mode 100644 index 000000000..cb57b3956 --- /dev/null +++ b/buildroot/package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch @@ -0,0 +1,51 @@ +From ebf0236270b977a62c522bc32810bc9f8edc72d1 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Wed, 24 Mar 2021 13:40:14 +0100 +Subject: [PATCH] configure.ac: add option --enable-kernel-64-userland-32 + +The ebtables build system seems to assume that 'sparc64' is the +only case where KERNEL_64_USERSPACE_32 is relevant, but this is not true. +This situation can happen on many architectures, especially in embedded +systems. For example, an Aarch64 processor with kernel in 64-bit but +userland build for 32-bit Arm. Or a 64-bit MIPS Octeon III processor, with +userland running in the 'n32' ABI. + +While it is possible to set CFLAGS in the environment when calling the +configure script, the caller would need to know to not only specify +KERNEL_64_USERSPACE_32 but also the EBT_MIN_ALIGN value. + +Instead, add a configure option. All internal details can then be handled by +the configure script. + +Signed-off-by: Thomas De Schampheleire +Upstream-Status: http://patchwork.ozlabs.org/project/netfilter-devel/patch/20210518181730.13436-2-patrickdepinguin@gmail.com/ +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c24ede3..3e89c0c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,10 +15,17 @@ AS_IF([test "x$LOCKFILE" = x], [LOCKFILE="/var/lib/ebtables/lock"]) + + regular_CFLAGS="-Wall -Wunused" + regular_CPPFLAGS="" ++ + case "$host" in + sparc64-*) +- regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32";; ++ enable_kernel_64_userland_32=yes ;; + esac ++AC_ARG_ENABLE([kernel-64-userland-32], ++ AC_HELP_STRING([--enable-kernel-64-userland-32], [indicate that ebtables will be built as a 32-bit application but run under a 64-bit kernel]) ++) ++AS_IF([test "x$enable_kernel_64_userland_32" = xyes], ++ [regular_CPPFLAGS="$regular_CPPFLAGS -DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32"] ++) + + AC_SUBST([regular_CFLAGS]) + AC_SUBST([regular_CPPFLAGS]) +-- +2.26.2 + diff --git a/buildroot/package/ebtables/ebtables.mk b/buildroot/package/ebtables/ebtables.mk index 54932334c..2f9dd5ac4 100644 --- a/buildroot/package/ebtables/ebtables.mk +++ b/buildroot/package/ebtables/ebtables.mk @@ -11,6 +11,12 @@ EBTABLES_LICENSE_FILES = COPYING EBTABLES_CPE_ID_VENDOR = netfilter EBTABLES_SELINUX_MODULES = iptables +# for 0003-configure.ac-add-option-enable-kernel-64-userland-32.patch +EBTABLES_AUTORECONF = YES +ifeq ($(BR2_KERNEL_64_USERLAND_32),y) +EBTABLES_CONF_OPTS += --enable-kernel-64-userland-32 +endif + ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y) define EBTABLES_INSTALL_TARGET_UTILS_SAVE $(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save diff --git a/buildroot/package/efibootmgr/Config.in b/buildroot/package/efibootmgr/Config.in index d31f9b13e..98ff71c99 100644 --- a/buildroot/package/efibootmgr/Config.in +++ b/buildroot/package/efibootmgr/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ diff --git a/buildroot/package/efl/Config.in b/buildroot/package/efl/Config.in index 305d1469a..05ded72cf 100644 --- a/buildroot/package/efl/Config.in +++ b/buildroot/package/efl/Config.in @@ -258,6 +258,7 @@ config BR2_PACKAGE_EFL_WEBP config BR2_PACKAGE_EFL_LIBRAW bool "libraw loader" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libraw select BR2_PACKAGE_LIBRAW help This option enables the Evas generic Libraw loader diff --git a/buildroot/package/enlightenment/enlightenment.mk b/buildroot/package/enlightenment/enlightenment.mk index 12827964e..969b391cd 100644 --- a/buildroot/package/enlightenment/enlightenment.mk +++ b/buildroot/package/enlightenment/enlightenment.mk @@ -10,6 +10,7 @@ ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) ENLIGHTENMENT_LICENSE_FILES = COPYING \ src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt +ENLIGHTENMENT_CPE_ID_VENDOR = enlightenment ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/enscript/enscript.mk b/buildroot/package/enscript/enscript.mk index fbc9e69da..441ae3dad 100644 --- a/buildroot/package/enscript/enscript.mk +++ b/buildroot/package/enscript/enscript.mk @@ -8,6 +8,7 @@ ENSCRIPT_VERSION = 1.6.6 ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript ENSCRIPT_LICENSE = GPL-3.0+ ENSCRIPT_LICENSE_FILES = COPYING +ENSCRIPT_CPE_ID_VENDOR = gnu # Enable pthread threads if toolchain supports threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/buildroot/package/environment-setup/environment-setup.mk b/buildroot/package/environment-setup/environment-setup.mk index fcad013f0..f4c52921f 100644 --- a/buildroot/package/environment-setup/environment-setup.mk +++ b/buildroot/package/environment-setup/environment-setup.mk @@ -26,8 +26,8 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS printf "alias cmake=\"cmake \ -DCMAKE_TOOLCHAIN_FILE=$(HOST_DIR)/share/buildroot/toolchainfile.cmake \ -DCMAKE_INSTALL_PREFIX=/usr\"\n" >> $(ENVIRONMENT_SETUP_FILE) - $(SED) 's%$(HOST_DIR)%\$$SDK_PATH%g' \ - -e 's%$(HOST_DIR)/bin/%%g' \ + $(SED) 's%$(HOST_DIR)/bin/%%g' \ + -e 's%$(HOST_DIR)%\$$SDK_PATH%g' \ -e '/^export "PATH=/c\' \ $(ENVIRONMENT_SETUP_FILE) printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \ diff --git a/buildroot/package/exempi/exempi.mk b/buildroot/package/exempi/exempi.mk index 3790b16b3..f481469d2 100644 --- a/buildroot/package/exempi/exempi.mk +++ b/buildroot/package/exempi/exempi.mk @@ -13,5 +13,6 @@ EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause EXEMPI_LICENSE_FILES = COPYING +EXEMPI_CPE_ID_VENDOR = exempi_project $(eval $(autotools-package)) diff --git a/buildroot/package/expat/expat.hash b/buildroot/package/expat/expat.hash index 5a8dd4128..8cf563d8f 100644 --- a/buildroot/package/expat/expat.hash +++ b/buildroot/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.10/ -md5 e0fe49a6b3480827c9455e4cfc799133 expat-2.2.10.tar.xz -sha1 a333b95121a718a77ee481dbade5efcd72a32eb8 expat-2.2.10.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.4.1/ +md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz +sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz # Locally calculated -sha256 5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2 expat-2.2.10.tar.xz +sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING diff --git a/buildroot/package/expat/expat.mk b/buildroot/package/expat/expat.mk index 4acbade2c..bb1cfd8c8 100644 --- a/buildroot/package/expat/expat.mk +++ b/buildroot/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.10 +EXPAT_VERSION = 2.4.1 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES diff --git a/buildroot/package/findutils/findutils.mk b/buildroot/package/findutils/findutils.mk index 13d8271e1..a16f82716 100644 --- a/buildroot/package/findutils/findutils.mk +++ b/buildroot/package/findutils/findutils.mk @@ -9,6 +9,7 @@ FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ FINDUTILS_LICENSE_FILES = COPYING +FINDUTILS_CPE_ID_VENDOR = gnu FINDUTILS_CONF_ENV = \ gl_cv_func_stdin=yes \ ac_cv_func_working_mktime=yes \ diff --git a/buildroot/package/flatcc/flatcc.mk b/buildroot/package/flatcc/flatcc.mk index c27809b86..fcace691c 100644 --- a/buildroot/package/flatcc/flatcc.mk +++ b/buildroot/package/flatcc/flatcc.mk @@ -10,6 +10,8 @@ FLATCC_LICENSE = Apache-2.0 FLATCC_LICENSE_FILES = LICENSE FLATCC_INSTALL_STAGING = YES FLATCC_DEPENDENCIES = host-flatcc +FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF +HOST_FLATCC_CONF_OPTS = -DFLATCC_ALLOW_WERROR=OFF # Disable build of tests and samples FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF diff --git a/buildroot/package/fluidsynth/fluidsynth.mk b/buildroot/package/fluidsynth/fluidsynth.mk index dc777e0bf..e3269f530 100644 --- a/buildroot/package/fluidsynth/fluidsynth.mk +++ b/buildroot/package/fluidsynth/fluidsynth.mk @@ -8,6 +8,7 @@ FLUIDSYNTH_VERSION = 2.1.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE +FLUIDSYNTH_CPE_ID_VENDOR = fluidsynth FLUIDSYNTH_INSTALL_STAGING = YES FLUIDSYNTH_DEPENDENCIES = libglib2 diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/Config.in b/buildroot/package/freescale-imx/imx-gpu-viv/Config.in index cca268990..232e70a80 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/Config.in +++ b/buildroot/package/freescale-imx/imx-gpu-viv/Config.in @@ -83,11 +83,16 @@ config BR2_PACKAGE_PROVIDES_LIBOPENVG config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" + # example binaries are linked against libstdc++.so.6 + depends on BR2_INSTALL_LIBSTDCPP help Copy the Vivante examples to the target. Warning: examples take approximately 150 MB of disk space. +comment "imx-gpu-viv-examples need a toolchain w/ C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO bool "install gmem_info tool" help diff --git a/buildroot/package/frr/frr.mk b/buildroot/package/frr/frr.mk index 0907c0ad9..d1ca6e0b1 100644 --- a/buildroot/package/frr/frr.mk +++ b/buildroot/package/frr/frr.mk @@ -8,6 +8,8 @@ FRR_VERSION = 7.5.1 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING +FRR_CPE_ID_VENDOR = linuxfoundation +FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES FRR_DEPENDENCIES = host-frr readline json-c \ diff --git a/buildroot/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch b/buildroot/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch new file mode 100644 index 000000000..5cdafae7a --- /dev/null +++ b/buildroot/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch @@ -0,0 +1,41 @@ +From 808601f075fe3dd8ca101e31c9121a4e87f0bfc7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 6 May 2021 07:45:00 +0200 +Subject: [PATCH] gdb/configure.tgt: build gdbserver with m68k and + uclibc + +Allow to build gdbserver with m68k and uclibc: + +checking whether gdbserver is supported on this host... no +configure: error: Automatic gdbserver build is not supported for this configuration + +Fixes: + - http://autobuild.buildroot.org/results/f4d6d9d8418c0da48a3db4ad5a82e19bd16eae34 + +Signed-off-by: Fabrice Fontaine +--- + gdb/configure.tgt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/configure.tgt b/gdb/configure.tgt +index caa42be1c01..8666bc5d0bf 100644 +--- a/gdb/configure.tgt ++++ b/gdb/configure.tgt +@@ -372,12 +372,12 @@ m68hc11*-*-*|m6811*-*-*) + gdb_sim=../sim/m68hc11/libsim.a + ;; + +-m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \ ++m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | \ + fido-*-elf*) + # Target: Motorola m68k embedded + gdb_target_obs="m68k-tdep.o" + ;; +-m68*-*-linux*) ++m68*-*-*linux*) + # Target: Motorola m68k with a.out and ELF + gdb_target_obs="m68k-tdep.o m68k-linux-tdep.o solib-svr4.o \ + linux-tdep.o glibc-tdep.o symfile-mem.o" +-- +2.30.2 + diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index 500ae02cc..e077d5544 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 1c6911937df4a277fa74e7b7efc3d08594498c4c4adc0b6c4ae3566137528091 go1.15.12.src.tar.gz +sha256 99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244 go1.15.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index 639fc401b..3d1dcf02d 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.12 +GO_VERSION = 1.15.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz diff --git a/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch b/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch index 518639387..02f954531 100644 --- a/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch +++ b/buildroot/package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch @@ -29,7 +29,7 @@ index 1b18cf2..4ebfde1 100644 #include #include #include --#ifdef __APPLE__ +-#if defined (__APPLE__) || (__FreeBSD__) #include -#else -#include diff --git a/buildroot/package/gptfdisk/gptfdisk.hash b/buildroot/package/gptfdisk/gptfdisk.hash index bff17dcc2..7894f2187 100644 --- a/buildroot/package/gptfdisk/gptfdisk.hash +++ b/buildroot/package/gptfdisk/gptfdisk.hash @@ -1,6 +1,5 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.5/ -md5 58dac67c85e46ca87b587231549aefe6 gptfdisk-1.0.5.tar.gz -sha1 b642aa628cbc9fa63e9a73dad5acc588042527ac gptfdisk-1.0.5.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.7/ +sha1 406ab2596e1911c916dce677ce7e903076d94c6d gptfdisk-1.0.7.tar.gz # Locally computed -sha256 0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f gptfdisk-1.0.5.tar.gz +sha256 754004b7f85b279287c7ac3c0469b1d7e0eae043a97a2e587b0560ca5f3828c0 gptfdisk-1.0.7.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/gptfdisk/gptfdisk.mk b/buildroot/package/gptfdisk/gptfdisk.mk index e848837b7..d92a52710 100644 --- a/buildroot/package/gptfdisk/gptfdisk.mk +++ b/buildroot/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.5 +GPTFDISK_VERSION = 1.0.7 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING diff --git a/buildroot/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk index 27b28deff..f7a704dcd 100644 --- a/buildroot/package/grpc/grpc.mk +++ b/buildroot/package/grpc/grpc.mk @@ -8,6 +8,7 @@ GRPC_VERSION = 1.35.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE +GRPC_CPE_ID_VENDOR = grpc GRPC_INSTALL_STAGING = YES 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 f1be9cd96..f4cf0d534 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -12,6 +12,8 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+ +GST1_PLUGINS_BAD_CPE_ID_VENDOR = freedesktop +GST1_PLUGINS_BAD_CPE_ID_PRODUCT = gst-plugins-bad GST1_PLUGINS_BAD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) 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 95d917fd5..878195b74 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -9,6 +9,8 @@ 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+ GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB +GST1_RTSP_SERVER_CPE_ID_VENDOR = gstreamer_project +GST1_RTSP_SERVER_CPE_ID_PRODUCT = gst-rtsp-server GST1_RTSP_SERVER_INSTALL_STAGING = YES GST1_RTSP_SERVER_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk index 99846c1be..171ea2b8e 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -10,6 +10,8 @@ GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ +GSTREAMER1_CPE_ID_VENDOR = gstreamer_project +GSTREAMER1_CPE_ID_PRODUCT = gstreamer GSTREAMER1_CONF_OPTS = \ -Dexamples=disabled \ diff --git a/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch b/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch deleted file mode 100644 index 05b07b49c..000000000 --- a/buildroot/package/gupnp/0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9225b076d107538209fbd5b8bbc21a68d1b2c016 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 Jul 2020 22:42:44 +0200 -Subject: [PATCH] Revert "build: Always build gupnp-binding-tool manpage" - -This reverts commit 23f54c2a1e8718e836224d68dafded091604a677 until -upstream decides what to do between adding a new option or renaming -gtk_doc into documentation: -https://gitlab.gnome.org/GNOME/gupnp/-/issues/17 - -Signed-off-by: Fabrice Fontaine ---- - doc/meson.build | 2 -- - meson.build | 5 ++++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/doc/meson.build b/doc/meson.build -index b71b657..478650b 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -4,7 +4,6 @@ version_xml = configure_file(input: 'version.xml.in', - output: 'version.xml', configuration: - entities) - --if get_option('gtk_doc') - gnome.gtkdoc('gupnp', - main_xml : 'gupnp-docs.xml', - src_dir : [join_paths(meson.source_root(), 'libgupnp'), -@@ -27,7 +26,6 @@ gnome.gtkdoc('gupnp', - 'gupnp-types-private.h' - ], - install : true) --endif - - xsltproc = find_program('xsltproc', required: false) - if xsltproc.found() -diff --git a/meson.build b/meson.build -index 28c40b2..dea0a49 100644 ---- a/meson.build -+++ b/meson.build -@@ -31,12 +31,15 @@ dependencies = [ - subdir('libgupnp') - subdir('tests') - subdir('tools') --subdir('doc') - - if get_option('vapi') and get_option('introspection') - subdir('vala') - endif - -+if get_option('gtk_doc') -+ subdir('doc') -+endif -+ - if get_option('examples') - subdir('examples') - endif --- -2.27.0 - diff --git a/buildroot/package/gupnp/0001-doc-Check-for-stylesheet-existence-on-doc-build.patch b/buildroot/package/gupnp/0001-doc-Check-for-stylesheet-existence-on-doc-build.patch new file mode 100644 index 000000000..448996da0 --- /dev/null +++ b/buildroot/package/gupnp/0001-doc-Check-for-stylesheet-existence-on-doc-build.patch @@ -0,0 +1,73 @@ +From 7ce37c94596029358a67d732a82e4313f7b89135 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 30 May 2021 13:13:00 +0200 +Subject: [PATCH] doc: Check for stylesheet existence on doc build + +Checking for xsltproc is not enough + +Fixes #17 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gupnp/-/commit/7ce37c94596029358a67d732a82e4313f7b89135] +Signed-off-by: Fabrice Fontaine +--- + doc/meson.build | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index 26c32c9..eb69d07 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -30,6 +30,8 @@ endif + + xsltproc = find_program('xsltproc', required: false) + if xsltproc.found() ++ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' ++ + xlstproc_flags = [ + '--nonet', + '--xinclude', +@@ -45,17 +47,31 @@ if xsltproc.found() + xsltproc, + xlstproc_flags, + '-o', '@OUTPUT@', +- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', ++ stylesheet, + '@INPUT@' + ] + +- custom_target( +- 'man 1 pages', +- input: 'gupnp-binding-tool.xml', +- output: 'gupnp-binding-tool-1.2.1', +- command: xsltproc_args, +- depend_files : version_xml, +- install: true, +- install_dir: join_paths(get_option('mandir'), 'man1') ++ stylesheet_check = run_command( ++ [ ++ xsltproc, ++ xlstproc_flags, ++ '--noout', ++ stylesheet, ++ 'gupnp-binding-tool.xml' ++ ] + ) ++ if (stylesheet_check.returncode() == 0) ++ message('Stylesheet ' + stylesheet + ' available') ++ custom_target( ++ 'man 1 pages', ++ input: 'gupnp-binding-tool.xml', ++ output: 'gupnp-binding-tool-1.2.1', ++ command: xsltproc_args, ++ depend_files : version_xml, ++ install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1') ++ ) ++ else ++ message('Stylesheet ' + stylesheet + ' not found, not building man page') ++ endif + endif +-- +GitLab + diff --git a/buildroot/package/gupnp/gupnp.hash b/buildroot/package/gupnp/gupnp.hash index 60339ec9c..7064c9f6b 100644 --- a/buildroot/package/gupnp/gupnp.hash +++ b/buildroot/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.4.sha256sum: -sha256 f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1 gupnp-1.2.4.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.2/gupnp-1.2.6.sha256sum: +sha256 00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd gupnp-1.2.6.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gupnp/gupnp.mk b/buildroot/package/gupnp/gupnp.mk index e90787eb8..7ec0e6388 100644 --- a/buildroot/package/gupnp/gupnp.mk +++ b/buildroot/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.2 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).6 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/buildroot/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch new file mode 100644 index 000000000..e52dbdb69 --- /dev/null +++ b/buildroot/package/hostapd/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch @@ -0,0 +1,32 @@ +From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Mon, 20 Apr 2020 20:29:31 +0300 +Subject: [PATCH] Include stdbool.h to allow C99 bool to be used + +We have practically started requiring some C99 features, so might as +well finally go ahead and bring in the C99 bool as well. + +Signed-off-by: Jouni Malinen +[geomatsi@gmail.com: backport from upstream] +Signed-off-by: Sergey Matyukevich +[yann.morin.1998@free.fr: keep upstream sha1 in header, drop numbering] +Signed-off-by: Yann E. MORIN +--- + src/utils/includes.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils/includes.h b/src/utils/includes.h +index 75513fc8c..741fc9c14 100644 +--- a/src/utils/includes.h ++++ b/src/utils/includes.h +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.25.1 + diff --git a/buildroot/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/buildroot/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch new file mode 100644 index 000000000..a5415e7da --- /dev/null +++ b/buildroot/package/hostapd/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch @@ -0,0 +1,37 @@ +From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 23:14:23 +0200 +Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values + +Signed-off-by: Jouni Malinen +[geomatsi@gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] +Signed-off-by: Sergey Matyukevich +[yann.morin.1998@free.fr: + - reformat, keep the upstream sha1 and title, + - drop numbering +] +Signed-off-by: Yann E. MORIN +--- + src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 102 insertions(+) + +diff --git a/src/tls/asn1.h b/src/tls/asn1.h +index de3430adb..a4d1be473 100644 +--- a/src/tls/asn1.h ++++ b/src/tls/asn1.h +@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, + unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); + int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); + ++static inline bool asn1_is_null(const struct asn1_hdr *hdr) ++{ ++ return hdr->class == ASN1_CLASS_UNIVERSAL && ++ hdr->tag == ASN1_TAG_NULL; ++} ++ + extern struct asn1_oid asn1_sha1_oid; + extern struct asn1_oid asn1_sha256_oid; + +-- +2.25.1 + diff --git a/buildroot/package/hostapd/hostapd.hash b/buildroot/package/hostapd/hostapd.hash index e2f76c12d..9ac5f4b39 100644 --- a/buildroot/package/hostapd/hostapd.hash +++ b/buildroot/package/hostapd/hostapd.hash @@ -3,4 +3,5 @@ sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostap sha256 2d9a5b9d616f1b4aa4a22b967cee866e2f69b798b0b46803a7928c8559842bd7 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch sha256 49feb35a5276279b465f6836d6fa2c6b34d94dc979e8b840d1918865c04260de 0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch sha256 a8212a2d89a5bab2824d22b6047e7740553df163114fcec94832bfa9c5c5d78a 0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch +sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/buildroot/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk index 8eff92eb1..8820254f8 100644 --- a/buildroot/package/hostapd/hostapd.mk +++ b/buildroot/package/hostapd/hostapd.mk @@ -11,7 +11,8 @@ HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_PATCH = \ https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch \ - https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch + https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch \ + https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch HOSTAPD_DEPENDENCIES = host-pkgconf HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause @@ -26,6 +27,9 @@ HOSTAPD_IGNORE_CVES += CVE-2020-12695 # 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch HOSTAPD_IGNORE_CVES += CVE-2021-30004 +# 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +HOSTAPD_IGNORE_CVES += CVE-2021-27803 + HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_CONFIG_SET = diff --git a/buildroot/package/hwloc/hwloc.mk b/buildroot/package/hwloc/hwloc.mk index 9ec94f818..b3cc5604d 100644 --- a/buildroot/package/hwloc/hwloc.mk +++ b/buildroot/package/hwloc/hwloc.mk @@ -20,9 +20,15 @@ HWLOC_CONF_OPTS = \ --disable-nvml \ --disable-gl \ --disable-cairo \ - --disable-libxml2 \ --disable-doxygen +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +HWLOC_CONF_OPTS += --enable-libudev +HWLOC_DEPENDENCIES += udev +else +HWLOC_CONF_OPTS += --disable-libudev +endif + ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y) HWLOC_CONF_OPTS += --enable-pci HWLOC_DEPENDENCIES += libpciaccess @@ -30,6 +36,17 @@ else HWLOC_CONF_OPTS += --disable-pci endif +ifeq ($(BR2_PACKAGE_LIBXML2),y) +HWLOC_CONF_OPTS += --enable-libxml2 +HWLOC_DEPENDENCIES += libxml2 +else +HWLOC_CONF_OPTS += --disable-libxml2 +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +HWLOC_DEPENDENCIES += ncurses +endif + ifeq ($(BR2_PACKAGE_NUMACTL),y) HWLOC_CONF_OPTS += --enable-libnuma HWLOC_DEPENDENCIES += numactl diff --git a/buildroot/package/i2c-tools/i2c-tools.mk b/buildroot/package/i2c-tools/i2c-tools.mk index c1770cf63..8936f6c4f 100644 --- a/buildroot/package/i2c-tools/i2c-tools.mk +++ b/buildroot/package/i2c-tools/i2c-tools.mk @@ -9,6 +9,7 @@ I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README +I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES diff --git a/buildroot/package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch b/buildroot/package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch new file mode 100644 index 000000000..92eedccab --- /dev/null +++ b/buildroot/package/iftop/0002-Rename-pcap_filter-to-iftop_pcap_filter.patch @@ -0,0 +1,51 @@ +From 64a185ce2017e4523f4bc39a36c7aebd6d68549a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Jun 2021 08:21:04 +0200 +Subject: [PATCH] Rename pcap_filter to iftop_pcap_filter + +Rename pcap_filter to iftop_pcap_filter to fix the following static +build failure: + +/home/buildroot/autobuild/run/instance-3/output-1/host/bin/riscv64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o iftop addr_hash.o edline.o hash.o iftop.o ns_hash.o options.o resolver.o screenfilter.o serv_hash.o sorted_list.o threadprof.o ui_common.o ui.o tui.o util.o addrs_ioctl.o addrs_dlpi.o dlcommon.o stringmap.o cfgfile.o vector.o -lpcap -lpcap -L/home/buildroot/autobuild/run/instance-3/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/bin/../../../../bin/../riscv64-buildroot-linux-musl/sysroot/usr/lib -lnl-genl-3 -lnl-3 -lpthread -lcurses +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/bin/../../../../bin/../riscv64-buildroot-linux-musl/sysroot/usr/lib/libpcap.a(bpf_filter.o): in function `pcap_filter': +bpf_filter.c:(.text+0x4a8): multiple definition of `pcap_filter'; iftop.o:iftop.c:(.bss+0x1a8): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/eb53ff6b031c654daec57050dec376b5c9134a81 + +Signed-off-by: Fabrice Fontaine +--- + iftop.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/iftop.c b/iftop.c +index aaec6aa..f89eee3 100644 +--- a/iftop.c ++++ b/iftop.c +@@ -74,7 +74,7 @@ int history_len = 1; + pthread_mutex_t tick_mutex; + + pcap_t* pd; /* pcap descriptor */ +-struct bpf_program pcap_filter; ++struct bpf_program iftop_pcap_filter; + pcap_handler packet_handler; + + sig_atomic_t foad; +@@ -679,12 +679,12 @@ char *set_filter_code(const char *filter) { + sprintf(x, "(%s) and (ip or ip6)", filter); + } else + x = xstrdup("ip or ip6"); +- if (pcap_compile(pd, &pcap_filter, x, 1, 0) == -1) { ++ if (pcap_compile(pd, &iftop_pcap_filter, x, 1, 0) == -1) { + xfree(x); + return pcap_geterr(pd); + } + xfree(x); +- if (pcap_setfilter(pd, &pcap_filter) == -1) ++ if (pcap_setfilter(pd, &iftop_pcap_filter) == -1) + return pcap_geterr(pd); + else + return NULL; +-- +2.30.2 + diff --git a/buildroot/package/imagemagick/imagemagick.hash b/buildroot/package/imagemagick/imagemagick.hash index c45caf6c5..b787643fd 100644 --- a/buildroot/package/imagemagick/imagemagick.hash +++ b/buildroot/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84442158aea070095efa832cfe868fd99d6befdf609444f0c9e9f1b4f25480cd imagemagick-7.0.10-62.tar.gz +sha256 fc454be622724c6224fa6c8230bb9c50191a05fbf05b9c9c25aa3e5497090b83 imagemagick-7.0.11-13.tar.gz sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE diff --git a/buildroot/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk index 97517228c..a6eaf9988 100644 --- a/buildroot/package/imagemagick/imagemagick.mk +++ b/buildroot/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.10-62 +IMAGEMAGICK_VERSION = 7.0.11-13 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch b/buildroot/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch new file mode 100644 index 000000000..bc7a27f4d --- /dev/null +++ b/buildroot/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch @@ -0,0 +1,51 @@ +From f09fddd6763aca237f19417de05a1f5de7f51d40 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Jun 2021 16:57:32 +0200 +Subject: [PATCH] cmrtlib/linux/CMakelists.txt: respect + MEDIA_BUILD_FATAL_WARNINGS + +Respect MEDIA_BUILD_FATAL_WARNINGS to avoid the following build failure +when the user provides _FORTIFY_SOURCE: + +In file included from /home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/dlfcn.h:22, + from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/linux/../linux/share/cm_include.h:30, + from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/agnostic/share/cm_printf_host.cpp:23: +/home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/features.h:397:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + 397 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/52638d95312e464626d1c4047b3b26d4f57a1cd2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/intel/media-driver/pull/1203] +--- + cmrtlib/linux/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt +index 7a0193a8..65f71cee 100644 +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -32,12 +32,16 @@ else() + + # Set up compile options that will be used for the Linux build + if(CMAKE_COMPILER_IS_GNUCC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") ++ if(MEDIA_BUILD_FATAL_WARNINGS) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") ++ endif() + + set(GCC_SECURE_LINK_FLAGS "-z relro -z now") + set(CMAKE_SKIP_RPATH ON) +-- +2.30.2 + diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.mk b/buildroot/package/intel-mediadriver/intel-mediadriver.mk index 963e4b8f9..01423b961 100644 --- a/buildroot/package/intel-mediadriver/intel-mediadriver.mk +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.mk @@ -23,6 +23,7 @@ INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ -DINSTALL_DRIVER_SYSCONF=OFF \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package)) diff --git a/buildroot/package/intel-microcode/intel-microcode.hash b/buildroot/package/intel-microcode/intel-microcode.hash index 289428b4b..23191d953 100644 --- a/buildroot/package/intel-microcode/intel-microcode.hash +++ b/buildroot/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e42a264b7b86e80d013d6d00062467352c1f37e0aaea10fe5b51e4d8687921ab intel-microcode-20201118.tar.gz -sha256 d9e989e1a7747f3ce93cb749aceca67a430d36c9bebc6e3205e0b3af3ca6304b license +sha256 b855c81f78705f35341248a0603aa1a6e199ca7f59cd425e061b579329aa9eaa intel-microcode-20210216.tar.gz +sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/buildroot/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk index 5a13ca2cb..208900388 100644 --- a/buildroot/package/intel-microcode/intel-microcode.mk +++ b/buildroot/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20201118 +INTEL_MICROCODE_VERSION = 20210216 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/jquery-validation/jquery-validation.hash b/buildroot/package/jquery-validation/jquery-validation.hash index af451a6c1..4dbe07e21 100644 --- a/buildroot/package/jquery-validation/jquery-validation.hash +++ b/buildroot/package/jquery-validation/jquery-validation.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 14efe6f1784ef6e97116b15c77b04b7e8f47ec07b1479bcd6fa0b081faa19440 jquery-validation-1.14.0.zip -sha256 c2f9aa180de990ff16ca7e756c9af52ecc1b3536e3fb32649d7b2c510bccf9d0 README.md +sha256 01ad2ef0a7f9cd413aeb51081651293916da47d20e5c0a59ec62587e58b03564 jquery-validation-1.19.3.zip +sha256 3e5a99460077c16bf75f6821a30cdac9baa339119ebf63b2a6c49f4f50421ca4 README.md diff --git a/buildroot/package/jquery-validation/jquery-validation.mk b/buildroot/package/jquery-validation/jquery-validation.mk index a8c289798..920ed1cec 100644 --- a/buildroot/package/jquery-validation/jquery-validation.mk +++ b/buildroot/package/jquery-validation/jquery-validation.mk @@ -4,11 +4,13 @@ # ################################################################################ -JQUERY_VALIDATION_VERSION = 1.14.0 -JQUERY_VALIDATION_SITE = http://jqueryvalidation.org/files +JQUERY_VALIDATION_VERSION = 1.19.3 +JQUERY_VALIDATION_SITE = https://github.com/jquery-validation/jquery-validation/releases/download/$(JQUERY_VALIDATION_VERSION) JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip JQUERY_VALIDATION_LICENSE = MIT JQUERY_VALIDATION_LICENSE_FILES = README.md +JQUERY_VALIDATION_CPE_ID_VENDOR = jqueryvalidation +JQUERY_VALIDATION_CPE_ID_PRODUCT = jquery_validation define JQUERY_VALIDATION_EXTRACT_CMDS $(UNZIP) -d $(@D) $(JQUERY_VALIDATION_DL_DIR)/$(JQUERY_VALIDATION_SOURCE) diff --git a/buildroot/package/keepalived/keepalived.mk b/buildroot/package/keepalived/keepalived.mk index 1a42d0c88..5d42cab74 100644 --- a/buildroot/package/keepalived/keepalived.mk +++ b/buildroot/package/keepalived/keepalived.mk @@ -9,6 +9,7 @@ KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING +KEEPALIVED_CPE_ID_VENDOR = keepalived KEEPALIVED_CONF_OPTS = --disable-hardening ifeq ($(BR2_PACKAGE_JSON_C),y) diff --git a/buildroot/package/kodi/Config.in b/buildroot/package/kodi/Config.in index ecc5a0532..72cdbabf8 100644 --- a/buildroot/package/kodi/Config.in +++ b/buildroot/package/kodi/Config.in @@ -35,6 +35,7 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_INSTALL_LIBSTDCPP # waylandpp depends on BR2_PACKAGE_WAYLAND # waylandpp select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk index e9110cba9..e76118c32 100644 --- a/buildroot/package/kodi/kodi.mk +++ b/buildroot/package/kodi/kodi.mk @@ -6,10 +6,14 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 18.9-Leia +KODI_VERSION_MAJOR = 18.9 +KODI_VERSION_NAME = Leia +KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md +KODI_CPE_ID_VENDOR = kodi +KODI_CPE_ID_VERSION = $(KODI_VERSION_MAJOR) # needed for binary addons KODI_INSTALL_STAGING = YES # kodi recommends building out-of-source diff --git a/buildroot/package/less/less.mk b/buildroot/package/less/less.mk index 89962f952..a15bd25be 100644 --- a/buildroot/package/less/less.mk +++ b/buildroot/package/less/less.mk @@ -8,6 +8,7 @@ LESS_VERSION = 563 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING +LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses define LESS_INSTALL_TARGET_CMDS diff --git a/buildroot/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch b/buildroot/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch new file mode 100644 index 000000000..aa8d659cf --- /dev/null +++ b/buildroot/package/libcamera/0001-libcamera-add-dependencies-to-libcamera_dep.patch @@ -0,0 +1,37 @@ +From 1a2fd4526e0858827f47a7e9359df34f0d0e3108 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 27 May 2021 21:00:21 +0200 +Subject: [PATCH] libcamera: add dependencies to libcamera_dep + +Add dependencies to libcamera_dep to avoid the following build failure +with qcam on sparc v8 which is raised since commit +a8310248fc26cc1e1b791af5e9394c1d20bee269: + +FAILED: src/qcam/qcam +/srv/storage/autobuild/run/instance-0/output-1/host/bin/sparc-linux-g++ -o src/qcam/qcam src/qcam/qcam.p/meson-generated_.._qt5-feathericons_qrc.cpp.o src/qcam/qcam.p/meson-generated_moc_main_window.cpp.o src/qcam/qcam.p/meson-generated_moc_viewfinder_qt.cpp.o src/qcam/qcam.p/.._cam_options.cpp.o src/qcam/qcam.p/.._cam_stream_options.cpp.o src/qcam/qcam.p/format_converter.cpp.o src/qcam/qcam.p/main.cpp.o src/qcam/qcam.p/main_window.cpp.o src/qcam/qcam.p/message_handler.cpp.o src/qcam/qcam.p/viewfinder_qt.cpp.o src/qcam/qcam.p/dng_writer.cpp.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wshadow -include config.h '-Wl,-rpath,$ORIGIN/../libcamera' -Wl,-rpath-link,/srv/storage/autobuild/run/instance-0/output-1/build/libcamera-3a1f67a8031ac5ad96a11d5dc8b2e8976290497b/build/src/libcamera -Wl,--start-group src/libcamera/libcamera.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Core.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Gui.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libQt5Widgets.so /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libtiff.so -Wl,--end-group +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/qcam/qcam.p/main_window.cpp.o: undefined reference to symbol '__atomic_fetch_add_4@@LIBATOMIC_1.0' +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line + +Fixes: + - http://autobuild.buildroot.org/results/d0726b2253f1f3d006e057f3b32c646c4b9b5f7a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.libcamera.org/show_bug.cgi?id=39] +--- + src/libcamera/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build +index cc2b8669..af3533ad 100644 +--- a/src/libcamera/meson.build ++++ b/src/libcamera/meson.build +@@ -160,6 +160,7 @@ libcamera_dep = declare_dependency(sources : [ + libcamera_public_headers, + ], + include_directories : libcamera_includes, ++ dependencies : libcamera_deps, + link_with : libcamera) + + subdir('proxy/worker') +-- +2.30.2 diff --git a/buildroot/package/libcurl/0001-bearssl-remove-incorrect-const-on-variable-that-is-m.patch b/buildroot/package/libcurl/0001-bearssl-remove-incorrect-const-on-variable-that-is-m.patch new file mode 100644 index 000000000..b88791fa4 --- /dev/null +++ b/buildroot/package/libcurl/0001-bearssl-remove-incorrect-const-on-variable-that-is-m.patch @@ -0,0 +1,32 @@ +From a03ea6223950002eba8b1ef0df3133c62f387d6b Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Tue, 25 May 2021 23:42:07 -0700 +Subject: [PATCH] bearssl: remove incorrect const on variable that is modified + +hostname may be set to NULL later on in this function if it is an +IP address. + +Closes #7133 + +[peter@korsgaard.com: backported from upstream] +Signed-off-by: Peter Korsgaard +--- + lib/vtls/bearssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c +index 7f729713d..40a5e7879 100644 +--- a/lib/vtls/bearssl.c ++++ b/lib/vtls/bearssl.c +@@ -300,7 +300,7 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data, + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + struct ssl_backend_data *backend = connssl->backend; + const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); +- const char * const hostname = SSL_HOST_NAME(); ++ const char *hostname = SSL_HOST_NAME(); + const bool verifypeer = SSL_CONN_CONFIG(verifypeer); + const bool verifyhost = SSL_CONN_CONFIG(verifyhost); + CURLcode ret; +-- +2.20.1 + diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 9ee98f1e1..183321588 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.76.1.tar.xz.asc +# https://curl.haxx.se/download/curl-7.77.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145 curl-7.76.1.tar.xz +sha256 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b curl-7.77.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index f2cfd7289..53ff9836c 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.76.1 +LIBCURL_VERSION = 7.77.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -24,7 +24,7 @@ LIBCURL_INSTALL_STAGING = YES # generate C code) isn't very useful LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option + --disable-libcurl-option --disable-ldap --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -150,8 +150,6 @@ LIBCURL_CONF_OPTS += \ --enable-dict \ --enable-gopher \ --enable-imap \ - --enable-ldap \ - --enable-ldaps \ --enable-pop3 \ --enable-rtsp \ --enable-smb \ @@ -163,8 +161,6 @@ LIBCURL_CONF_OPTS += \ --disable-dict \ --disable-gopher \ --disable-imap \ - --disable-ldap \ - --disable-ldaps \ --disable-pop3 \ --disable-rtsp \ --disable-smb \ diff --git a/buildroot/package/libcutl/libcutl.mk b/buildroot/package/libcutl/libcutl.mk index 49c05e601..2b704ad3b 100644 --- a/buildroot/package/libcutl/libcutl.mk +++ b/buildroot/package/libcutl/libcutl.mk @@ -11,5 +11,6 @@ LIBCUTL_SITE = https://www.codesynthesis.com/download/libcutl/$(LIBCUTL_VERSION_ LIBCUTL_INSTALL_STAGING = YES LIBCUTL_LICENSE = MIT LIBCUTL_LICENSE_FILES = LICENSE +HOST_LIBCUTL_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(host-autotools-package)) diff --git a/buildroot/package/libeXosip2/libeXosip2.mk b/buildroot/package/libeXosip2/libeXosip2.mk index dba2b63a0..3ed637a3d 100644 --- a/buildroot/package/libeXosip2/libeXosip2.mk +++ b/buildroot/package/libeXosip2/libeXosip2.mk @@ -11,6 +11,8 @@ LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip LIBEXOSIP2_INSTALL_STAGING = YES LIBEXOSIP2_LICENSE = GPL-2.0+ LIBEXOSIP2_LICENSE_FILES = COPYING +LIBEXOSIP2_CPE_ID_VENDOR = gnu +LIBEXOSIP2_CPE_ID_PRODUCT = exosip LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2 diff --git a/buildroot/package/libesmtp/Config.in b/buildroot/package/libesmtp/Config.in index f3ed521d2..db2dc8ec9 100644 --- a/buildroot/package/libesmtp/Config.in +++ b/buildroot/package/libesmtp/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBESMTP help Library for sending emails through SMTP. - http://brianstafford.info/libesmtp + https://libesmtp.github.io comment "libesmtp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libesmtp/libesmtp.mk b/buildroot/package/libesmtp/libesmtp.mk index dcffacedd..1f5cdec19 100644 --- a/buildroot/package/libesmtp/libesmtp.mk +++ b/buildroot/package/libesmtp/libesmtp.mk @@ -6,7 +6,7 @@ LIBESMTP_VERSION = 1.0.6 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 -LIBESMTP_SITE = http://brianstafford.info/libesmtp +LIBESMTP_SITE = http://sources.buildroot.net/libesmtp LIBESMTP_INSTALL_STAGING = YES LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) diff --git a/buildroot/package/libffi/libffi.mk b/buildroot/package/libffi/libffi.mk index f8b656834..c7705b9e4 100644 --- a/buildroot/package/libffi/libffi.mk +++ b/buildroot/package/libffi/libffi.mk @@ -6,7 +6,6 @@ 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 diff --git a/buildroot/package/libfuse/libfuse.mk b/buildroot/package/libfuse/libfuse.mk index 074dc5988..2677e4685 100644 --- a/buildroot/package/libfuse/libfuse.mk +++ b/buildroot/package/libfuse/libfuse.mk @@ -9,6 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB +LIBFUSE_CPE_ID_VENDOR = libfuse_project LIBFUSE_INSTALL_STAGING = YES LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBFUSE_CONF_OPTS = \ diff --git a/buildroot/package/libfuse3/libfuse3.mk b/buildroot/package/libfuse3/libfuse3.mk index d61e31339..b1624ba88 100644 --- a/buildroot/package/libfuse3/libfuse3.mk +++ b/buildroot/package/libfuse3/libfuse3.mk @@ -8,6 +8,8 @@ LIBFUSE3_VERSION = 3.10.3 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE +LIBFUSE3_CPE_ID_VENDOR = libfuse_project +LIBFUSE3_CPE_ID_PRODUCT = libfuse LIBFUSE3_INSTALL_STAGING = YES LIBFUSE3_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBFUSE3_CONF_OPTS = \ diff --git a/buildroot/package/libgeos/Config.in b/buildroot/package/libgeos/Config.in index ebe40bd1f..86a1cddcf 100644 --- a/buildroot/package/libgeos/Config.in +++ b/buildroot/package/libgeos/Config.in @@ -15,5 +15,5 @@ config BR2_PACKAGE_LIBGEOS comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 21464, 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ - !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ + BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/buildroot/package/libgtk2/libgtk2.mk b/buildroot/package/libgtk2/libgtk2.mk index bcdf3e5d8..d30e1d9d4 100644 --- a/buildroot/package/libgtk2/libgtk2.mk +++ b/buildroot/package/libgtk2/libgtk2.mk @@ -11,6 +11,8 @@ LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJ LIBGTK2_INSTALL_STAGING = YES LIBGTK2_LICENSE = LGPL-2.0+ LIBGTK2_LICENSE_FILES = COPYING +LIBGTK2_CPE_ID_VENDOR = gnome +LIBGTK2_CPE_ID_PRODUCT = gtk # For 0001-reduce-dependencies.patch LIBGTK2_AUTORECONF = YES diff --git a/buildroot/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk index f7345cf2e..9ece409ba 100644 --- a/buildroot/package/libgtk3/libgtk3.mk +++ b/buildroot/package/libgtk3/libgtk3.mk @@ -10,6 +10,8 @@ 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+ LIBGTK3_LICENSE_FILES = COPYING +LIBGTK3_CPE_ID_VENDOR = gnome +LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES LIBGTK3_AUTORECONF = YES diff --git a/buildroot/package/libical/libical.mk b/buildroot/package/libical/libical.mk index f9a266026..afbbfd98c 100644 --- a/buildroot/package/libical/libical.mk +++ b/buildroot/package/libical/libical.mk @@ -9,6 +9,7 @@ LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_V LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 LIBICAL_LICENSE_FILES = LICENSE +LIBICAL_CPE_ID_VENDOR = libical_project # 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch LIBICAL_IGNORE_CVES += CVE-2016-9584 diff --git a/buildroot/package/libidn/libidn.mk b/buildroot/package/libidn/libidn.mk index 2df343702..c49bbe098 100644 --- a/buildroot/package/libidn/libidn.mk +++ b/buildroot/package/libidn/libidn.mk @@ -12,6 +12,7 @@ LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 +LIBIDN_CPE_ID_VENDOR = gnu define LIBIDN_REMOVE_BINARY rm -f $(TARGET_DIR)/usr/bin/idn diff --git a/buildroot/package/libidn2/libidn2.mk b/buildroot/package/libidn2/libidn2.mk index 3f87b9bb8..4db302dbf 100644 --- a/buildroot/package/libidn2/libidn2.mk +++ b/buildroot/package/libidn2/libidn2.mk @@ -8,6 +8,7 @@ LIBIDN2_VERSION = 2.3.0 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN2_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode +LIBIDN2_CPE_ID_VENDOR = gnu LIBIDN2_DEPENDENCIES = \ host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ diff --git a/buildroot/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/buildroot/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch new file mode 100644 index 000000000..20aa75b74 --- /dev/null +++ b/buildroot/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch @@ -0,0 +1,42 @@ +From 455c4938f5822c017c7ff79dd2dca638b6410923 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Nov 2020 18:05:48 -0800 +Subject: [PATCH] Disable use of __NR_io_getevents when not defined + +Architectures like riscv32 do not define this syscall, therefore return +ENOSYS on such architectures + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923] +Signed-off-by: Fabrice Fontaine +--- + lib/internal.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/lib/internal.h b/lib/internal.h +index 1237827..f765461 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n, struct iocb **iocb) + return syscall(__NR_io_submit, ctx, n, iocb); + } + +-static inline int io_getevents(aio_context_t ctx, long min, long max, +- struct io_event *events, struct timespec *timeout) ++static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, ++ __attribute__((unused)) long min, ++ __attribute__((unused)) long max, ++ __attribute__((unused)) struct io_event *events, ++ __attribute__((unused)) struct timespec *timeout) + { ++#ifdef __NR_io_getevents + return syscall(__NR_io_getevents, ctx, min, max, events, timeout); ++#else ++ return -ENOSYS; ++#endif + } + + /************************************************************ diff --git a/buildroot/package/libldns/libldns.mk b/buildroot/package/libldns/libldns.mk index 75159389d..9c248bbc1 100644 --- a/buildroot/package/libldns/libldns.mk +++ b/buildroot/package/libldns/libldns.mk @@ -9,6 +9,8 @@ LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause LIBLDNS_LICENSE_FILES = LICENSE +LIBLDNS_CPE_ID_VENDOR = nlnetlabs +LIBLDNS_CPE_ID_PRODUCT = ldns LIBLDNS_INSTALL_STAGING = YES LIBLDNS_DEPENDENCIES = openssl # --disable-dane-verify can be removed after openssl bump to 1.1.x diff --git a/buildroot/package/libmms/libmms.mk b/buildroot/package/libmms/libmms.mk index 236fe1376..a4c40ad60 100644 --- a/buildroot/package/libmms/libmms.mk +++ b/buildroot/package/libmms/libmms.mk @@ -10,5 +10,6 @@ LIBMMS_INSTALL_STAGING = YES LIBMMS_DEPENDENCIES = host-pkgconf libglib2 LIBMMS_LICENSE = LGPL-2.1+ LIBMMS_LICENSE_FILES = COPYING.LIB +LIBMMS_CPE_ID_VENDOR = libmms_project $(eval $(autotools-package)) diff --git a/buildroot/package/libmodbus/libmodbus.mk b/buildroot/package/libmodbus/libmodbus.mk index 584ac7505..52eb318a9 100644 --- a/buildroot/package/libmodbus/libmodbus.mk +++ b/buildroot/package/libmodbus/libmodbus.mk @@ -8,6 +8,7 @@ LIBMODBUS_VERSION = 3.1.6 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER +LIBMODBUS_CPE_ID_VENDOR = libmodbus LIBMODBUS_INSTALL_STAGING = YES LIBMODBUS_CONF_OPTS = --without-documentation --disable-tests diff --git a/buildroot/package/libmspack/libmspack.mk b/buildroot/package/libmspack/libmspack.mk index e9fdc3ca8..f806192ee 100644 --- a/buildroot/package/libmspack/libmspack.mk +++ b/buildroot/package/libmspack/libmspack.mk @@ -4,10 +4,15 @@ # ################################################################################ -LIBMSPACK_VERSION = 0.10.1alpha +LIBMSPACK_VERSION_MAJOR = 0.10.1 +LIBMSPACK_VERSION_MINOR = alpha +LIBMSPACK_VERSION = $(LIBMSPACK_VERSION_MAJOR)$(LIBMSPACK_VERSION_MINOR) LIBMSPACK_SITE = https://www.cabextract.org.uk/libmspack LIBMSPACK_LICENSE = LGPL-2.1 LIBMSPACK_LICENSE_FILES = COPYING.LIB +LIBMSPACK_CPE_ID_VENDOR = kyzer +LIBMSPACK_CPE_ID_VERSION = $(LIBMSPACK_VERSION_MAJOR) +LIBMSPACK_CPE_ID_UPDATE = $(LIBMSPACK_VERSION_MINOR) LIBMSPACK_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libnids/libnids.mk b/buildroot/package/libnids/libnids.mk index fb3df318b..3e36838c4 100644 --- a/buildroot/package/libnids/libnids.mk +++ b/buildroot/package/libnids/libnids.mk @@ -8,14 +8,11 @@ LIBNIDS_VERSION = 1.24 LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING +LIBNIDS_CPE_ID_VENDOR = libnids_project LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES -# CVE-2010-0751 was fixed in libnids v1.24 but the NVD database is not -# aware of the fix, ignore it until this is updated -LIBNIDS_IGNORE_CVES += CVE-2010-0751 - # disable libnet if not available # Tests in configure.in expect --with-libnet=$build_dir # not an installation patch like in our context. diff --git a/buildroot/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch b/buildroot/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch new file mode 100644 index 000000000..e11b1d13e --- /dev/null +++ b/buildroot/package/libopenh264/0003-codec-common-inc-asmdefs_mmi.h-fix-mips32-build.patch @@ -0,0 +1,89 @@ +From c505f81e336088b6729a5407a03459f488353288 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 24 May 2021 22:54:01 +0200 +Subject: [PATCH] codec/common/inc/asmdefs_mmi.h: fix mips32 build + +Fix the following build failure on mips32 which is raised since version +2.0.0 and +https://github.com/cisco/openh264/commit/b13e5bceb18ebb93d0313b46aab4af6f480ca933: + +codec/common/mips/copy_mb_mmi.c: In function 'WelsCopy16x16_mmi': +./codec/common/inc/asmdefs_mmi.h:293:21: error: '_ABI64' undeclared (first use in this function) + 293 | if (_MIPS_SIM == _ABI64) \ + | ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/cba3e9d0fd061cc3a92cb732bcdc2c7b66dbf6cb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/cisco/openh264/pull/3384] +--- + codec/common/inc/asmdefs_mmi.h | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/codec/common/inc/asmdefs_mmi.h b/codec/common/inc/asmdefs_mmi.h +index 69a7ae39..5d1aed93 100644 +--- a/codec/common/inc/asmdefs_mmi.h ++++ b/codec/common/inc/asmdefs_mmi.h +@@ -288,9 +288,9 @@ + /** + * backup register + */ ++#if defined(_ABI64) && _MIPS_SIM == _ABI64 + #define BACKUP_REG \ + double __attribute__((aligned(16))) __back_temp[8]; \ +- if (_MIPS_SIM == _ABI64) \ + __asm__ volatile ( \ + "gssqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ + "gssqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ +@@ -299,8 +299,10 @@ + : \ + : [temp]"r"(__back_temp) \ + : "memory" \ +- ); \ +- else \ ++ ); ++#else ++#define BACKUP_REG \ ++ double __attribute__((aligned(16))) __back_temp[8]; \ + __asm__ volatile ( \ + "gssqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ + "gssqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ +@@ -309,12 +311,13 @@ + : [temp]"r"(__back_temp) \ + : "memory" \ + ); ++#endif + + /** + * recover register + */ ++#if defined(_ABI64) && _MIPS_SIM == _ABI64 + #define RECOVER_REG \ +- if (_MIPS_SIM == _ABI64) \ + __asm__ volatile ( \ + "gslqc1 $f25, $f24, 0x00(%[temp]) \n\t" \ + "gslqc1 $f27, $f26, 0x10(%[temp]) \n\t" \ +@@ -323,8 +326,9 @@ + : \ + : [temp]"r"(__back_temp) \ + : "memory" \ +- ); \ +- else \ ++ ); ++#else ++#define RECOVER_REG \ + __asm__ volatile ( \ + "gslqc1 $f22, $f20, 0x00(%[temp]) \n\t" \ + "gslqc1 $f26, $f24, 0x10(%[temp]) \n\t" \ +@@ -333,6 +337,7 @@ + : [temp]"r"(__back_temp) \ + : "memory" \ + ); ++#endif + + # define OK 1 + # define NOTOK 0 +-- +2.30.2 + diff --git a/buildroot/package/liboping/liboping.mk b/buildroot/package/liboping/liboping.mk index 4aa3e30ee..a4541cb3b 100644 --- a/buildroot/package/liboping/liboping.mk +++ b/buildroot/package/liboping/liboping.mk @@ -11,6 +11,7 @@ LIBOPING_INSTALL_STAGING = YES LIBOPING_CONF_OPTS = --without-perl-bindings LIBOPING_LICENSE = LGPL-2.1+, GPL-2.0 LIBOPING_LICENSE_FILES = COPYING +LIBOPING_CPE_ID_VENDOR = noping ifeq ($(BR2_PACKAGE_NCURSES),y) LIBOPING_DEPENDENCIES += ncurses diff --git a/buildroot/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch b/buildroot/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch new file mode 100644 index 000000000..a90af2317 --- /dev/null +++ b/buildroot/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch @@ -0,0 +1,67 @@ +From ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Jun 2021 07:45:40 +0200 +Subject: [PATCH] Add Libs.private to libraw.pc + +Add Libs.private to libraw.pc to avoid the following static build +failure when enabling libraw with jasper support in imagemagick: + +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': +jpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' + +-ljpeg must be added after -ljasper because jasper depends on jpeg + +Fixes: + - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] +--- + configure.ac | 2 ++ + libraw.pc.in | 1 + + libraw_r.pc.in | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4ab2f313..7bf5fdfd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then + AC_CHECK_HEADERS([jpeglib.h], [ + CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" + LIBS="$LIBS -ljpeg" ++ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") + ], AC_MSG_WARN([no jpeg headers found])) + ], + AC_MSG_WARN([libjpeg not found]) +@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then + AC_CHECK_HEADERS([jasper/jasper.h], [ + CPPFLAGS="$CPPFLAGS -DUSE_JASPER" + LIBS="$LIBS -ljasper" ++ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") + ], AC_MSG_WARN([no jasper headers found])) + ], + AC_MSG_WARN([libjasper not found]) +diff --git a/libraw.pc.in b/libraw.pc.in +index 1bab18b8..c95fbc48 100644 +--- a/libraw.pc.in ++++ b/libraw.pc.in +@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ ++Libs.private: @PACKAGE_LIBS_PRIVATE@ + Cflags: -I${includedir}/libraw -I${includedir} +diff --git a/libraw_r.pc.in b/libraw_r.pc.in +index e8427271..92bbbffa 100644 +--- a/libraw_r.pc.in ++++ b/libraw_r.pc.in +@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ ++Libs.private: @PACKAGE_LIBS_PRIVATE@ + Cflags: -I${includedir}/libraw -I${includedir} +-- +2.30.2 + diff --git a/buildroot/package/libraw/Config.in b/buildroot/package/libraw/Config.in index de763cd36..631123c2d 100644 --- a/buildroot/package/libraw/Config.in +++ b/buildroot/package/libraw/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBRAW bool "libraw" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_INSTALL_LIBSTDCPP help libraw is a raw image manipulation library @@ -7,4 +8,5 @@ config BR2_PACKAGE_LIBRAW http://www.libraw.org/ comment "libraw needs a toolchain w/ C++" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/librelp/librelp.mk b/buildroot/package/librelp/librelp.mk index 2b8a53e83..06f0bd3d3 100644 --- a/buildroot/package/librelp/librelp.mk +++ b/buildroot/package/librelp/librelp.mk @@ -8,6 +8,7 @@ LIBRELP_VERSION = 1.9.0 LIBRELP_SITE = http://download.rsyslog.com/librelp LIBRELP_LICENSE = GPL-3.0+ LIBRELP_LICENSE_FILES = COPYING +LIBRELP_CPE_ID_VENDOR = rsyslog LIBRELP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/buildroot/package/libsamplerate/libsamplerate.mk b/buildroot/package/libsamplerate/libsamplerate.mk index c107650cb..146d57d15 100644 --- a/buildroot/package/libsamplerate/libsamplerate.mk +++ b/buildroot/package/libsamplerate/libsamplerate.mk @@ -11,6 +11,7 @@ LIBSAMPLERATE_DEPENDENCIES = host-pkgconf LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name='' LIBSAMPLERATE_LICENSE = BSD-2-Clause LIBSAMPLERATE_LICENSE_FILES = COPYING +LIBSAMPLERATE_CPE_ID_VENDOR = libsamplerate_project ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBSAMPLERATE_DEPENDENCIES += alsa-lib diff --git a/buildroot/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash index 337593bbe..56c1d9de3 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 882eaf4c13f0cafb83afd96cd2855638f978d755 libtirpc-1.3.1.tar.bz2 +sha1 51d75be0e5acc094a888f40042b23e128d163cb5 libtirpc-1.3.2.tar.bz2 # Locally computed -sha256 245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17 libtirpc-1.3.1.tar.bz2 +sha256 e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd libtirpc-1.3.2.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk index 0f44aaffb..2678c144e 100644 --- a/buildroot/package/libtirpc/libtirpc.mk +++ b/buildroot/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.1 +LIBTIRPC_VERSION = 1.3.2 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libusb/libusb.mk b/buildroot/package/libusb/libusb.mk index 26e91e3da..28efcadef 100644 --- a/buildroot/package/libusb/libusb.mk +++ b/buildroot/package/libusb/libusb.mk @@ -10,6 +10,7 @@ LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ LIBUSB_LICENSE_FILES = COPYING +LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES diff --git a/buildroot/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk index 5876ab893..403a04903 100644 --- a/buildroot/package/libuv/libuv.mk +++ b/buildroot/package/libuv/libuv.mk @@ -13,6 +13,7 @@ LIBUV_INSTALL_STAGING = YES LIBUV_AUTORECONF = YES LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT LIBUV_LICENSE_FILES = LICENSE +LIBUV_CPE_ID_VENDOR = libuv # Upstream needs tests to be run sequentially. This is the default in # automake 1.11 and before, but not starting in 1.12. To maintain diff --git a/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch deleted file mode 100644 index a79adc3f8..000000000 --- a/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Thu, 12 Dec 2019 17:30:55 +0800 -Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities - -When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef -return NULL which cause a infinite loop in xmlStringLenDecodeEntities - -Found with libFuzzer. - -Fixes CVE-2020-7595: xmlStringLenDecodeEntities in parser.c in libxml2 -2.9.10 has an infinite loop in a certain end-of-file situation. - -Signed-off-by: Zhipeng Xie -Signed-off-by: Peter Korsgaard ---- - parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/parser.c b/parser.c -index d1c31963..a34bb6cd 100644 ---- a/parser.c -+++ b/parser.c -@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - else - c = 0; - while ((c != 0) && (c != end) && /* non input consuming loop */ -- (c != end2) && (c != end3)) { -+ (c != end2) && (c != end3) && -+ (ctxt->instate != XML_PARSER_EOF)) { - - if (c == 0) break; - if ((c == '&') && (str[1] == '#')) { --- -2.20.1 - diff --git a/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch deleted file mode 100644 index 2aeddf677..000000000 --- a/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Tue, 20 Aug 2019 16:33:06 +0800 -Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream - -When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun -alloc a new schema for ctxt->schema and set vctxt->xsiAssemble -to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize -vctxt->xsiAssemble to 0 again which cause the alloced schema -can not be freed anymore. - -Found with libFuzzer. - -Signed-off-by: Zhipeng Xie -[import into Buildroot] -Signed-off-by: Thomas De Schampheleire ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c8449..39d92182 100644 ---- a/xmlschemas.c -+++ b/xmlschemas.c -@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { - vctxt->nberrors = 0; - vctxt->depth = -1; - vctxt->skipDepth = -1; -- vctxt->xsiAssemble = 0; - vctxt->hasKeyrefs = 0; - #ifdef ENABLE_IDC_NODE_TABLES_TEST - vctxt->createIDCNodeTables = 1; --- -2.24.1 - diff --git a/buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch b/buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch deleted file mode 100644 index 460f2a3ae..000000000 --- a/buildroot/package/libxml2/0003-Fix-out-of-bounds-read-with-xmllint--htmlout.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 7 Aug 2020 21:54:27 +0200 -Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' - -Make sure that truncated UTF-8 sequences don't cause an out-of-bounds -array access. - -Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for -the report. - -Fixes #178. - -[Retrieved from: -https://gitlab.gnome.org/GNOME/libxml2/-/commit/50f06b3efb638efb0abd95dc62dca05ae67882c2] -Signed-off-by: Fabrice Fontaine ---- - xmllint.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xmllint.c b/xmllint.c -index f6a8e4636..c647486f3 100644 ---- a/xmllint.c -+++ b/xmllint.c -@@ -528,6 +528,12 @@ static void - xmlHTMLEncodeSend(void) { - char *result; - -+ /* -+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might -+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid -+ * an out-of-bounds read. -+ */ -+ memset(&buffer[sizeof(buffer)-4], 0, 4); - result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); - if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); --- -GitLab - diff --git a/buildroot/package/libxml2/libxml2.hash b/buildroot/package/libxml2/libxml2.hash index d890713a7..ce6c3c482 100644 --- a/buildroot/package/libxml2/libxml2.hash +++ b/buildroot/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f libxml2-2.9.10.tar.gz +sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 libxml2-2.9.12.tar.gz # License files, locally calculated -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/buildroot/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk index e472970fd..5d688acae 100644 --- a/buildroot/package/libxml2/libxml2.mk +++ b/buildroot/package/libxml2/libxml2.mk @@ -4,17 +4,11 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.10 +LIBXML2_VERSION = 2.9.12 LIBXML2_SITE = http://xmlsoft.org/sources LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING -# 0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch -LIBXML2_IGNORE_CVES += CVE-2020-7595 -# 0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch -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 diff --git a/buildroot/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch b/buildroot/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch new file mode 100644 index 000000000..3848dcb23 --- /dev/null +++ b/buildroot/package/libxslt/0001-Fix-xml2-config-check-in-configure-script.patch @@ -0,0 +1,31 @@ +From 90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Fri, 15 Nov 2019 11:53:11 +0100 +Subject: [PATCH] Fix xml2-config check in configure script + +A 'print' option has never been supported. After a recent change to +libxml2, invalid options cause xml2-config to fail. + +[Retrieved from: +https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3da57b18..585b9d7c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -548,7 +548,7 @@ dnl make sure xml2-config is executable, + dnl test version and init our variables + dnl + +-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 ++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 + then + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) + XMLVERS=`$XML_CONFIG --version` +-- +GitLab + diff --git a/buildroot/package/libxslt/libxslt.mk b/buildroot/package/libxslt/libxslt.mk index 3c603ad9f..d0f79d252 100644 --- a/buildroot/package/libxslt/libxslt.mk +++ b/buildroot/package/libxslt/libxslt.mk @@ -10,6 +10,8 @@ LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CPE_ID_VENDOR = xmlsoft +# We're patching configure.ac +LIBXSLT_AUTORECONF = YES LIBXSLT_CONF_OPTS = \ --with-gnu-ld \ diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index dd521b4cb..182ab9863 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.268" if BR2_KERNEL_HEADERS_4_4 - default "4.9.268" if BR2_KERNEL_HEADERS_4_9 - default "4.14.232" if BR2_KERNEL_HEADERS_4_14 - default "4.19.190" if BR2_KERNEL_HEADERS_4_19 - default "5.4.117" if BR2_KERNEL_HEADERS_5_4 - default "5.10.35" if BR2_KERNEL_HEADERS_5_10 + default "4.4.272" if BR2_KERNEL_HEADERS_4_4 + default "4.9.272" if BR2_KERNEL_HEADERS_4_9 + default "4.14.236" if BR2_KERNEL_HEADERS_4_14 + default "4.19.194" if BR2_KERNEL_HEADERS_4_19 + default "5.4.125" if BR2_KERNEL_HEADERS_5_4 + default "5.10.43" if BR2_KERNEL_HEADERS_5_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/live555/live555.hash b/buildroot/package/live555/live555.hash index 5e65cacd7..d4fa93d02 100644 --- a/buildroot/package/live555/live555.hash +++ b/buildroot/package/live555/live555.hash @@ -1,5 +1,5 @@ # From http://www.live555.com/liveMedia/public/live555-latest-md5.txt -md5 4645d2a0c865505c85b48af5317bcb4a live.2020.08.19.tar.gz +md5 3c1992b0e9b871bcad7491a3da541781 live.2021.05.03.tar.gz # Locally generated -sha256 af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537 live.2020.08.19.tar.gz +sha256 ae73241f9cc4ab740d60737c0438d62a7635af3822de5d84acf275793de42029 live.2021.05.03.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/buildroot/package/live555/live555.mk b/buildroot/package/live555/live555.mk index 9a5c1c7c0..effd4517c 100644 --- a/buildroot/package/live555/live555.mk +++ b/buildroot/package/live555/live555.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIVE555_VERSION = 2020.08.19 +LIVE555_VERSION = 2021.05.03 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz LIVE555_SITE = http://www.live555.com/liveMedia/public # There is a COPYING file with the GPL-3.0 license text, but none of diff --git a/buildroot/package/llvm/0001-nfc-Fix-missing-include.patch b/buildroot/package/llvm/0001-nfc-Fix-missing-include.patch new file mode 100644 index 000000000..62111ca13 --- /dev/null +++ b/buildroot/package/llvm/0001-nfc-Fix-missing-include.patch @@ -0,0 +1,24 @@ +From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Tue, 10 Nov 2020 14:55:25 +0100 +Subject: [PATCH] [nfc] Fix missing include + +[Retrieved (and backported) from: +https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] +Signed-off-by: Fabrice Fontaine +--- + llvm/utils/benchmark/src/benchmark_register.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h +index 0705e219f2fa2..4caa5ad4da079 100644 +--- a/utils/benchmark/src/benchmark_register.h ++++ b/utils/benchmark/src/benchmark_register.h +@@ -1,6 +1,7 @@ + #ifndef BENCHMARK_REGISTER_H + #define BENCHMARK_REGISTER_H + ++#include + #include + + #include "check.h" diff --git a/buildroot/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch b/buildroot/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch new file mode 100644 index 000000000..6c3e7370e --- /dev/null +++ b/buildroot/package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch @@ -0,0 +1,28 @@ +From d85b61666aa2728f68b69d02bfb162c432df709f Mon Sep 17 00:00:00 2001 +From: vgupta +Date: Sat, 3 Mar 2012 10:02:24 +0000 +Subject: [PATCH] TOO_LONG 100 usec to prevent memsize from timingout @80Mhz + +git-svn-id: http://sjvm-subversion02.internal.synopsys.com/svn/OSS/ARC_Linux/tests/lmbench-3.0-a9@157318 4eed8e25-bc12-0410-818a-f70ee6866280 + +Signed-off-by: Vineet Gupta +--- + src/memsize.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/memsize.c b/src/memsize.c +index eb25a0924872..b333cf8cbd32 100644 +--- a/src/memsize.c ++++ b/src/memsize.c +@@ -15,7 +15,7 @@ char *id = "$Id$\n"; + #define CHK(x) if ((x) == -1) { perror("x"); exit(1); } + + #ifndef TOO_LONG +-#define TOO_LONG 10 /* usecs */ ++#define TOO_LONG 100 /* usecs */ + #endif + + int alarm_triggered = 0; +-- +2.25.1 + diff --git a/buildroot/package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch b/buildroot/package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch new file mode 100644 index 000000000..619ec3861 --- /dev/null +++ b/buildroot/package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch @@ -0,0 +1,25 @@ +From 3830453a06269912d2772fe8c31bae44f27bb131 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Fri, 8 May 2015 11:35:58 +0530 +Subject: [PATCH] Fix garbage pointer for lat_rpc -S localhost + +Signed-off-by: Vineet Gupta +--- + src/lat_rpc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lat_rpc.c b/src/lat_rpc.c +index 9c021926d761..ff4380ff38f3 100644 +--- a/src/lat_rpc.c ++++ b/src/lat_rpc.c +@@ -101,6 +101,7 @@ main(int ac, char **av) + char *usage = "-s\n OR [-p ] [-P parallel] [-W ] [-N ] serverhost\n OR -S serverhost\n"; + + state.msize = 1; ++ state.server = NULL; + + while (( c = getopt(ac, av, "sS:m:p:P:W:N:")) != EOF) { + switch(c) { +-- +2.25.1 + diff --git a/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch new file mode 100644 index 000000000..888d27fe4 --- /dev/null +++ b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch @@ -0,0 +1,155 @@ +From 44f1469daff3a0bfe67fb5839243f114ace3bad8 Mon Sep 17 00:00:00 2001 +From: Joseph Myers +Date: Mon, 5 Oct 2020 16:46:46 +0000 +Subject: [PATCH 3/4] Fix GCC 11 -Warray-parameter warning for __sigsetjmp (bug + 26647) + +This patch fixes part of bug 26647 (-Werror=array-parameter error +building with GCC 11 because of __sigsetjmp being declared using an +array parameter in one header and a pointer parameter in another). + +The fix is to split the struct __jmp_buf_tag definition out to a +separate bits/types/ header so it can be included in pthread.h, so +that pthread.h can declare __sigsetjmp with the type contents visible, +so can use an array (as in setjmp.h) rather than a pointer in the +declaration. + +Note that several other build failures with GCC 11 remain. This does +not fix the jmp_buf-related -Wstringop-overflow errors (also discussed +in bug 26647), or -Warray-parameter errors for other functions (bug +26686), or -Warray-bounds errors (bug 26687). + +Tested, with older compilers, natively for x86_64 and with +build-many-glibc.py for aarch64-linux-gnu. Tested with +build-many-glibcs.py with GCC mainline for aarch64-linux-gnu that this +gets past the -Warray-parameter issue for __sigsetjmp (with the next +build failure being the other one discussed in bug 26647). + +[Upstream: https://github.com/bminor/glibc/commit/19302b27bdacfe87e861ff46fc0fbad60dd6602d.patch] +Signed-off-by: Peter Seiderer +--- + include/bits/types/struct___jmp_buf_tag.h | 1 + + setjmp/Makefile | 3 +- + setjmp/bits/types/struct___jmp_buf_tag.h | 37 +++++++++++++++++++++++ + setjmp/setjmp.h | 15 +-------- + sysdeps/nptl/pthread.h | 5 +-- + 5 files changed, 44 insertions(+), 17 deletions(-) + create mode 100644 include/bits/types/struct___jmp_buf_tag.h + create mode 100644 setjmp/bits/types/struct___jmp_buf_tag.h + +diff --git a/include/bits/types/struct___jmp_buf_tag.h b/include/bits/types/struct___jmp_buf_tag.h +new file mode 100644 +index 00000000..e3250150 +--- /dev/null ++++ b/include/bits/types/struct___jmp_buf_tag.h +@@ -0,0 +1 @@ ++#include +diff --git a/setjmp/Makefile b/setjmp/Makefile +index dcac5693..603f61d7 100644 +--- a/setjmp/Makefile ++++ b/setjmp/Makefile +@@ -22,7 +22,8 @@ subdir := setjmp + + include ../Makeconfig + +-headers := setjmp.h bits/setjmp.h bits/setjmp2.h ++headers := setjmp.h bits/setjmp.h bits/setjmp2.h \ ++ bits/types/struct___jmp_buf_tag.h + + routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \ + longjmp __longjmp jmp-unwind +diff --git a/setjmp/bits/types/struct___jmp_buf_tag.h b/setjmp/bits/types/struct___jmp_buf_tag.h +new file mode 100644 +index 00000000..9d8634f1 +--- /dev/null ++++ b/setjmp/bits/types/struct___jmp_buf_tag.h +@@ -0,0 +1,37 @@ ++/* Define struct __jmp_buf_tag. ++ Copyright (C) 1991-2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef __jmp_buf_tag_defined ++#define __jmp_buf_tag_defined 1 ++ ++#include /* Get `__jmp_buf'. */ ++#include ++ ++/* Calling environment, plus possibly a saved signal mask. */ ++struct __jmp_buf_tag ++ { ++ /* NOTE: The machine-dependent definitions of `__sigsetjmp' ++ assume that a `jmp_buf' begins with a `__jmp_buf' and that ++ `__mask_was_saved' follows it. Do not move these members ++ or add others before it. */ ++ __jmp_buf __jmpbuf; /* Calling environment. */ ++ int __mask_was_saved; /* Saved the signal mask? */ ++ __sigset_t __saved_mask; /* Saved signal mask. */ ++ }; ++ ++#endif +diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h +index 4e3443c3..c6c59f40 100644 +--- a/setjmp/setjmp.h ++++ b/setjmp/setjmp.h +@@ -27,20 +27,7 @@ + __BEGIN_DECLS + + #include /* Get `__jmp_buf'. */ +-#include +- +-/* Calling environment, plus possibly a saved signal mask. */ +-struct __jmp_buf_tag +- { +- /* NOTE: The machine-dependent definitions of `__sigsetjmp' +- assume that a `jmp_buf' begins with a `__jmp_buf' and that +- `__mask_was_saved' follows it. Do not move these members +- or add others before it. */ +- __jmp_buf __jmpbuf; /* Calling environment. */ +- int __mask_was_saved; /* Saved the signal mask? */ +- __sigset_t __saved_mask; /* Saved signal mask. */ +- }; +- ++#include + + typedef struct __jmp_buf_tag jmp_buf[1]; + +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index 8a403cbf..d4194da7 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + + /* Detach state. */ +@@ -730,8 +731,8 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) + #endif + + /* Function used in the macros. */ +-struct __jmp_buf_tag; +-extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROWNL; ++extern int __sigsetjmp (struct __jmp_buf_tag __env[1], ++ int __savemask) __THROWNL; + + + /* Mutex handling. */ +-- +2.31.1 + diff --git a/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch new file mode 100644 index 000000000..83f3f15eb --- /dev/null +++ b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch @@ -0,0 +1,125 @@ +From ea50889c35fb73ed9e140d800303aae9148c2888 Mon Sep 17 00:00:00 2001 +From: Joseph Myers +Date: Fri, 30 Oct 2020 22:25:42 +0000 +Subject: [PATCH 4/4] Avoid -Wstringop-overflow warning in pthread_cleanup_push + macros + +GCC 11 introduces a -Wstringop-overflow warning for calls to functions +with an array argument passed as a pointer to memory not large enough +for that array. This includes the __sigsetjmp calls from +pthread_cleanup_push macros, because those use a structure in +__pthread_unwind_buf_t, which has a common initial subsequence with +jmp_buf but does not include the saved signal mask; this is OK in this +case because the second argument to __sigsetjmp is 0 so the signal +mask is not accessed. + +To avoid this warning, use a function alias __sigsetjmp_cancel with +first argument an array of exactly the type used in the calls to the +function, if using GCC 11 or later. With older compilers, continue to +use __sigsetjmp with a cast, to avoid any issues with compilers +predating the returns_twice attribute not applying the same special +handling to __sigsetjmp_cancel as to __sigsetjmp. + +Tested with build-many-glibcs.py for arm-linux-gnueabi that this fixes +the testsuite build failures. + +[Upstream: https://github.com/bminor/glibc/commit/548f467fa14ffe7d955beeb31b30e2aeae4467e0.patch] +Signed-off-by: Peter Seiderer +--- + misc/sys/cdefs.h | 8 ++++++++ + sysdeps/nptl/pthread.h | 37 +++++++++++++++++++++++++++---------- + 2 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h +index 38221d0b..ce877487 100644 +--- a/misc/sys/cdefs.h ++++ b/misc/sys/cdefs.h +@@ -556,4 +556,12 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf + # define __attr_access(x) + #endif + ++/* Specify that a function such as setjmp or vfork may return ++ twice. */ ++#if __GNUC_PREREQ (4, 1) ++# define __attribute_returns_twice__ __attribute__ ((__returns_twice__)) ++#else ++# define __attribute_returns_twice__ /* Ignore. */ ++#endif ++ + #endif /* sys/cdefs.h */ +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index d4194da7..3a34d823 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -512,13 +512,15 @@ extern void pthread_testcancel (void); + + /* Cancellation handling with integration into exception handling. */ + ++struct __cancel_jmp_buf_tag ++{ ++ __jmp_buf __cancel_jmp_buf; ++ int __mask_was_saved; ++}; ++ + typedef struct + { +- struct +- { +- __jmp_buf __cancel_jmp_buf; +- int __mask_was_saved; +- } __cancel_jmp_buf[1]; ++ struct __cancel_jmp_buf_tag __cancel_jmp_buf[1]; + void *__pad[4]; + } __pthread_unwind_buf_t __attribute__ ((__aligned__)); + +@@ -658,8 +660,8 @@ __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) + __pthread_unwind_buf_t __cancel_buf; \ + void (*__cancel_routine) (void *) = (routine); \ + void *__cancel_arg = (arg); \ +- int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *) \ +- __cancel_buf.__cancel_jmp_buf, 0); \ ++ int __not_first_call = __sigsetjmp_cancel (__cancel_buf.__cancel_jmp_buf, \ ++ 0); \ + if (__glibc_unlikely (__not_first_call)) \ + { \ + __cancel_routine (__cancel_arg); \ +@@ -693,8 +695,8 @@ extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf) + __pthread_unwind_buf_t __cancel_buf; \ + void (*__cancel_routine) (void *) = (routine); \ + void *__cancel_arg = (arg); \ +- int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *) \ +- __cancel_buf.__cancel_jmp_buf, 0); \ ++ int __not_first_call = __sigsetjmp_cancel (__cancel_buf.__cancel_jmp_buf, \ ++ 0); \ + if (__glibc_unlikely (__not_first_call)) \ + { \ + __cancel_routine (__cancel_arg); \ +@@ -730,9 +732,24 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) + ; + #endif + +-/* Function used in the macros. */ ++/* Function used in the macros. Calling __sigsetjmp, with its first ++ argument declared as an array, results in a -Wstringop-overflow ++ warning from GCC 11 because struct pthread_unwind_buf is smaller ++ than jmp_buf. The calls from the macros have __SAVEMASK set to 0, ++ so nothing beyond the common prefix is used and this warning is a ++ false positive. Use an alias with its first argument declared to ++ use the type in the macros if possible to avoid this warning. */ ++#if __GNUC_PREREQ (11, 0) ++extern int __REDIRECT_NTHNL (__sigsetjmp_cancel, ++ (struct __cancel_jmp_buf_tag __env[1], ++ int __savemask), ++ __sigsetjmp) __attribute_returns_twice__; ++#else ++# define __sigsetjmp_cancel(env, savemask) \ ++ __sigsetjmp ((struct __jmp_buf_tag *) (void *) (env), (savemask)) + extern int __sigsetjmp (struct __jmp_buf_tag __env[1], + int __savemask) __THROWNL; ++#endif + + + /* Mutex handling. */ +-- +2.31.1 + diff --git a/buildroot/package/lttng-tools/0001-configure.ac-add-disable-tests.patch b/buildroot/package/lttng-tools/0001-configure.ac-add-disable-tests.patch new file mode 100644 index 000000000..f569c7ec7 --- /dev/null +++ b/buildroot/package/lttng-tools/0001-configure.ac-add-disable-tests.patch @@ -0,0 +1,37 @@ +From 8c3a5d0921090e2fc3c4e2561509d23eb9ffa6dd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 2 Apr 2021 21:07:07 +0200 +Subject: [PATCH] configure.ac: add --disable-tests + +Allow the user to explicitly disable tests + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/lttng/lttng-tools/pull/162] +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 04f9cef4..372cdf3d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -862,6 +862,8 @@ AC_ARG_ENABLE([bin-lttng-sessiond], AS_HELP_STRING([--disable-bin-lttng-sessiond + [Disable the build of lttng-sessiond binaries])) + AC_ARG_ENABLE([extras], AS_HELP_STRING([--disable-extras], + [Disable the build of the extra components])) ++AC_ARG_ENABLE([tests], AS_HELP_STRING([--disable-tests], ++ [Disable the build of the test components])) + + + # Always build libconfig since it a dependency of libcommon +@@ -1027,6 +1029,7 @@ AM_CONDITIONAL([BUILD_BIN_LTTNG_SESSIOND], [test x$enable_bin_lttng_sessiond != + + # Export the tests and extras build conditions. + AS_IF([\ ++test "x$enable_tests" != "xno" && \ + test "x$enable_bin_lttng" != "xno" && \ + test "x$enable_bin_lttng_consumerd" != "xno" && \ + test "x$enable_bin_lttng_crash" != "xno" && \ +-- +2.30.2 + diff --git a/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch b/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch deleted file mode 100644 index e3e0f3a77..000000000 --- a/buildroot/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait -Date: Mon, 18 May 2020 16:39:26 +0300 -Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the following build error with musl libc: -In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14, - from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10: -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~~~ - -Signed-off-by: Ovidiu Panait -Signed-off-by: Jérémie Galarneau -Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba -[Retrieved from: -https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94] -Signed-off-by: Fabrice Fontaine ---- - tests/utils/testapp/gen-ust-events-ns/tp.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h -index 4dbfed51a..e0ddb29a6 100644 ---- a/tests/utils/testapp/gen-ust-events-ns/tp.h -+++ b/tests/utils/testapp/gen-ust-events-ns/tp.h -@@ -11,6 +11,7 @@ - #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) - #define _TRACEPOINT_TP_H - -+#include - #include - - TRACEPOINT_EVENT(tp, tptest, diff --git a/buildroot/package/lttng-tools/lttng-tools.hash b/buildroot/package/lttng-tools/lttng-tools.hash index a27b419e7..a94ecc4a3 100644 --- a/buildroot/package/lttng-tools/lttng-tools.hash +++ b/buildroot/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.1.tar.bz2.sha256 -sha256 0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8 lttng-tools-2.12.1.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.3.tar.bz2.sha256 +sha256 2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153 lttng-tools-2.12.3.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/buildroot/package/lttng-tools/lttng-tools.mk b/buildroot/package/lttng-tools/lttng-tools.mk index 54f7ccdfa..fdc5c33bd 100644 --- a/buildroot/package/lttng-tools/lttng-tools.mk +++ b/buildroot/package/lttng-tools/lttng-tools.mk @@ -4,15 +4,18 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.12.1 +LTTNG_TOOLS_VERSION = 2.12.3 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*) LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT) LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux +# We're patching configure.ac +LTTNG_TOOLS_AUTORECONF = YES LTTNG_TOOLS_CONF_OPTS = \ --disable-man-pages \ + --disable-tests \ --with-lttng-system-rundir=/run/lttng ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) diff --git a/buildroot/package/lvm2/Config.in b/buildroot/package/lvm2/Config.in index a9c5c453f..5e767e2e9 100644 --- a/buildroot/package/lvm2/Config.in +++ b/buildroot/package/lvm2/Config.in @@ -26,7 +26,6 @@ if BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2_STANDARD_INSTALL bool "standard install instead of only dmsetup" - default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11 # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html depends on !BR2_TOOLCHAIN_USES_MUSL help diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk index 653e72c72..19e8757e5 100644 --- a/buildroot/package/lvm2/lvm2.mk +++ b/buildroot/package/lvm2/lvm2.mk @@ -10,6 +10,7 @@ LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB +LVM2_CPE_ID_PRODUCT = redhat # Make sure that binaries and libraries are installed with write # permissions for the owner. We disable NLS because it's broken, and diff --git a/buildroot/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch b/buildroot/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch new file mode 100644 index 000000000..57e4e38f8 --- /dev/null +++ b/buildroot/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch @@ -0,0 +1,26 @@ +From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse +Date: Fri, 26 Feb 2021 15:21:20 +0100 +Subject: [PATCH] Fix potential memory corruption with negative memmove() size + +Signed-off-by: Peter Korsgaard +--- + lib/lz4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lz4.c b/lib/lz4.c +index 5f524d0..c2f504e 100644 +--- a/lib/lz4.c ++++ b/lib/lz4.c +@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( + const size_t dictSize /* note : = 0 if noDict */ + ) + { +- if (src == NULL) { return -1; } ++ if ((src == NULL) || (outputSize < 0)) { return -1; } + + { const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; +-- +2.20.1 + diff --git a/buildroot/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk index e0236c05b..9b9b6198c 100644 --- a/buildroot/package/lz4/lz4.mk +++ b/buildroot/package/lz4/lz4.mk @@ -17,6 +17,9 @@ LZ4_CPE_ID_VENDOR = yann_collet # See https://github.com/lz4/lz4/issues/818 LZ4_IGNORE_CVES += CVE-2014-4715 +# 0001-Fix-potential-memory-corruption-with-negative-memmov.patch +LZ4_IGNORE_CVES += CVE-2021-3520 + ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no else ifeq ($(BR2_SHARED_LIBS),y) diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 5deea5f97..2a03beb29 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk @@ -18,6 +18,8 @@ MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos MESA3D_HEADERS_LICENSE_FILES = docs/license.rst +MESA3D_HEADERS_CPE_ID_VENDOR = mesa3d +MESA3D_HEADERS_CPE_ID_PRODUCT = mesa # Only installs header files MESA3D_HEADERS_INSTALL_STAGING = YES diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index c9a7214aa..36ea72f88 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -10,6 +10,8 @@ MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.rst +MESA3D_CPE_ID_VENDOR = mesa3d +MESA3D_CPE_ID_PRODUCT = mesa MESA3D_INSTALL_STAGING = YES diff --git a/buildroot/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch b/buildroot/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch new file mode 100644 index 000000000..ea02bf587 --- /dev/null +++ b/buildroot/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch @@ -0,0 +1,27 @@ +From 77b36eaeb2c38eba571b8db7e9bb0fd507774e6d Mon Sep 17 00:00:00 2001 +From: Kris Gesling +Date: Tue, 11 May 2021 09:15:22 +0930 +Subject: [PATCH] Fix linking on gcc 10.2.0 or newer + +Co-authored-by: MichaelSabal + +[Retrieved from: +https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d] +Signed-off-by: Fabrice Fontaine +--- + lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h +index 75ee46c..83e2afa 100644 +--- a/lang/cmu_indic_lang/cmu_indic_lang.h ++++ b/lang/cmu_indic_lang/cmu_indic_lang.h +@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); + extern const cst_phoneset cmu_indic_phoneset; + extern const cst_cart cmu_indic_phrasing_cart; + +-const cst_regex * const cst_rx_not_indic; ++extern const cst_regex * const cst_rx_not_indic; + + #ifdef __cplusplus + } /* extern "C" */ diff --git a/buildroot/package/mini-snmpd/mini-snmpd.mk b/buildroot/package/mini-snmpd/mini-snmpd.mk index 570241c25..1f6e5c191 100644 --- a/buildroot/package/mini-snmpd/mini-snmpd.mk +++ b/buildroot/package/mini-snmpd/mini-snmpd.mk @@ -8,6 +8,8 @@ MINI_SNMPD_VERSION = 1.6 MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION)) MINI_SNMPD_LICENSE = GPL-2.0 MINI_SNMPD_LICENSE_FILES = COPYING +MINI_SNMPD_CPE_ID_VENDOR = minisnmpd_project +MINI_SNMPD_CPE_ID_PRODUCT = minisnmpd MINI_SNMPD_AUTORECONF = YES MINI_SNMPD_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/minidlna/minidlna.mk b/buildroot/package/minidlna/minidlna.mk index 0bb3dd350..86a2bb368 100644 --- a/buildroot/package/minidlna/minidlna.mk +++ b/buildroot/package/minidlna/minidlna.mk @@ -8,6 +8,8 @@ MINIDLNA_VERSION = 1.3.0 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd +MINIDLNA_CPE_ID_VENDOR = readymedia_project +MINIDLNA_CPE_ID_PRODUCT = readymedia MINIDLNA_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ diff --git a/buildroot/package/minissdpd/minissdpd.mk b/buildroot/package/minissdpd/minissdpd.mk index 4560919ba..214af7638 100644 --- a/buildroot/package/minissdpd/minissdpd.mk +++ b/buildroot/package/minissdpd/minissdpd.mk @@ -8,6 +8,7 @@ MINISSDPD_VERSION = 1.5.20200928 MINISSDPD_SITE = http://miniupnp.free.fr/files MINISSDPD_LICENSE = BSD-3-Clause MINISSDPD_LICENSE_FILES = LICENSE +MINISSDPD_CPE_ID_VENDOR = miniupnp_project MINISSDPD_DEPENDENCIES = libnfnetlink define MINISSDPD_BUILD_CMDS diff --git a/buildroot/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk index b2294fb53..53f33fb9c 100644 --- a/buildroot/package/minizip/minizip.mk +++ b/buildroot/package/minizip/minizip.mk @@ -14,6 +14,7 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE +MINIZIP_CPE_ID_VENDOR = minizip_project ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 diff --git a/buildroot/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch b/buildroot/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch new file mode 100644 index 000000000..0d52401b4 --- /dev/null +++ b/buildroot/package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch @@ -0,0 +1,25 @@ +From fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b Mon Sep 17 00:00:00 2001 +From: plprevost +Date: Wed, 12 May 2021 16:46:16 +0200 +Subject: [PATCH] refs issue:#298 Fix mono compilation errors + +[Retrieved from: +https://github.com/mono/gtk-sharp/pull/299/commits/fe18352a4bc9f0cf3b6cf63b8cc03c5d6e41863b] +Signed-off-by: Fabrice Fontaine +--- + sample/test/TestRange.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs +index 82fb81105..8727c9a77 100644 +--- a/sample/test/TestRange.cs ++++ b/sample/test/TestRange.cs +@@ -8,7 +8,7 @@ + + using System; + +-using Gtk; ++using Gtk; using Range = Gtk.Range; + + namespace WidgetViewer { + diff --git a/buildroot/package/mpg123/mpg123.hash b/buildroot/package/mpg123/mpg123.hash index 02c40ad08..e5fb09b46 100644 --- a/buildroot/package/mpg123/mpg123.hash +++ b/buildroot/package/mpg123/mpg123.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.13/ -sha1 2b6428dc563c56fb1374191d1244c8ac928e4d89 mpg123-1.25.13.tar.bz2 -md5 294a6c30546504ec3d0deac2b2ea22be mpg123-1.25.13.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.15/ +sha1 286fcb83afad3ecbfea60434d3ee1b6d7f41bb7c mpg123-1.25.15.tar.bz2 +md5 9a050d4b3573661c606f8095a3f34ca3 mpg123-1.25.15.tar.bz2 # Locally calculated -sha256 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a mpg123-1.25.13.tar.bz2 +sha256 503a76d82d97f1a6513bbeb284e460a99fb17ef80f23a661d8fc026ce6adcbbc mpg123-1.25.15.tar.bz2 # License file sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING diff --git a/buildroot/package/mpg123/mpg123.mk b/buildroot/package/mpg123/mpg123.mk index 588a4ffc3..9aa9cd1c1 100644 --- a/buildroot/package/mpg123/mpg123.mk +++ b/buildroot/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.25.13 +MPG123_VERSION = 1.25.15 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPTS = --disable-lfs-alias diff --git a/buildroot/package/mpv/mpv.hash b/buildroot/package/mpv/mpv.hash index 548a0f015..0c7eb5f8a 100644 --- a/buildroot/package/mpv/mpv.hash +++ b/buildroot/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 mpv-0.33.0.tar.gz +sha256 100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9 mpv-0.33.1.tar.gz sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/buildroot/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk index 18f307d18..25ac783b5 100644 --- a/buildroot/package/mpv/mpv.mk +++ b/buildroot/package/mpv/mpv.mk @@ -4,13 +4,14 @@ # ################################################################################ -MPV_VERSION = 0.33.0 +MPV_VERSION = 0.33.1 MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ host-pkgconf ffmpeg libass zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPL-2.0+ MPV_LICENSE_FILES = LICENSE.GPL +MPV_CPE_ID_VENDOR = mpv MPV_NEEDS_EXTERNAL_WAF = YES @@ -27,6 +28,12 @@ MPV_CONF_OPTS = \ --disable-uchardet \ --disable-vapoursynth +ifeq ($(BR2_STATIC_LIBS),y) +MPV_CONF_OPTS += --disable-libmpv-shared --enable-libmpv-static +else +MPV_CONF_OPTS += --enable-libmpv-shared --disable-libmpv-static +endif + # ALSA support requires pcm+mixer ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) MPV_CONF_OPTS += --enable-alsa diff --git a/buildroot/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk index cae03d772..3db36f4cd 100644 --- a/buildroot/package/msmtp/msmtp.mk +++ b/buildroot/package/msmtp/msmtp.mk @@ -11,6 +11,7 @@ MSMTP_DEPENDENCIES = host-pkgconf MSMTP_CONF_OPTS = --disable-gai-idn MSMTP_LICENSE = GPL-3.0+ MSMTP_LICENSE_FILES = COPYING +MSMTP_CPE_ID_VENDOR = marlam # msmtpd needs fork ifeq ($(BR2_USE_MMU),y) diff --git a/buildroot/package/musl/musl.mk b/buildroot/package/musl/musl.mk index 82b3eeaf5..d4f26b50a 100644 --- a/buildroot/package/musl/musl.mk +++ b/buildroot/package/musl/musl.mk @@ -8,6 +8,7 @@ MUSL_VERSION = 1.2.2 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT +MUSL_CPE_ID_VENDOR = musl-libc # Before musl is configured, we must have the first stage # cross-compiler and the kernel headers diff --git a/buildroot/package/mutt/0005-Fix-seqset-iterator-when-it-ends-in-a-comma.patch b/buildroot/package/mutt/0005-Fix-seqset-iterator-when-it-ends-in-a-comma.patch new file mode 100644 index 000000000..b7a51ddc2 --- /dev/null +++ b/buildroot/package/mutt/0005-Fix-seqset-iterator-when-it-ends-in-a-comma.patch @@ -0,0 +1,40 @@ +From 7c4779ac24d2fb68a2a47b58c7904118f40965d5 Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Mon, 3 May 2021 13:11:30 -0700 +Subject: [PATCH] Fix seqset iterator when it ends in a comma. + +If the seqset ended with a comma, the substr_end marker would be just +before the trailing nul. In the next call, the loop to skip the +marker would iterate right past the end of string too. + +The fix is simple: place the substr_end marker and skip past it +immediately. + +Signed-off-by: Peter Korsgaard +[Peter: fixes CVE-2021-32055] +--- + imap/util.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/imap/util.c b/imap/util.c +index c529fd8f..488e8396 100644 +--- a/imap/util.c ++++ b/imap/util.c +@@ -1036,13 +1036,11 @@ int mutt_seqset_iterator_next (SEQSET_ITERATOR *iter, unsigned int *next) + if (iter->substr_cur == iter->eostr) + return 1; + +- while (!*(iter->substr_cur)) +- iter->substr_cur++; + iter->substr_end = strchr (iter->substr_cur, ','); + if (!iter->substr_end) + iter->substr_end = iter->eostr; + else +- *(iter->substr_end) = '\0'; ++ *(iter->substr_end++) = '\0'; + + range_sep = strchr (iter->substr_cur, ':'); + if (range_sep) +-- +2.20.1 + diff --git a/buildroot/package/nasm/nasm.mk b/buildroot/package/nasm/nasm.mk index b44b97e62..ecb088936 100644 --- a/buildroot/package/nasm/nasm.mk +++ b/buildroot/package/nasm/nasm.mk @@ -9,5 +9,7 @@ NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause NASM_LICENSE_FILES = LICENSE +NASM_CPE_ID_VENDOR = nasm +NASM_CPE_ID_PRODUCT = netwide_assembler $(eval $(host-autotools-package)) diff --git a/buildroot/package/nbd/nbd.mk b/buildroot/package/nbd/nbd.mk index 5fd555551..6c77bffdf 100644 --- a/buildroot/package/nbd/nbd.mk +++ b/buildroot/package/nbd/nbd.mk @@ -11,6 +11,8 @@ NBD_CONF_OPTS = --enable-lfs NBD_DEPENDENCIES = host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING +NBD_CPE_ID_VENDOR = network_block_device_project +NBD_CPE_ID_PRODUCT = network_block_device ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # We have linux/falloc.h diff --git a/buildroot/package/netperf/netperf.mk b/buildroot/package/netperf/netperf.mk index 8b2280830..85f6bce03 100644 --- a/buildroot/package/netperf/netperf.mk +++ b/buildroot/package/netperf/netperf.mk @@ -5,7 +5,7 @@ ################################################################################ NETPERF_VERSION = 2.7.0 -NETPERF_SITE = ftp://ftp.netperf.org/netperf +NETPERF_SITE = http://sources.buildroot.org/netperf NETPERF_SOURCE = netperf-$(NETPERF_VERSION).tar.bz2 # gcc 5+ defaults to gnu99 which breaks netperf NETPERF_CONF_ENV = \ diff --git a/buildroot/package/netsurf/netsurf.mk b/buildroot/package/netsurf/netsurf.mk index 5677b6946..1064698c1 100644 --- a/buildroot/package/netsurf/netsurf.mk +++ b/buildroot/package/netsurf/netsurf.mk @@ -9,6 +9,7 @@ NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_LICENSE = GPL-2.0 NETSURF_LICENSE_FILES = netsurf/COPYING +NETSURF_CPE_ID_VENDOR = netsurf-browser # host-vim needed for the xxd utility NETSURF_DEPENDENCIES = expat jpeg libpng \ host-bison host-flex host-gperf host-pkgconf host-vim diff --git a/buildroot/package/nginx/0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch b/buildroot/package/nginx/0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch new file mode 100644 index 000000000..ba47768fe --- /dev/null +++ b/buildroot/package/nginx/0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch @@ -0,0 +1,40 @@ +From 9f1dcb0c0473641730b871dee984016ff19d2c53 Mon Sep 17 00:00:00 2001 +From: Maxim Dounin +Date: Tue, 25 May 2021 15:17:36 +0300 +Subject: [PATCH] Resolver: fixed off-by-one write in ngx_resolver_copy(). + +Reported by Luis Merino, Markus Vervier, Eric Sesterhenn, X41 D-Sec GmbH. + +[peter@korsgaard.com: backport from upstream] +Signed-off-by: Peter Korsgaard +--- + src/core/ngx_resolver.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c +index 79390701..63b26193 100644 +--- a/src/core/ngx_resolver.c ++++ b/src/core/ngx_resolver.c +@@ -4008,15 +4008,15 @@ done: + n = *src++; + + } else { ++ if (dst != name->data) { ++ *dst++ = '.'; ++ } ++ + ngx_strlow(dst, src, n); + dst += n; + src += n; + + n = *src++; +- +- if (n != 0) { +- *dst++ = '.'; +- } + } + + if (n == 0) { +-- +2.20.1 + diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 8a371a2cc..e93e802fd 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -13,6 +13,9 @@ NGINX_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) +# 0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch +NGINX_IGNORE_CVES += CVE-2021-23017 + NGINX_CONF_OPTS = \ --crossbuild=Linux::$(BR2_ARCH) \ --with-cc="$(TARGET_CC)" \ diff --git a/buildroot/package/odb/odb.mk b/buildroot/package/odb/odb.mk index 11086471e..85c7ccb8b 100644 --- a/buildroot/package/odb/odb.mk +++ b/buildroot/package/odb/odb.mk @@ -11,6 +11,7 @@ ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE HOST_ODB_DEPENDENCIES = host-libcutl +HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts # gcc plugin directory. Instead, this will install the gcc plugin diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk index b1b86ba71..5c82da997 100644 --- a/buildroot/package/opencv3/opencv3.mk +++ b/buildroot/package/opencv3/opencv3.mk @@ -9,6 +9,8 @@ OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause OPENCV3_LICENSE_FILES = LICENSE +OPENCV3_CPE_ID_VENDOR = opencv +OPENCV3_CPE_ID_PRODUCT = opencv OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS) diff --git a/buildroot/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash index c50a49896..0dcd725de 100644 --- a/buildroot/package/openssh/openssh.hash +++ b/buildroot/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.5 (base64 encoded) -sha256 f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25 openssh-8.5p1.tar.gz +# From https://www.openssh.com/txt/release-8.6 (base64 encoded) +sha256 c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae openssh-8.6p1.tar.gz # Locally calculated sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 055c024ca..61b2c97cf 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.5 +OPENSSH_VERSION_MAJOR = 8.6 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) diff --git a/buildroot/package/opentyrian/opentyrian.hash b/buildroot/package/opentyrian/opentyrian.hash new file mode 100644 index 000000000..0d1f4927e --- /dev/null +++ b/buildroot/package/opentyrian/opentyrian.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 2b0db65c735cc099279ea3da6d9b76f791633897cd0f5b67528f70de0758a944 opentyrian-cf5dbeb69eebd9ef9afc4473088d9469b79589eb.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/opentyrian/opentyrian.mk b/buildroot/package/opentyrian/opentyrian.mk index 12e41ad99..690323334 100644 --- a/buildroot/package/opentyrian/opentyrian.mk +++ b/buildroot/package/opentyrian/opentyrian.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENTYRIAN_VERSION = 9c9f0ec3532b -OPENTYRIAN_SITE = https://bitbucket.org/opentyrian/opentyrian -OPENTYRIAN_SITE_METHOD = hg +OPENTYRIAN_VERSION = cf5dbeb69eebd9ef9afc4473088d9469b79589eb +OPENTYRIAN_SITE = $(call github,opentyrian,opentyrian,$(OPENTYRIAN_VERSION)) OPENTYRIAN_LICENSE = GPL-2.0+ OPENTYRIAN_LICENSE_FILES = COPYING diff --git a/buildroot/package/oprofile/oprofile.mk b/buildroot/package/oprofile/oprofile.mk index 50693ddd1..85bc4efa9 100644 --- a/buildroot/package/oprofile/oprofile.mk +++ b/buildroot/package/oprofile/oprofile.mk @@ -8,6 +8,7 @@ OPROFILE_VERSION = 1.4.0 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_LICENSE = GPL-2.0+ OPROFILE_LICENSE_FILES = COPYING +OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ --enable-gui=no \ diff --git a/buildroot/package/p7zip/p7zip.mk b/buildroot/package/p7zip/p7zip.mk index 59cd9b7e9..43fbe775d 100644 --- a/buildroot/package/p7zip/p7zip.mk +++ b/buildroot/package/p7zip/p7zip.mk @@ -9,6 +9,7 @@ P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2 P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION) P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt +P7ZIP_CPE_ID_VENDOR = 7-zip # 0001-CVE-2016-9296.patch P7ZIP_IGNORE_CVES += CVE-2016-9296 diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash index 5223757f0..4cdedfbf9 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4920ff685344cdb0272568bc4414dcf48fcdfc4a98c78b1f3ca49c38417bf391 paho-mqtt-c-1.3.8.tar.gz +sha256 386c9b5fa1cf6d0d516db12d57fd8f6a410dd0fdc5e9a2da870aae437a2535ed paho-mqtt-c-1.3.9.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk index b9b4f217f..68b58f2e0 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.8 +PAHO_MQTT_C_VERSION = 1.3.9 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk index a77686f95..f661fef01 100644 --- a/buildroot/package/perl/perl.mk +++ b/buildroot/package/perl/perl.mk @@ -11,6 +11,7 @@ PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README +PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES diff --git a/buildroot/package/php-imagick/php-imagick.mk b/buildroot/package/php-imagick/php-imagick.mk index ca0cbc749..6fb43de0c 100644 --- a/buildroot/package/php-imagick/php-imagick.mk +++ b/buildroot/package/php-imagick/php-imagick.mk @@ -13,6 +13,8 @@ PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ PHP_IMAGICK_DEPENDENCIES = imagemagick php host-autoconf PHP_IMAGICK_LICENSE = PHP-3.01 PHP_IMAGICK_LICENSE_FILES = LICENSE +PHP_IMAGICK_CPE_ID_VENDOR = php +PHP_IMAGICK_CPE_ID_PRODUCT = imagick define PHP_IMAGICK_PHPIZE (cd $(@D); \ diff --git a/buildroot/package/picocom/picocom.mk b/buildroot/package/picocom/picocom.mk index d27c73437..2d585bb2f 100644 --- a/buildroot/package/picocom/picocom.mk +++ b/buildroot/package/picocom/picocom.mk @@ -8,6 +8,7 @@ PICOCOM_VERSION = 3.1 PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt +PICOCOM_CPE_ID_VENDOR = picocom_project define PICOCOM_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch b/buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch index ecd7c4fc4..3832b77d5 100644 --- a/buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch +++ b/buildroot/package/pifmrds/0003-Makefile-fix-static-link.patch @@ -4,6 +4,8 @@ Since libsndfile uses funtions from libm, the -lm should be specified after libsndfile for static linking. Signed-off-by: "Eric Limpens" +[Fabrice: add $(SNDFILE_LIBS) to pass all dependencies from pkg-config] +Signed-off-by: Fabrice Fontaine diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile --- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile 2016-02-26 08:06:43.102962592 +0100 @@ -13,11 +15,11 @@ diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pi app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o - $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o $(SNDFILE_LIBS) -lm rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o - $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm ++ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o $(SNDFILE_LIBS) -lm rds.o: rds.c waveforms.h $(CC) $(CFLAGS) rds.c diff --git a/buildroot/package/pifmrds/pifmrds.mk b/buildroot/package/pifmrds/pifmrds.mk index 509ec8087..33c13bae3 100644 --- a/buildroot/package/pifmrds/pifmrds.mk +++ b/buildroot/package/pifmrds/pifmrds.mk @@ -6,13 +6,14 @@ PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2 PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION)) -PIFMRDS_DEPENDENCIES = libsndfile +PIFMRDS_DEPENDENCIES = host-pkgconf libsndfile PIFMRDS_LICENSE = GPL-3.0+ PIFMRDS_LICENSE_FILES = LICENSE define PIFMRDS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ + SNDFILE_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs sndfile`" \ app rds_wav endef diff --git a/buildroot/package/pigz/pigz.mk b/buildroot/package/pigz/pigz.mk index fdf5fa40e..3e5e89279 100644 --- a/buildroot/package/pigz/pigz.mk +++ b/buildroot/package/pigz/pigz.mk @@ -10,6 +10,7 @@ PIGZ_DEPENDENCIES = zlib HOST_PIGZ_DEPENDENCIES = host-zlib PIGZ_LICENSE = Zlib PIGZ_LICENSE_FILES = README +PIGZ_CPE_ID_VENDOR = zlib define PIGZ_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/buildroot/package/pngquant/pngquant.mk b/buildroot/package/pngquant/pngquant.mk index c5a17e872..1729ff192 100644 --- a/buildroot/package/pngquant/pngquant.mk +++ b/buildroot/package/pngquant/pngquant.mk @@ -9,6 +9,7 @@ PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ PNGQUANT_LICENSE_FILES = COPYRIGHT +PNGQUANT_CPE_ID_VENDOR = pngquant HOST_PNGQUANT_DEPENDENCIES = host-libpng PNGQUANT_DEPENDENCIES = libpng diff --git a/buildroot/package/poco/poco.mk b/buildroot/package/poco/poco.mk index c605044ba..857f215e3 100644 --- a/buildroot/package/poco/poco.mk +++ b/buildroot/package/poco/poco.mk @@ -8,6 +8,7 @@ POCO_VERSION = 1.10.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE +POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES POCO_DEPENDENCIES = zlib pcre \ diff --git a/buildroot/package/postgresql/postgresql.hash b/buildroot/package/postgresql/postgresql.hash index 7dfe19483..caa8a1f5e 100644 --- a/buildroot/package/postgresql/postgresql.hash +++ b/buildroot/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.bz2.sha256 -sha256 5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc postgresql-13.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v13.3/postgresql-13.3.tar.bz2.sha256 +sha256 3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 postgresql-13.3.tar.bz2 # License file, Locally calculated sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/buildroot/package/postgresql/postgresql.mk b/buildroot/package/postgresql/postgresql.mk index 9206c6246..cab555380 100644 --- a/buildroot/package/postgresql/postgresql.mk +++ b/buildroot/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 13.2 +POSTGRESQL_VERSION = 13.3 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL diff --git a/buildroot/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash index 309ae0181..50d596471 100644 --- a/buildroot/package/prosody/prosody.hash +++ b/buildroot/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 24cd3c1f7ab16a6b3726423d2fff802d prosody-0.11.8.tar.gz -sha1 f1f030c75abde6e3c7232fedbe8371f5cb913245 prosody-0.11.8.tar.gz -sha256 830f183b98d5742d81e908d2d8e3258f1b538dad7411f06fda5b2cc5c75068f8 prosody-0.11.8.tar.gz -sha512 b0b7e1d3e41f47f0f88ad5b76444e4959b20f4c7a937f3cc605ba6ed5d92e713a3054dcb61ee6629063883a8f9ff1a03952893de4a0d840dcec4e5e42079eb57 prosody-0.11.8.tar.gz +md5 be7e1c66c06b0eb4bdce37b67bcc6b51 prosody-0.11.9.tar.gz +sha1 632c2dd7794d344d4edbcea18fc1b5f623da5ca4 prosody-0.11.9.tar.gz +sha256 ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09 prosody-0.11.9.tar.gz +sha512 fabbbbb1acb3de4ff01e3e8c6e9e4dc37cb161259f1649683a1f9d925ed9f1709e052bfc831cba3f1861a9cca599f2b725ee739bfcb57164d6f50ac07011b52a prosody-0.11.9.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/buildroot/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk index a4482ad3c..92c812ebf 100644 --- a/buildroot/package/prosody/prosody.mk +++ b/buildroot/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.8 +PROSODY_VERSION = 0.11.9 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING diff --git a/buildroot/package/proxychains-ng/proxychains-ng.mk b/buildroot/package/proxychains-ng/proxychains-ng.mk index a9f3fc956..0437f7d91 100644 --- a/buildroot/package/proxychains-ng/proxychains-ng.mk +++ b/buildroot/package/proxychains-ng/proxychains-ng.mk @@ -9,6 +9,7 @@ PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.bz2 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng PROXYCHAINS_NG_LICENSE = GPL-2.0+ PROXYCHAINS_NG_LICENSE_FILES = COPYING +PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ diff --git a/buildroot/package/pulseaudio/pulseaudio.mk b/buildroot/package/pulseaudio/pulseaudio.mk index ad1710c6f..f7d7492ee 100644 --- a/buildroot/package/pulseaudio/pulseaudio.mk +++ b/buildroot/package/pulseaudio/pulseaudio.mk @@ -10,6 +10,7 @@ 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 +PULSEAUDIO_CPE_ID_VENDOR = pulseaudio PULSEAUDIO_CONF_OPTS = \ --disable-default-build-tests \ --disable-legacy-database-entry-format \ diff --git a/buildroot/package/putty/putty.mk b/buildroot/package/putty/putty.mk index c40cac9dc..8a494d4e5 100644 --- a/buildroot/package/putty/putty.mk +++ b/buildroot/package/putty/putty.mk @@ -12,6 +12,9 @@ PUTTY_CPE_ID_VENDOR = putty PUTTY_CONF_OPTS = --disable-gtktest PUTTY_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" +# Windows only, fixed for Windows with 0.75 +PUTTY_IGNORE_CVES += CVE-2021-33500 + ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_CONF_OPTS += --with-gtk=2 PUTTY_DEPENDENCIES += libgtk2 diff --git a/buildroot/package/pwgen/pwgen.mk b/buildroot/package/pwgen/pwgen.mk index ad9465b82..89925bb30 100644 --- a/buildroot/package/pwgen/pwgen.mk +++ b/buildroot/package/pwgen/pwgen.mk @@ -8,6 +8,7 @@ PWGEN_VERSION = 2.08 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) PWGEN_LICENSE = GPL-2.0 PWGEN_LICENSE_FILES = debian/copyright +PWGEN_CPE_ID_VENDOR = pwgen_project $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/python-autobahn/python-autobahn.mk b/buildroot/package/python-autobahn/python-autobahn.mk index 37b3d3353..81e2b7a4c 100644 --- a/buildroot/package/python-autobahn/python-autobahn.mk +++ b/buildroot/package/python-autobahn/python-autobahn.mk @@ -9,6 +9,8 @@ PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/cb/16/38d27874ef827974f44acb6dd64a92a9248b624734c0e84b91083c2d9350 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE +PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar +PYTHON_AUTOBAHN_CPE_ID_PRODUCT = autobahn PYTHON_AUTOBAHN_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-bluezero/Config.in b/buildroot/package/python-bluezero/Config.in index 9ea3686a2..c391bfa85 100644 --- a/buildroot/package/python-bluezero/Config.in +++ b/buildroot/package/python-bluezero/Config.in @@ -1,12 +1,19 @@ config BR2_PACKAGE_PYTHON_BLUEZERO bool "python-bluezero" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_DBUS_PYTHON # runtime + select BR2_PACKAGE_PYTHON_GOBJECT # runtime help Python library for Bluetooth Low Energy (BLE) on Linux. - For central.py, peripheral.py and broadcaster.py you need - to enable the dbus-python and the bluez5-utils package. - For observer.py, you need to enable the python-aioblescan - package. - https://github.com/ukBaz/python-bluezero + +comment "python-bluezero needs a glibc toolchain, gcc >= 4.9" + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/python-engineio/python-engineio.mk b/buildroot/package/python-engineio/python-engineio.mk index d0e073fa9..4f835da0a 100644 --- a/buildroot/package/python-engineio/python-engineio.mk +++ b/buildroot/package/python-engineio/python-engineio.mk @@ -9,6 +9,7 @@ PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/71/5d/620b75396ce PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE +PYTHON_ENGINEIO_CPE_ID_VENDOR = python-engineio_project ifeq ($(BR2_PACKAGE_PYTHON),y) # only needed/valid for python 3.x diff --git a/buildroot/package/python-keyring/python-keyring.mk b/buildroot/package/python-keyring/python-keyring.mk index 2f6ee8497..0e0573860 100644 --- a/buildroot/package/python-keyring/python-keyring.mk +++ b/buildroot/package/python-keyring/python-keyring.mk @@ -10,6 +10,8 @@ PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/ee/46/77fdb7cd2b0f PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE +PYTHON_KEYRING_CPE_ID_VENDOR = python +PYTHON_KEYRING_CPE_ID_PRODUCT = keyring PYTHON_KEYRING_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/buildroot/package/python-pillow/python-pillow.hash b/buildroot/package/python-pillow/python-pillow.hash index 0849577f6..562cb2c1a 100644 --- a/buildroot/package/python-pillow/python-pillow.hash +++ b/buildroot/package/python-pillow/python-pillow.hash @@ -1,4 +1,5 @@ -# md5, sha256 from https://pypi.org/project/Pillow/ -sha256 11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e Pillow-8.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pillow/json +md5 21c03274a9f59b9c00419852a8faebe7 Pillow-8.2.0.tar.gz +sha256 a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1 Pillow-8.2.0.tar.gz # Locally computed sha256 checksums -sha256 37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81 LICENSE +sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE diff --git a/buildroot/package/python-pillow/python-pillow.mk b/buildroot/package/python-pillow/python-pillow.mk index f71fa156e..42607e0bb 100644 --- a/buildroot/package/python-pillow/python-pillow.mk +++ b/buildroot/package/python-pillow/python-pillow.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.0.1 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1 +PYTHON_PILLOW_VERSION = 8.2.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_LICENSE = PIL Software License +PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow @@ -28,6 +28,20 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +PYTHON_PILLOW_DEPENDENCIES += lcms2 +PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +else +PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +endif + +ifeq ($(BR2_PACKAGE_LIBXCB),y) +PYTHON_PILLOW_DEPENDENCIES += libxcb +PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +else +PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +endif + ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 @@ -45,8 +59,13 @@ endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp PYTHON_PILLOW_BUILD_OPTS += --enable-webp +ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) +PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp +PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +endif +else +PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif define PYTHON_PILLOW_BUILD_CMDS diff --git a/buildroot/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk index 2b543c0f9..5d0f545ff 100644 --- a/buildroot/package/python-requests/python-requests.mk +++ b/buildroot/package/python-requests/python-requests.mk @@ -11,5 +11,7 @@ PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE +PYTHON_REQUESTS_CPE_ID_VENDOR = python +PYTHON_REQUESTS_CPE_ID_PRODUCT = requests $(eval $(python-package)) diff --git a/buildroot/package/python-tqdm/python-tqdm.mk b/buildroot/package/python-tqdm/python-tqdm.mk index 4ff4696e6..5ceddde14 100644 --- a/buildroot/package/python-tqdm/python-tqdm.mk +++ b/buildroot/package/python-tqdm/python-tqdm.mk @@ -10,5 +10,7 @@ PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/4c/45/830c5c4bfaba60e PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE +PYTHON_TQDM_CPE_ID_VENDOR = tqdm_project +PYTHON_TQDM_CPE_ID_PRODUCT = tqdm $(eval $(python-package)) diff --git a/buildroot/package/python3-requests/python3-requests.mk b/buildroot/package/python3-requests/python3-requests.mk index b67d71a18..dbb3f2149 100644 --- a/buildroot/package/python3-requests/python3-requests.mk +++ b/buildroot/package/python3-requests/python3-requests.mk @@ -11,6 +11,8 @@ PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc0843 PYTHON3_REQUESTS_SETUP_TYPE = setuptools PYTHON3_REQUESTS_LICENSE = Apache-2.0 PYTHON3_REQUESTS_LICENSE_FILES = LICENSE +PYTHON3_REQUESTS_CPE_ID_VENDOR = python +PYTHON3_REQUESTS_CPE_ID_PRODUCT = requests HOST_PYTHON3_REQUESTS_DL_SUBDIR = python-requests HOST_PYTHON3_REQUESTS_NEEDS_HOST_PYTHON = python3 diff --git a/buildroot/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch b/buildroot/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch new file mode 100644 index 000000000..6a2194915 --- /dev/null +++ b/buildroot/package/qemu/0005-build-no-pie-is-no-functional-linker-flag.patch @@ -0,0 +1,79 @@ +From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 +From: Christian Ehrhardt +Date: Mon, 14 Dec 2020 16:09:38 +0100 +Subject: [PATCH] build: -no-pie is no functional linker flag + +Recent binutils changes dropping unsupported options [1] caused a build +issue in regard to the optionroms. + + ld -m elf_i386 -T /<>/pc-bios/optionrom//flat.lds -no-pie \ + -s -o multiboot.img multiboot.o + ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) + +This isn't really a regression in ld.bfd, filing the bug upstream +revealed that this never worked as a ld flag [2] - in fact it seems we +were by accident setting --nmagic). + +Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be +droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE +in .mak, therefore we can also remove it from being added there. + +[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d +[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 + +Signed-off-by: Christian Ehrhardt +Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com> +Cc: qemu-stable@nongnu.org +Signed-off-by: Paolo Bonzini + +[Retrieved from: +https://gitlab.com/qemu-project/qemu/-/commit/bbd2d5a8120771ec59b86a80a1f51884e0a26e53] +Signed-off-by: Fabrice Fontaine +--- + configure | 3 --- + pc-bios/optionrom/Makefile | 1 - + 2 files changed, 4 deletions(-) + +diff --git a/configure b/configure +index cb21108d34..c228f7c21e 100755 +--- a/configure ++++ b/configure +@@ -2137,7 +2137,6 @@ EOF + # Check we support --no-pie first; we will need this for building ROMs. + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-no-pie" + fi + + if test "$static" = "yes"; then +@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then + fi + elif test "$pie" = "no"; then + CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" +- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then + CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" +@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak + echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak + echo "GLIB_LIBS=$glib_libs" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 084fc10f05..30771f8d17 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) + + LD_I386_EMULATION ?= elf_i386 + override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +-override LDFLAGS += $(LDFLAGS_NOPIE) + + all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + +-- +GitLab + diff --git a/buildroot/package/qpdf/qpdf.mk b/buildroot/package/qpdf/qpdf.mk index fd31140b0..ec3d3f89a 100644 --- a/buildroot/package/qpdf/qpdf.mk +++ b/buildroot/package/qpdf/qpdf.mk @@ -9,6 +9,7 @@ QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 +QPDF_CPE_ID_VENDOR = qpdf_project QPDF_DEPENDENCIES = host-pkgconf zlib jpeg QPDF_CONF_OPTS = --with-random=/dev/urandom diff --git a/buildroot/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/buildroot/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch new file mode 100644 index 000000000..f014a160d --- /dev/null +++ b/buildroot/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch @@ -0,0 +1,53 @@ +From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Mon, 18 Jan 2021 07:40:54 -0800 +Subject: [PATCH] Fix build with GCC 11: include + +Fixes: QTBUG-90395 +Pick-to: 6.0 +Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 +Reviewed-by: Edward Welbourne + +[Retrieved (and backported) from: +https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] +Signed-off-by: Fabrice Fontaine +--- + src/corelib/global/qendian.h | 6 ++++-- + src/corelib/global/qfloat16.h | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h +index 99b529f17cd..c874c5e47ab 100644 +--- a/src/corelib/global/qendian.h ++++ b/src/corelib/global/qendian.h +@@ -1,7 +1,7 @@ + /**************************************************************************** + ** +-** Copyright (C) 2016 The Qt Company Ltd. +-** Copyright (C) 2016 Intel Corporation. ++** Copyright (C) 2021 The Qt Company Ltd. ++** Copyright (C) 2021 Intel Corporation. + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the QtCore module of the Qt Toolkit. +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems + #include + #include +diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h +index e9477d2ecec..a25fac28862 100644 +--- a/src/corelib/global/qfloat16.h ++++ b/src/corelib/global/qfloat16.h +@@ -44,6 +44,7 @@ + + #include + #include ++#include + #include + + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index 9b87b49fb..d9f1281aa 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 f16ad973d19f80f121e53794d5eb48a997e2c6a85b5be41bb3b66750cc17bf6b redis-6.0.12.tar.gz +sha256 3049763f4553ddd5a69552f41da3dd7dde9fbc524dbb15e517fee24cc73b790c redis-6.0.13.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index c851e589c..b70692ac7 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 6.0.12 +REDIS_VERSION = 6.0.13 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/buildroot/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk index 0194708b3..1180f0d38 100644 --- a/buildroot/package/refpolicy/refpolicy.mk +++ b/buildroot/package/refpolicy/refpolicy.mk @@ -6,7 +6,7 @@ REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING -REFPOLICY_CPE_ID_VENDOR = tresys +REFPOLICY_CPE_ID_VENDOR = selinuxproject REFPOLICY_INSTALL_STAGING = YES REFPOLICY_DEPENDENCIES = \ host-m4 \ diff --git a/buildroot/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch b/buildroot/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch new file mode 100644 index 000000000..f71ba09a7 --- /dev/null +++ b/buildroot/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch @@ -0,0 +1,48 @@ +From 84fea5d784e010f84c860b34e55ea2c855c17b3b Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Wed, 12 May 2021 09:18:33 +0200 +Subject: [PATCH] Makefile: drop explicit undefine PYLIB for compatibility with + make 3.81 + +GNU make 3.81 does not like the explicit tab-indented undefine: + +Makefile:41: *** commands commence before first target. Stop. + +Dropping the indentation also doesn't work: + +Makefile:41: *** missing separator. Stop. + +So simply drop the undefine logic. As explained in the GNU make manual, +undefine is not commonly needed as E.G. ifdef checks for a non-zero string: + +https://www.gnu.org/software/make/manual/html_node/Undefine-Directive.html +https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html + +Fixes: +http://autobuild.buildroot.net/results/cf7c4f360f5464c700788cc8299fd086544c80e8/build-end.log + +Signed-off-by: Peter Korsgaard +[Upstream: https://marc.info/?l=linux-rt-users&m=162080462211139&w=2] +--- + Makefile | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile b/Makefile +index b17ac09..ec85ac8 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,11 +36,6 @@ LDFLAGS ?= + + PYLIB ?= $(shell python3 -c 'import distutils.sysconfig; print (distutils.sysconfig.get_python_lib())') + +-# Check for errors, such as python3 not available +-ifeq (${PYLIB},) +- undefine PYLIB +-endif +- + MANPAGES = src/cyclictest/cyclictest.8 \ + src/pi_tests/pi_stress.8 \ + src/ptsematest/ptsematest.8 \ +-- +2.20.1 + diff --git a/buildroot/package/runc/runc.hash b/buildroot/package/runc/runc.hash index 0f9cfbbe9..598bd3067 100644 --- a/buildroot/package/runc/runc.hash +++ b/buildroot/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8 runc-1.0.0-rc93.tar.gz +sha256 02dac7f1a0dcfe55dd9820df787adedf030060870354915e7bba86f8487ce93c runc-1.0.0-rc95.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index c5cb57bdc..62b9f09bf 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -5,7 +5,7 @@ ################################################################################ RUNC_VERSION_MAJOR = 1.0.0 -RUNC_VERSION_MINOR = rc93 +RUNC_VERSION_MINOR = rc95 RUNC_VERSION = $(RUNC_VERSION_MAJOR)-$(RUNC_VERSION_MINOR) RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 diff --git a/buildroot/package/shellinabox/shellinabox.mk b/buildroot/package/shellinabox/shellinabox.mk index 4c93fdcce..58c166811 100644 --- a/buildroot/package/shellinabox/shellinabox.mk +++ b/buildroot/package/shellinabox/shellinabox.mk @@ -8,6 +8,7 @@ SHELLINABOX_VERSION = 2.20 SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,v$(SHELLINABOX_VERSION)) SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception SHELLINABOX_LICENSE_FILES = COPYING GPL-2 +SHELLINABOX_CPE_ID_VENDOR = shellinabox_project # 0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch SHELLINABOX_IGNORE_CVES += CVE-2018-16789 diff --git a/buildroot/package/squid/squid.hash b/buildroot/package/squid/squid.hash index a2aaba5fd..12a9e5d29 100644 --- a/buildroot/package/squid/squid.hash +++ b/buildroot/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.14.tar.xz.asc -md5 7d9ba82703cd770b2ede169a0c1de94a squid-4.14.tar.xz -sha1 71ae13a845a6a7ffc69ce11086ea3e427625bc08 squid-4.14.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.15.tar.xz.asc +md5 a593de9dc888dfeca4f1f7db2cd7d3b9 squid-4.15.tar.xz +sha1 60bda34ba39657e2d870c8c1d2acece8a69c3075 squid-4.15.tar.xz # Locally calculated -sha256 f1097daa6434897c159bc100978b51347c0339041610845d0afa128151729ffc squid-4.14.tar.xz +sha256 b693a4e5ab2811a8a854f60de0a62afbbf3a952bb1d047952c9ae01321f84a25 squid-4.15.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index 7e6865f8e..b23a8d26e 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 4.14 +SQUID_VERSION = 4.15 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ diff --git a/buildroot/package/strace/Config.in b/buildroot/package/strace/Config.in index 5b33dad39..c394d4c39 100644 --- a/buildroot/package/strace/Config.in +++ b/buildroot/package/strace/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_STRACE bool "strace" # needs at least kernel headers 4.0 on nios2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 + # needs at least kernel headers 5.0 on xtensa + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa depends on !BR2_nds32 && !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -16,3 +18,7 @@ config BR2_PACKAGE_STRACE comment "strace needs a toolchain w/ headers >= 4.0 on nios2" depends on BR2_nios2 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + +comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" + depends on BR2_xtensa + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/buildroot/package/supervisor/supervisor.mk b/buildroot/package/supervisor/supervisor.mk index 424f46a7c..92e832308 100644 --- a/buildroot/package/supervisor/supervisor.mk +++ b/buildroot/package/supervisor/supervisor.mk @@ -8,6 +8,7 @@ SUPERVISOR_VERSION = 4.1.0 SUPERVISOR_SITE = https://files.pythonhosted.org/packages/de/87/ee1ad8fa533a4b5f2c7623f4a2b585d3c1947af7bed8e65bc7772274320e SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa) SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt +SUPERVISOR_CPE_ID_VENDOR = supervisord SUPERVISOR_SETUP_TYPE = setuptools define SUPERVISOR_INSTALL_CONF_FILES diff --git a/buildroot/package/synergy/synergy.mk b/buildroot/package/synergy/synergy.mk index 63c6e5cbc..bc7ebea07 100644 --- a/buildroot/package/synergy/synergy.mk +++ b/buildroot/package/synergy/synergy.mk @@ -8,6 +8,7 @@ SYNERGY_VERSION = 2.0.12-beta SYNERGY_SITE = $(call github,symless,synergy-core,v$(SYNERGY_VERSION)) SYNERGY_LICENSE = GPL-2.0 SYNERGY_LICENSE_FILES = LICENSE +SYNERGY_CPE_ID_VENDOR = symless SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst # Avoid using buildroot commit hash inside cmake/Version.cmake diff --git a/buildroot/package/taglib/taglib.mk b/buildroot/package/taglib/taglib.mk index 738be3575..f31f1046a 100644 --- a/buildroot/package/taglib/taglib.mk +++ b/buildroot/package/taglib/taglib.mk @@ -9,6 +9,7 @@ TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL +TAGLIB_CPE_ID_VENDOR = taglib # 0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch TAGLIB_IGNORE_CVES += CVE-2017-12678 diff --git a/buildroot/package/tclap/tclap.mk b/buildroot/package/tclap/tclap.mk index 63dea67ac..e1856420f 100644 --- a/buildroot/package/tclap/tclap.mk +++ b/buildroot/package/tclap/tclap.mk @@ -9,6 +9,7 @@ TCLAP_SITE = http://downloads.sourceforge.net/project/tclap TCLAP_LICENSE = MIT TCLAP_LICENSE_FILES = COPYING TCLAP_INSTALL_STAGING = YES +TCLAP_CPE_ID_VENDOR = tclap_project # This package is a pure C++ template library, only made of headers. TCLAP_INSTALL_TARGET = NO diff --git a/buildroot/package/terminology/terminology.mk b/buildroot/package/terminology/terminology.mk index d93e34878..6c6ec13cd 100644 --- a/buildroot/package/terminology/terminology.mk +++ b/buildroot/package/terminology/terminology.mk @@ -9,6 +9,7 @@ TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause TERMINOLOGY_LICENSE_FILES = COPYING +TERMINOLOGY_CPE_ID_VENDOR = enlightenment TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-pkgconf TERMINOLOGY_CONF_OPTS = -Dedje-cc=$(HOST_DIR)/bin/edje_cc diff --git a/buildroot/package/thermald/thermald.mk b/buildroot/package/thermald/thermald.mk index 98e9c361e..5619258c4 100644 --- a/buildroot/package/thermald/thermald.mk +++ b/buildroot/package/thermald/thermald.mk @@ -12,6 +12,7 @@ THERMALD_DEPENDENCIES = dbus dbus-glib libxml2 $(TARGET_NLS_DEPENDENCIES) # tools are GPL-3.0+ but are not added to the target THERMALD_LICENSE = GPL-2.0+ THERMALD_LICENSE_FILES = COPYING +THERMALD_CPE_ID_VENDOR = intel THERMALD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/buildroot/package/tini/tini.mk b/buildroot/package/tini/tini.mk index af4a3bcb5..9da54f8a2 100644 --- a/buildroot/package/tini/tini.mk +++ b/buildroot/package/tini/tini.mk @@ -8,6 +8,7 @@ TINI_VERSION = 0.19.0 TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE +TINI_CPE_ID_VENDOR = tini_project TINI_CFLAGS = $(TARGET_CFLAGS) \ -static \ diff --git a/buildroot/package/tinyproxy/tinyproxy.mk b/buildroot/package/tinyproxy/tinyproxy.mk index 6120d183c..326bfa8b8 100644 --- a/buildroot/package/tinyproxy/tinyproxy.mk +++ b/buildroot/package/tinyproxy/tinyproxy.mk @@ -9,6 +9,7 @@ TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINY TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.bz2 TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING +TINYPROXY_CPE_ID_VENDOR = tinyproxy_project TINYPROXY_CONF_ENV = ac_cv_path_A2X=no $(eval $(autotools-package)) diff --git a/buildroot/package/tinyxml2/tinyxml2.mk b/buildroot/package/tinyxml2/tinyxml2.mk index b06d849b2..d760d54a2 100644 --- a/buildroot/package/tinyxml2/tinyxml2.mk +++ b/buildroot/package/tinyxml2/tinyxml2.mk @@ -9,6 +9,7 @@ TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt TINYXML2_INSTALL_STAGING = YES +TINYXML2_CPE_ID_VENDOR = tinyxml2_project ifeq ($(BR2_STATIC_LIBS),y) TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/buildroot/package/tpm2-tss/tpm2-tss.mk b/buildroot/package/tpm2-tss/tpm2-tss.mk index bde6b352b..9ffbef2f0 100644 --- a/buildroot/package/tpm2-tss/tpm2-tss.mk +++ b/buildroot/package/tpm2-tss/tpm2-tss.mk @@ -8,6 +8,8 @@ TPM2_TSS_VERSION = 3.0.3 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE +TPM2_TSS_CPE_ID_VENDOR = tpm2_software_stack_project +TPM2_TSS_CPE_ID_PRODUCT = tpm2_software_stack TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags diff --git a/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch b/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch new file mode 100644 index 000000000..040699df8 --- /dev/null +++ b/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch @@ -0,0 +1,91 @@ +From 6c95eccff5eb43c8c3ad865d3b1316b7952cc58e Mon Sep 17 00:00:00 2001 +From: Yann Sionneau +Date: Fri, 28 May 2021 08:59:58 +0200 +Subject: [PATCH] powerpc: fix PIE/PIC builds with newer gcc/binutils which use + secureplt by default + +This patch fixes segfault of all user space processes (including init, which caused a panic) on recent buildroot powerpc32 builds. + +The issue has been reported by Romain Naour in this thread: https://mailman.uclibc-ng.org/pipermail/devel/2021-May/002068.html + +Recent buildroot toolchain enables secure PLT in powerpc gcc. +The latter will then supply -msecure-plt to gas invocations by default. +Recent buildroot also enables PIE by default. + +For the secure PLT to work in PIC, the r30 register needs to point to the GOT. +Old "bss plt" was just a one-instruction-wide PLT slot, pointed-to by a R_PPC_JMP_SLOT relocation, which was written on-the-fly to contain a branch instruction to the correct address. It therefore had to stay writable+executable, which you generally want to avoid for security reasons. +New secure PLT only contains read-only code which loads the branch address from the writable GOT. + +Note: secure PLT without PIC does not need r30 to be set. Because offset between plt stub code and got is known at link-time. In this case the PLT entry looks like: +1009b3e0 <__uClibc_main@plt>: +1009b3e0: 3d 60 10 0e lis r11,4110 +1009b3e4: 81 6b 03 74 lwz r11,884(r11) +1009b3e8: 7d 69 03 a6 mtctr r11 +1009b3ec: 4e 80 04 20 bctr + +Whereas secure PLT with PIC - offset between plt and got is unknown at link-time - looks like this: +000af800 <00000000.plt_pic32.__uClibc_main>: + af800: 81 7e 03 80 lwz r11,896(r30) + af804: 7d 69 03 a6 mtctr r11 + af808: 4e 80 04 20 bctr + af80c: 60 00 00 00 nop + +Upstream status: Pending: +https://mailman.uclibc-ng.org/pipermail/devel/2021-May/002091.html + +Signed-off-by: Yann Sionneau +Signed-off-by: Romain Naour +--- + Rules.mak | 3 ++- + ldso/ldso/powerpc/dl-startup.h | 3 +++ + libc/sysdeps/linux/powerpc/crt1.S | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Rules.mak b/Rules.mak +index 10f88b3de..60ac59b85 100644 +--- a/Rules.mak ++++ b/Rules.mak +@@ -477,9 +477,10 @@ ifeq ($(TARGET_ARCH),powerpc) + PICFLAG:=-fpic + PIEFLAG_NAME:=-fpie + PPC_HAS_REL16:=$(shell printf "\t.text\n\taddis 11,30,_GLOBAL_OFFSET_TABLE_-.@ha\n" | $(CC) -c -x assembler -o /dev/null - 2> /dev/null && echo -n y || echo -n n) ++ PPC_HAS_SECUREPLT:=$(shell $(CC) --verbose 2>&1 | grep -- --enable-secureplt > /dev/null && echo -n y || echo -n n) ++ CPU_CFLAGS-$(PPC_HAS_SECUREPLT) += -DPPC_HAS_SECUREPLT + CPU_CFLAGS-$(PPC_HAS_REL16)+= -DHAVE_ASM_PPC_REL16 + CPU_CFLAGS-$(CONFIG_E500) += "-D__NO_MATH_INLINES" +- + endif + + ifeq ($(TARGET_ARCH),bfin) +diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h +index 8b2a517e2..7749395eb 100644 +--- a/ldso/ldso/powerpc/dl-startup.h ++++ b/ldso/ldso/powerpc/dl-startup.h +@@ -25,6 +25,9 @@ __asm__( + #else + " bl _GLOBAL_OFFSET_TABLE_-4@local\n" /* Put our GOT pointer in r31, */ + " mflr 31\n" ++#endif ++#ifdef PPC_HAS_SECUREPLT ++ " mr 30,31\n" + #endif + " addi 1,1,16\n" /* Restore SP */ + " lwz 7,_dl_skip_args@got(31)\n" /* load EA of _dl_skip_args */ +diff --git a/libc/sysdeps/linux/powerpc/crt1.S b/libc/sysdeps/linux/powerpc/crt1.S +index 27bfc5a5a..3f5d056c0 100644 +--- a/libc/sysdeps/linux/powerpc/crt1.S ++++ b/libc/sysdeps/linux/powerpc/crt1.S +@@ -56,6 +56,10 @@ _start: + # else + bl _GLOBAL_OFFSET_TABLE_-4@local + mflr r31 ++# endif ++ /* in PIC/PIE, plt stubs need r30 to point to the GOT if using secure-plt */ ++# ifdef PPC_HAS_SECUREPLT ++ mr 30,31 + # endif + #endif + /* Set up the small data pointer in r13. */ +-- +2.31.1 + diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk index 3d253d93b..a7c96684d 100644 --- a/buildroot/package/uclibc/uclibc.mk +++ b/buildroot/package/uclibc/uclibc.mk @@ -10,6 +10,8 @@ UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ UCLIBC_LICENSE_FILES = COPYING.LIB UCLIBC_INSTALL_STAGING = YES +UCLIBC_CPE_ID_VENDOR = uclibc-ng_project +UCLIBC_CPE_ID_PRODUCT = uclibc-ng define UCLIBC_HELP_CMDS @echo ' uclibc-menuconfig - Run uClibc menuconfig' diff --git a/buildroot/package/udisks/udisks.mk b/buildroot/package/udisks/udisks.mk index c6119a8b8..af25c2b8e 100644 --- a/buildroot/package/udisks/udisks.mk +++ b/buildroot/package/udisks/udisks.mk @@ -8,6 +8,7 @@ UDISKS_VERSION = 1.0.5 UDISKS_SITE = http://hal.freedesktop.org/releases UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING +UDISKS_CPE_ID_VENDOR = freedesktop # For 0002-Fix-systemd-service-file.patch UDISKS_AUTORECONF = YES diff --git a/buildroot/package/uhd/Config.in b/buildroot/package/uhd/Config.in index fae088750..f61bbf0e8 100644 --- a/buildroot/package/uhd/Config.in +++ b/buildroot/package/uhd/Config.in @@ -129,10 +129,14 @@ comment "USB support needs a toolchain w/ gcc >= 4.9" config BR2_PACKAGE_UHD_USRP1 bool "USRP1 support" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable USRP1 support +comment "USRP1 support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_UHD_USRP2 bool "USRP2 support" help diff --git a/buildroot/package/unscd/Config.in b/buildroot/package/unscd/Config.in index 23cc5a4fc..88f106210 100644 --- a/buildroot/package/unscd/Config.in +++ b/buildroot/package/unscd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_UNSCD bool "unscd" + depends on !BR2_RISCV_32 depends on BR2_TOOLCHAIN_USES_GLIBC help Micro Name Service Caching Daemon @@ -22,4 +23,5 @@ config BR2_PACKAGE_UNSCD http://busybox.net/~vda/unscd comment "unscd needs a glibc toolchain" + depends on !BR2_RISCV_32 depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch b/buildroot/package/vlc/0002-automake-add-subdir-objects-option.patch similarity index 100% rename from buildroot/package/vlc/0003-automake-add-subdir-objects-option.patch rename to buildroot/package/vlc/0002-automake-add-subdir-objects-option.patch diff --git a/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch b/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch deleted file mode 100644 index 11eaaf3b2..000000000 --- a/buildroot/package/vlc/0002-lua-Define-LUA_COMPAT_APIINTCASTS-for-Lua-5.3.0-comp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 00135e21bec84a2fe5920d02fa0982ceb9f89a35 Mon Sep 17 00:00:00 2001 -From: Vinson Lee -Date: Thu, 5 Feb 2015 14:48:53 -0800 -Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 - compatibility. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In Lua 5.3.0, luaL_checkint was deprecated. - -This patch fixes this build error with Lua 5.3.0. - -lua/demux.c: In function ‘vlclua_demux_peek’: -lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration] - int n = luaL_checkint( L, 1 ); - ^ - -Signed-off-by: Vinson Lee -Signed-off-by: Jean-Baptiste Kempf -[Backport upstream commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23] -Signed-off-by: Bernd Kuhls ---- - modules/lua/vlc.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h -index 71f381d334..b46b5f67a1 100644 ---- a/modules/lua/vlc.h -+++ b/modules/lua/vlc.h -@@ -38,6 +38,7 @@ - #include - #include - -+#define LUA_COMPAT_APIINTCASTS - #define LUA_COMPAT_MODULE - #include /* Low level lua C API */ - #include /* Higher level C API */ --- -2.14.4 - diff --git a/buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch b/buildroot/package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch similarity index 100% rename from buildroot/package/vlc/0004-build-use-pkg-config-to-get-tremor-libs.patch rename to buildroot/package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch diff --git a/buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch b/buildroot/package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch similarity index 100% rename from buildroot/package/vlc/0005-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch rename to buildroot/package/vlc/0004-Fix-build-error-using-uClibc-by-adding-sys-types.h.patch diff --git a/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch b/buildroot/package/vlc/0005-Don-t-assume-strerror_l-is-available.patch similarity index 100% rename from buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch rename to buildroot/package/vlc/0005-Don-t-assume-strerror_l-is-available.patch diff --git a/buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch b/buildroot/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch similarity index 100% rename from buildroot/package/vlc/0007-posix-remove-ancient-run-time-fallback-to-real-time-.patch rename to buildroot/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch diff --git a/buildroot/package/vlc/0008-Add-support-for-freerdp2.patch b/buildroot/package/vlc/0007-Add-support-for-freerdp2.patch similarity index 100% rename from buildroot/package/vlc/0008-Add-support-for-freerdp2.patch rename to buildroot/package/vlc/0007-Add-support-for-freerdp2.patch diff --git a/buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch b/buildroot/package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch similarity index 100% rename from buildroot/package/vlc/0009-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch rename to buildroot/package/vlc/0008-configure.ac-also-use-AC_PATH_PROG-to-check-for-wayl.patch diff --git a/buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch b/buildroot/package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch similarity index 100% rename from buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch rename to buildroot/package/vlc/0009-modules-video_filter-opencv_example.cpp-fix-build-wi.patch diff --git a/buildroot/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch b/buildroot/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch new file mode 100644 index 000000000..5f046648d --- /dev/null +++ b/buildroot/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch @@ -0,0 +1,36 @@ +From eba390d13ec4089cd6b9d8687ab3f8905b9d3ac8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 22 May 2021 22:56:04 +0200 +Subject: [PATCH] modules/access/live555.cpp: fix build with live555 >= + 2020.12.11 + +Since live555-2020.12.11, connectionEndpointAddress() member function +use a "struct sockaddr_storage" in preparation for eventual support of +IPv6: http://www.live555.com/liveMedia/public/changelog.txt + +Fixes: + - http://autobuild.buildroot.org/results/83170984f96238756c45bf1f4e542363afafd45f + +Signed-off-by: Fabrice Fontaine +--- + modules/access/live555.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp +index 9d6e01ae32..32a6c294eb 100644 +--- a/modules/access/live555.cpp ++++ b/modules/access/live555.cpp +@@ -850,7 +850,9 @@ static int SessionsSetup( demux_t *p_demux ) + if( !p_sys->b_multicast ) + { + /* We need different rollover behaviour for multicast */ +- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); ++ struct sockaddr_storage tempAddr; ++ sub->getConnectionEndpointAddress( tempAddr ); ++ p_sys->b_multicast = IsMulticastAddress( tempAddr ); + } + + tk = (live_track_t*)malloc( sizeof( live_track_t ) ); +-- +2.30.2 + diff --git a/buildroot/package/vlc/Config.in b/buildroot/package/vlc/Config.in index 96ff8f2fc..964b7660a 100644 --- a/buildroot/package/vlc/Config.in +++ b/buildroot/package/vlc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_VLC bool "vlc" + depends on !BR2_RISCV_32 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS @@ -23,6 +24,7 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, gcc >= 4.9, headers >= 3.7" + depends on !BR2_RISCV_32 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ diff --git a/buildroot/package/vlc/vlc.hash b/buildroot/package/vlc/vlc.hash index f404cbf33..396c3a2ab 100644 --- a/buildroot/package/vlc/vlc.hash +++ b/buildroot/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.12/vlc-3.0.12.tar.xz.sha256 -sha256 eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879 vlc-3.0.12.tar.xz -# From https://get.videolan.org/vlc/3.0.12/vlc-3.0.12.tar.xz.sha1 -sha1 39ef414a07202ec6569acda4c5d91e8576d453bf vlc-3.0.12.tar.xz +# From https://get.videolan.org/vlc/3.0.14/vlc-3.0.14.tar.xz.sha256 +sha256 49b93e5b33deaa37060e6b24a98200cad70c407947f14eb2a8b6a0c64d8535a6 vlc-3.0.14.tar.xz +# From https://get.videolan.org/vlc/3.0.14/vlc-3.0.14.tar.xz.sha1 +sha1 8a8613f16a9053668d7a7dcfa1e6d8be93af3e89 vlc-3.0.14.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index 020c37aa5..c1e190099 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.12 +VLC_VERSION = 3.0.14 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/buildroot/package/waylandpp/Config.in b/buildroot/package/waylandpp/Config.in index 3d7362b3c..86ca96505 100644 --- a/buildroot/package/waylandpp/Config.in +++ b/buildroot/package/waylandpp/Config.in @@ -3,14 +3,16 @@ config BR2_PACKAGE_WAYLANDPP depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_WAYLAND help Wayland C++ bindings https://github.com/NilsBrause/waylandpp -comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9" +comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support" depends on BR2_PACKAGE_WAYLAND depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/webkitgtk/Config.in b/buildroot/package/webkitgtk/Config.in index 4ea931fde..2ba8d4766 100644 --- a/buildroot/package/webkitgtk/Config.in +++ b/buildroot/package/webkitgtk/Config.in @@ -98,8 +98,11 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX select BR2_PACKAGE_GST1_LIBAV help This option pulls in all of the required dependencies diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 1720ffc7d..f1c056049 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -18,6 +18,7 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ + -DENABLE_GAMEPAD=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=OFF \ -DENABLE_INTROSPECTION=OFF \ diff --git a/buildroot/package/weston/weston.mk b/buildroot/package/weston/weston.mk index f59963bf2..8afe4bbab 100644 --- a/buildroot/package/weston/weston.mk +++ b/buildroot/package/weston/weston.mk @@ -9,6 +9,7 @@ WESTON_SITE = https://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING +WESTON_CPE_ID_VENDOR = wayland WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng jpeg udev cairo libinput libdrm diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index 71703a2a8..57290b906 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.4.txt -sha1 fa5c553596dcc6a59735f96a9a0845e3c40abab2 wireshark-3.4.4.tar.xz -sha256 729cd11e9715c600e5ad74ca472bacf8af32c20902192d5f2b271268511d4d29 wireshark-3.4.4.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.5.txt +sha1 d01a9b5f58206fb458fe9fc2dac88ad0ea7152ce wireshark-3.4.5.tar.xz +sha256 de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333 wireshark-3.4.5.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index 8cdc7305d..3d656cf34 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.4 +WIRESHARK_VERSION = 3.4.5 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/buildroot/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch b/buildroot/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch new file mode 100644 index 000000000..e52dbdb69 --- /dev/null +++ b/buildroot/package/wpa_supplicant/0003-Include-stdbool.h-to-allow-C99-bool-to-be-used.patch @@ -0,0 +1,32 @@ +From 99cf89555313056d3a8fa54b21d02dc880b363e1 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Mon, 20 Apr 2020 20:29:31 +0300 +Subject: [PATCH] Include stdbool.h to allow C99 bool to be used + +We have practically started requiring some C99 features, so might as +well finally go ahead and bring in the C99 bool as well. + +Signed-off-by: Jouni Malinen +[geomatsi@gmail.com: backport from upstream] +Signed-off-by: Sergey Matyukevich +[yann.morin.1998@free.fr: keep upstream sha1 in header, drop numbering] +Signed-off-by: Yann E. MORIN +--- + src/utils/includes.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils/includes.h b/src/utils/includes.h +index 75513fc8c..741fc9c14 100644 +--- a/src/utils/includes.h ++++ b/src/utils/includes.h +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.25.1 + diff --git a/buildroot/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch b/buildroot/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch new file mode 100644 index 000000000..a5415e7da --- /dev/null +++ b/buildroot/package/wpa_supplicant/0004-ASN.1-Add-helper-functions-for-recognizing-tag-value.patch @@ -0,0 +1,37 @@ +From 9a990e8c4eb92dd64e0ec483599820e45c35ac23 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 23:14:23 +0200 +Subject: [PATCH] ASN.1: Add helper functions for recognizing tag values + +Signed-off-by: Jouni Malinen +[geomatsi@gmail.com: backport asn1_is_null() from upstream 9a990e8c4eb9] +Signed-off-by: Sergey Matyukevich +[yann.morin.1998@free.fr: + - reformat, keep the upstream sha1 and title, + - drop numbering +] +Signed-off-by: Yann E. MORIN +--- + src/tls/asn1.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 102 insertions(+) + +diff --git a/src/tls/asn1.h b/src/tls/asn1.h +index de3430adb..a4d1be473 100644 +--- a/src/tls/asn1.h ++++ b/src/tls/asn1.h +@@ -66,6 +66,12 @@ struct wpabuf * asn1_build_alg_id(const struct asn1_oid *oid, + unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); + int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); + ++static inline bool asn1_is_null(const struct asn1_hdr *hdr) ++{ ++ return hdr->class == ASN1_CLASS_UNIVERSAL && ++ hdr->tag == ASN1_TAG_NULL; ++} ++ + extern struct asn1_oid asn1_sha1_oid; + extern struct asn1_oid asn1_sha256_oid; + +-- +2.25.1 + diff --git a/buildroot/package/wpewebkit/Config.in b/buildroot/package/wpewebkit/Config.in index 640f7c701..c8c66e845 100644 --- a/buildroot/package/wpewebkit/Config.in +++ b/buildroot/package/wpewebkit/Config.in @@ -95,6 +95,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP diff --git a/buildroot/package/x11r7/libxcb/libxcb.mk b/buildroot/package/x11r7/libxcb/libxcb.mk index 9a35a7299..4cbd9cf62 100644 --- a/buildroot/package/x11r7/libxcb/libxcb.mk +++ b/buildroot/package/x11r7/libxcb/libxcb.mk @@ -9,6 +9,7 @@ LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.xz LIBXCB_SITE = http://xcb.freedesktop.org/dist LIBXCB_LICENSE = MIT LIBXCB_LICENSE_FILES = COPYING +LIBXCB_CPE_ID_VENDOR = x LIBXCB_INSTALL_STAGING = YES diff --git a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk index 9cc93e0fe..9d9aecb74 100644 --- a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -9,6 +9,8 @@ XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFS_LICENSE = MIT XLIB_LIBFS_LICENSE_FILES = COPYING +XLIB_LIBFS_CPE_ID_VENDOR = x +XLIB_LIBFS_CPE_ID_PRODUCT = libfs XLIB_LIBFS_INSTALL_STAGING = YES XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk b/buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk index 0b1f8ade1..2b56aaab9 100644 --- a/buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/buildroot/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -9,6 +9,8 @@ XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 XLIB_LIBICE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBICE_LICENSE = MIT XLIB_LIBICE_LICENSE_FILES = COPYING +XLIB_LIBICE_CPE_ID_VENDOR = freedesktop +XLIB_LIBICE_CPE_ID_PRODUCT = libice XLIB_LIBICE_INSTALL_STAGING = YES XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf diff --git a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash index 5b1162f4c..b87b2498e 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-November/003065.html -sha256 36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54 libX11-1.7.0.tar.bz2 -sha512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb libX11-1.7.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-May/003089.html +sha256 e64e43deaa562cbfb0d5ada64670ec09c6fac7935262dcd77bbc6d984a535d47 libX11-1.7.1.tar.bz2 +sha512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d libX11-1.7.1.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 8fefbc492..39d9dc2cc 100644 --- a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.0 +XLIB_LIBX11_VERSION = 1.7.1 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 9bbd460c9..79d990401 100644 --- a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -10,6 +10,8 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT XLIB_LIBXCURSOR_LICENSE_FILES = COPYING XLIB_LIBXCURSOR_INSTALL_STAGING = YES +XLIB_LIBXCURSOR_CPE_ID_VENDOR = x +XLIB_LIBXCURSOR_CPE_ID_PRODUCT = libxcursor XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xorgproto HOST_XLIB_LIBXCURSOR_DEPENDENCIES = \ host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender \ diff --git a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 1182903e8..51db9908e 100644 --- a/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/buildroot/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -9,6 +9,8 @@ XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING +XLIB_LIBXDMCP_CPE_ID_VENDOR = x.org +XLIB_LIBXDMCP_CPE_ID_PRODUCT = libxdmcp XLIB_LIBXDMCP_INSTALL_STAGING = YES XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xorgproto host-pkgconf HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xorgproto host-pkgconf diff --git a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk index c63a3b23c..6002e59e0 100644 --- a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -9,6 +9,8 @@ XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXEXT_LICENSE = MIT XLIB_LIBXEXT_LICENSE_FILES = COPYING +XLIB_LIBXEXT_CPE_ID_VENDOR = x +XLIB_LIBXEXT_CPE_ID_PRODUCT = libxext XLIB_LIBXEXT_INSTALL_STAGING = YES XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xorgproto XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index f563ba34e..6674cccb6 100644 --- a/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -9,6 +9,8 @@ XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFIXES_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING +XLIB_LIBXFIXES_CPE_ID_VENDOR = x +XLIB_LIBXFIXES_CPE_ID_PRODUCT = libxfixes XLIB_LIBXFIXES_INSTALL_STAGING = YES XLIB_LIBXFIXES_DEPENDENCIES = xlib_libX11 xorgproto HOST_XLIB_LIBXFIXES_DEPENDENCIES = \ diff --git a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index 611b8af54..d2ff4ca7f 100644 --- a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -9,6 +9,8 @@ XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING +XLIB_LIBXFONT2_CPE_ID_VENDOR = x +XLIB_LIBXFONT2_CPE_ID_PRODUCT = libxfont XLIB_LIBXFONT2_INSTALL_STAGING = YES # 0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch XLIB_LIBXFONT2_AUTORECONF = YES diff --git a/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index 405faefa4..48e32d55e 100644 --- a/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/buildroot/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -9,6 +9,8 @@ XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT XLIB_LIBXINERAMA_LICENSE_FILES = COPYING +XLIB_LIBXINERAMA_CPE_ID_VENDOR = x +XLIB_LIBXINERAMA_CPE_ID_PRODUCT = libxinerama XLIB_LIBXINERAMA_INSTALL_STAGING = YES XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 455fb10bf..7b645dc9e 100644 --- a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,6 +9,8 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT +XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ diff --git a/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk index 72f2ec442..73c72f860 100644 --- a/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk +++ b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk @@ -9,6 +9,8 @@ XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRES_LICENSE = MIT XLIB_LIBXRES_LICENSE_FILES = COPYING +XLIB_LIBXRES_CPE_ID_VENDOR = x +XLIB_LIBXRES_CPE_ID_PRODUCT = libxres XLIB_LIBXRES_INSTALL_STAGING = YES XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk index 289cb5ac5..9530262cf 100644 --- a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -10,6 +10,8 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_LICENSE = MIT XLIB_LIBXT_LICENSE_FILES = COPYING XLIB_LIBXT_INSTALL_STAGING = YES +XLIB_LIBXT_CPE_ID_VENDOR = x +XLIB_LIBXT_CPE_ID_PRODUCT = libxt XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xorgproto xcb-proto libxcb host-xorgproto XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk index e0d7e8217..c79301e06 100644 --- a/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -10,6 +10,8 @@ XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXTST_LICENSE = MIT XLIB_LIBXTST_LICENSE_FILES = COPYING XLIB_LIBXTST_INSTALL_STAGING = YES +XLIB_LIBXTST_CPE_ID_VENDOR = x +XLIB_LIBXTST_CPE_ID_PRODUCT = libxtst XLIB_LIBXTST_DEPENDENCIES = \ xlib_libX11 \ diff --git a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index 62fe06c1a..a5173fbc7 100644 --- a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -9,6 +9,8 @@ XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING +XLIB_LIBXXF86DGA_CPE_ID_VENDOR = x +XLIB_LIBXXF86DGA_CPE_ID_PRODUCT = libxxf86dga XLIB_LIBXXF86DGA_INSTALL_STAGING = YES XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 2106451c7..8871bd507 100644 --- a/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -9,6 +9,8 @@ XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86VM_LICENSE = MIT XLIB_LIBXXF86VM_LICENSE_FILES = COPYING +XLIB_LIBXXF86VM_CPE_ID_VENDOR = x +XLIB_LIBXXF86VM_CPE_ID_PRODUCT = libxxf86vm XLIB_LIBXXF86VM_INSTALL_STAGING = YES XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk index c67593e9a..429595b5d 100644 --- a/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk +++ b/buildroot/package/x11r7/xlib_libdmx/xlib_libdmx.mk @@ -9,6 +9,8 @@ XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBDMX_LICENSE = MIT XLIB_LIBDMX_LICENSE_FILES = COPYING +XLIB_LIBDMX_CPE_ID_VENDOR = x +XLIB_LIBDMX_CPE_ID_PRODUCT = libdmx XLIB_LIBDMX_INSTALL_STAGING = YES XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull diff --git a/buildroot/package/xterm/xterm.hash b/buildroot/package/xterm/xterm.hash index 588b7fca5..d6d80ad97 100644 --- a/buildroot/package/xterm/xterm.hash +++ b/buildroot/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e xterm-366.tgz +sha256 27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f xterm-367.tgz # Locally calculated sha256 dfb668cc977e24649500f3cc54de3e2b793928d210715a445ab1227930b07ba6 COPYING diff --git a/buildroot/package/xterm/xterm.mk b/buildroot/package/xterm/xterm.mk index 6f142a0b5..e09d350a7 100644 --- a/buildroot/package/xterm/xterm.mk +++ b/buildroot/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 366 +XTERM_VERSION = 367 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index 3c1f55033..303e266c6 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.2' +RELEASE='2021.02.3' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats index 6f3ddc561..44ed44482 100755 --- a/buildroot/support/scripts/pkg-stats +++ b/buildroot/support/scripts/pkg-stats @@ -375,9 +375,9 @@ def package_init_make_info(): variable_list = [x[5:] for x in variable_list if x.startswith("HOST_")] + \ [x for x in variable_list if not x.startswith("HOST_")] - for l in variable_list: + for item in variable_list: # Get variable name and value - pkgvar, value = l.split("=") + pkgvar, value = item.split("=") # Strip the suffix according to the variable if pkgvar.endswith("_LICENSE"): diff --git a/buildroot/support/testing/conf/docker-compose.yml b/buildroot/support/testing/conf/docker-compose.yml index 49ff2677d..ce89d79b5 100644 --- a/buildroot/support/testing/conf/docker-compose.yml +++ b/buildroot/support/testing/conf/docker-compose.yml @@ -2,3 +2,8 @@ version: '3' services: busybox: image: "busybox:latest" + command: httpd -f -h /www/ + ports: + - "80:80" + volumes: + - "/bin:/www" diff --git a/buildroot/support/testing/tests/package/test_docker_compose.py b/buildroot/support/testing/tests/package/test_docker_compose.py index 67ee795f2..737dbf393 100644 --- a/buildroot/support/testing/tests/package/test_docker_compose.py +++ b/buildroot/support/testing/tests/package/test_docker_compose.py @@ -37,13 +37,16 @@ class TestDockerCompose(infra.basetest.BRTest): def docker_test(self): # will download container if not available, which may take some time - _, exit_code = self.emulator.run('docker run --rm busybox:latest /bin/true', 120) + _, exit_code = self.emulator.run('docker run --rm -p 8888:8888 busybox:latest /bin/true', 120) self.assertEqual(exit_code, 0) def docker_compose_test(self): # will download container if not available, which may take some time - _, exit_code = self.emulator.run('docker-compose up', 120) - self.assertEqual(exit_code, 0) + self.assertRunOk('docker-compose up -d', 120) + # container may take some time to start + self.assertRunOk('while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done', 120) + self.assertRunOk('wget -O /tmp/busybox http://127.0.0.1/busybox', 120) + self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage")