diff --git a/.checkpackageignore b/.checkpackageignore index 4faa3a8b8f88..093422b83b77 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -61,7 +61,6 @@ package/gamin/0002-no-const-return.patch Sob package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob package/genromfs/0001-build-system.patch Sob package/gerbera/S99gerbera Indent -package/google-breakpad/gen-syms.sh Shellcheck package/gpsd/S50gpsd Indent Shellcheck Variables package/haveged/S21haveged Shellcheck Variables package/htpdate/S43htpdate Shellcheck @@ -93,7 +92,6 @@ package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob package/libiio/S99iiod Shellcheck Variables package/libmad/0001-mips-h-constraint-removal.patch Sob package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables -package/linux-tools/S10hyperv Variables package/linuxptp/S65ptp4l Indent Shellcheck package/linuxptp/S66phc2sys Indent Shellcheck package/lirc-tools/S25lircd Indent Variables @@ -141,7 +139,6 @@ package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/pigpio/S50pigpio Shellcheck Variables package/pkgconf/pkg-config.in Shellcheck -package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob package/postgresql/S50postgresql Variables package/procps-ng/S02sysctl Variables package/proftpd/S50proftpd Indent Shellcheck Variables diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed17bb14b9a4..3d7719568f06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,11 @@ stages: generate-gitlab-ci-yml: stage: generate-gitlab-ci script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always paths: diff --git a/CHANGES b/CHANGES index a03a4876b8a0..3958a8b27c44 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,342 @@ +2023.02.11, released March 26th, 2024 + + Important / security related fixes. + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. + + Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav, + cvs, dash, dnsmasq, ell, exim, expat, freetype, ghostscript, + gnupg2, google-breakpad, gst1-python, gst1-vaapi, iwd, + libcoap, libcurl, libgit2, libkrb5, libmodsecurity, libunwind, + libuv, libxml2, lua-http, luvi, nginx-naxsi, nodejs, openssh, + openvmtools, parted, php, poco, postgresql, privoxy, + pure-ftpd, putty, python-cheroot, python-configshell-fb, + python-django, python-rtslib-fb, python3, rsync, sdl2, shim, + spice, squid, strace, strongswan, sudo, systemd, targetcli-fb, + unbound, uvw, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + +2023.02.10, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, + containerd, crda, darkhttpd, davinci-bootcount, dbus, + domoticz, environment-setup, expat, faad2, falcosecurity-libs, + flex, freeradius-server, freerdp, frr, gesftpserver, glibc, + gnutls, go, gst1-devtools, gst1-libav, gst1-python, + gst1-vaapi, gst-omx, gstreamer1, haproxy, joe, json-c, + leptonica, libcurl, libuwsc, libvips, linux-firmware, + linux-headers, localedef, lua-http, lvm2, lynx, mbedtls, + micropython, minizip, mpfr, netatalk, ngrep, opencv4, + opencv4-contrib, openssh, opus, php, python-aiohttp, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, qt5base, qt6base, redis, + runc, sdl2, sqlite, sysstat, uuu, webkitgtk, wireless-regdb, + wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + +2023.02.9, released January 15th, 2024 + + Important / security related fixes. + + Infrastructure: + + - Download: Revert a permission fixup step in the tarball + creation logic, which lead to a hash mismatch issue in two + cargo-vendored packages, ripgrep and sentry-cli. + + - Build: Pass GIT_DIR=. in the environment (through + HOST_MAKE_ENV/TARGET_MAKE_ENV) to the build steps to + workaround packages trying to detect if they are building in + a git checkout and getting confused when building in a sub + directory of a Buildroot git checkout. + + Updated/fixed packages: apcupsd, arm-trusted-firmware, botan, + cjson, cups, dropbear, duktape, edk2, exim, faad2, freeswitch, + gcc, gdal, gdb, giflib, glibc, go, google-breakpad, gst-omx, + gstd, gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, ipcalc, jq, json-for-modern-cpp, + ksmbd-tools, libaio, libcamera, libcap-ng, libcurl, libebml, + libgtk3, libiec61850, libraw, libsigsegv, libssh, libssh2, + libuev, libwebsockets, liquid-dsp, lvm2, madplay, mesa3d, + micropython, mp4v2, opensc, openssh, orc, php, pipewire, + postgis, postgresql, proftpd, putty, python-sip, + python-werkzeug, rng-tools, shim, squid, strongswan, sway, + tinyssh, tor, tree, uftp, valijson, wireshark, wolfssl, + xserver_xorg-server, xwayland + +2023.02.8, released December 4th, 2023 + + Important / security related fixes. + + Defconfigs: Raspberrypi: Fix DT overlay for autoproving of + bluetooth driver, Toradex apalis i.mx6: Add download hashes + for Linux and U-Boot. + + Updated/fixed packages: exfatprogs, gcc, imagemagick, + intel-microcode, libpjsip, libxml2, mariadb, memcached, + motion, netsnmp, perl, postgresql, rtty, samba4, speech, + squid, vim, vlc, xenomai, xtables-addons, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + +2023.02.7, released November 14th, 2023 + + Important / security related fixes. + + Per-package builds: Unbreak SDK relocation logic. Only drop + the hard links for the final host / target directory, fixing a + build time / size regression in 2023.02.6. + + Packages where a free-form version/site can be specified + (E.G. Linux, U-Boot, ..) can now have the corresponding + tarballs of these custom downloads checked by the download + infrastructure based on .hash files in the global patch + directory. These hashes are optional unless + BR2_DOWNLOAD_FORCE_CHECK_HASHES is enabled. + + A utils/add-custom-hashes helper script has been added to + assist in managing such hash files. + + Defconfigs: stm32mp157a-dk1, stm32mp157c-dk2: Unbreak TF-A + build, stm32mp157c-odessey: Use a fixed TF-A version for + reproducibility + + Updated/fixed packages: apache, arm-trusted-firmware, aufs, + aufs-util, azure-iot-sdk, cjson, cups-filters, clamav, dhcpcd, + freeradius-server, go, htop, ksmbd-tools, kvmtool, libgdiplus, + libopenssl, libosmium, libtommath, libupnp, libzlib, lxc, + mender, minizip-zlib, mpd, mxsldr, nano, nettle, + network-manager, nghttp2, nodejs, opencv4, opencv4-contrib, + openjdk-bin, openvpn, opusfile, paho-mqtt-c, + perl-lwp-protocol-https, php, python-django, python-urllib3, + python-web2py, rabbitmq-c, redis, riscv64-elf-toolchain, + suricata, tar, tiff, tor, traceroute, vim, websocketpp, + wireshark, wolfssl, xdg-dbus-proxy, xen, xlib_libX11, + xlib_libXpm, zabbix, zchunk + + Issues resolved (http://bugs.uclibc.org): + + #14741: e2fsck is failing during cronjob build where fail... + #15772: lz4 failed to compile with gcc 10.4.0 + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + #15820: make linux-menuconfig does not modify correct .config.. + #15823: Installing nodejs modules with native extensions ... + #15835: Incompatibility between network-manager and libcurl 8.4 + +2023.02.6, released October 16th, 2023 + + Important / security related fixes. + + Per-package builds: Do not use hard links for host / target + dirs, fixing issues with package rebuilds or post-build + scripts modifications. + + Infrastructure: Explicitly disable shuffle mode for Make >= + 4.4 where needed. + + Urandom-scripts: Move seedrng init script to S01 for earlier + random number entrophy initialization. + + Go: Bump to 1.20.x as 1.19.x is now EOL and affected by + security issues. + + Updated/fixed packages: at91bootstrap, bind, cups, efl, + enlightenment, exim, gcc, glibc, gnu-efi, go, go-bootstrap, + gptfdisk, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rstp-server, + gst1-rtsp-vaapi, gstreamer1, gstreamer1-editing-services, + libcue, libcurl, libfastjson, libhtp, libmodplug, librsvg, + libvpx, libyang, linux-tools, mbedtls, mosquitto, mutt, neon, + netsnmp, nmap, nodejs, olsr, openblas, opkg-utils, php, + powertop, python-mako, python3, rockchip-mali, samba4, sslh, + suricata, tar, unifdef, unrandom-scripts, webkitgtk, + wireless-regdb, wpewebkit + + Issues resolved (http://bugs.uclibc.org): + + #15628: Missing dependencies in BR2_PACKAGE_PYTHON_MAKO + #15808: connman is not supported on musl + #15814: C++ not supported by bootlin toolchain + +2023.02.5, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cups, dav1d, diffutils, dracut, dt, + expect, fail2ban, fio, flite, freerdp, freeswitch, fstrcmp, + gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, libcoap, + libcurl, libiec61850, libjxl, libks, libksba, libmodsecurity, + libpjsip, libqb, libraw, libssh, libtommath, less, lldpd, + log4cxx, lsof, mdadm, mosquitto, mpd, mutt, mv-ddr-marvell, + ne10, netatalk, network-manager, nftables, nodejs, ntpsec, + nut, openblas, openjdk, openjdk-bin, opensc, openssh, + pcm-tools, perftest, php, pixman, poppler, postgresql, pppd, + python-django, python-ipython, python-pip, python-pylibfdt, + python-tornado, python3, qt5, ramspeed, rtl8189fs, samba4, + screen, screenfetch, sngrep, sofia-sip, stellarium, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15754: The docker-engine and docker-cli versions are not... + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + +2023.02.4, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as having no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone qt5: Enable support for green wireless + variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, dmidecode, ffmpeg, freescale-imx, + gcc, gdb, ghostscript, gkrellm, gnuradio, go, heimdall, + iperf3, libcurl, libmodsecurity, libopenssl, libssh, + libubootenv, libuhttpd, linux-tools, ntp, openssh, php, + pipewire, python-iniparse, python-iptables, python-pysmb, + rtl8189fs, sam-ba, samba4, seatd, speex, supertuxkart, sysdig, + tor, tpm2-tss, uboot, unzip, webkitgtk, wireless-regdb, + wolfssl, wpebackend-fdo wpewebkit, xenomai, yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + +2023.02.3, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard: fix build on hosts without openssl + development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, bind, + busybox, dbus, c-ares, check, dav1d, fluidsynth, fftw, fwts, + ghostscript, gnupg2, gnuradio, gupnp, haproxy, heimdal, + hwdata, jhead, libcap, libgcrypt, libgpg-error, libgtk3, + libxslt, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-pyicu, python-requests, python3, qt6, quickjs, + sconeserver, taglib, tiff, wireshark, xdriver_xf86-video-dummy + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + +2023.02.2, released June 16th, 2023 + + Important / security related fixes. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + utils/docker-run: Now correctly handles git + workdirs/worktrees. + + Defconfigs: QEMU s390x: Bump rootfs size to make room for + kernel modules, Stm32f4xx: Tweak config to save RAM, Xilinx + Versal vck190: Use correct (A72) CPU variant + + Updated/fixed packages: atkmm, bird, busybox, cairomm1_14, + cmake, containerd, crudini, cups, delve, docker-cli, + docker-engine, earlyoom, edid-decode, fluent-bit, freeswitch, + gcc, gdb, glibmm_2_66, gnupg2, go, gptfdisk, graphicsmagick, + intel-microcode, libass, libcurl, libdeflate, libgeos, + libgtk3, libjxl, libnftl, libopenssl, libressl, libssh, llvm, + lua, mesa3d, micropython, minidlna, moby-buildkit, mpd, mupdf, + ncurses, nftables, openjdk, openjdk-bin, php, postgresql, + python-can, python-django, python-django, python-ipython, + python-matplotlib, python-mupdf, python-requests, python3, + qemu, redis, rpm, runc, sdl2_mixer, tzdata, uclibc, vdr, + wilc-firmware, xapp_xcalc, xapp_xdpyinfo, xapp_xinput, + xapp_xwininfo, xdata_xbitmaps, xdata_xcursor-themes, + xdriver_xf86-input-mouse, xdriver_xf86-video-ark, + xdriver_xf86-video-geode, xdriver_xf86-video-neomagic, + xfont_encodings, xlib_libX11, xlib_libXaw, xlib_libXi, + xlib_libXfixes, xlib_libXft, xlib_libXpm, zfs, znc + + New packages: perl-clone, perl-http-message, python-asttokens, + python-executing, python-pure-eval, python-stack-data + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source code + +2023.02.1, released May 9th, 2023 + + Important / security related fixes. + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + Defconfigs: Olimex a20 olinuxino lime*: Bring up network at + boot, stmf469 disco sd: Lock U-Boot version + + Updated/fixed packages: agentpp, apache, bluez5_utils, + ca-certificates, containerd, coremark, dcron, dnsmasq, + docker-cli, docker-engine, efivar, eudev, ffmpeg, flann, + fluidsynth, git, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, intel-microcode, + kexec, libcurl, libite, libgtk3, libmicrohttpd, libxml2, + linux-tools, lua, mali-driver, matio, mdadm, nginx, openocd, + openssh, php, poppler, postgresql, python-web2py, qt6base, + readline, rtl8189fs, rtl8723ds, rtl8812au-aircrack-ng, runc, + rust, rust-bin, s390-tools, samba4, sdl2, snmppp, sudo, + systemd, tcpdump, uclibc, vim, webkitgtk, wireshark, + wpewebkit, xr819-radio, xserver_xorg-server, zeek + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15306: glibc build fails in Docker container + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + 2023.02, released March 12th, 2023 Fixes all over the tree. diff --git a/Config.in b/Config.in index 0d7641633c37..c814416d9ae5 100644 --- a/Config.in +++ b/Config.in @@ -65,7 +65,7 @@ config BR2_NEEDS_HOST_JAVA # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external -# toolchains, binary tools like SAM-BA, etc.). +# toolchains, binary tools, etc.). config BR2_HOSTARCH_NEEDS_IA32_LIBS bool @@ -241,7 +241,7 @@ if !BR2_PRIMARY_SITE_ONLY config BR2_BACKUP_SITE string "Backup download site" - default "http://sources.buildroot.net" + default "https://sources.buildroot.net" help Backup site to download from. If this option is set then buildroot will fall back to download package sources from here @@ -579,7 +579,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_GOOGLE_BREAKPAD @@ -664,12 +664,12 @@ config BR2_PACKAGE_OVERRIDE_FILE documentation for more details on this feature. config BR2_GLOBAL_PATCH_DIR - string "global patch directories" + string "global patch and hash directories" help You may specify a space separated list of one or more - directories containing global package patches. For a specific - version of a specific package , - patches are applied as follows: + directories containing global package patches and/or hashes. + For a specific version of a specific package + , patches are looked up as follows: First, the default Buildroot patch set for the package is applied from the package's directory in Buildroot. @@ -683,6 +683,8 @@ config BR2_GLOBAL_PATCH_DIR exists, then all *.patch files in the directory will be applied. + The hash files are looked up similarly to the patches. + menu "Advanced" config BR2_FORCE_HOST_BUILD @@ -697,6 +699,21 @@ config BR2_FORCE_HOST_BUILD This option will increase build time. +config BR2_DOWNLOAD_FORCE_CHECK_HASHES + bool "Force all downloads to have a valid hash" + help + Say 'y' here to enforce downloads to have at least one valid + hash (and of course, that all hashes be valid). + + By default, Buildroot checks hashes of all packages + downloaded, except those for which a custom version is + used. + + With this option turned on, Buildroot will check hashes of + all packages, including those that use a custom version. In + order to provide hashes for such packages, place additional + hash files in BR2_GLOBAL_PATCH_DIR directories. + config BR2_REPRODUCIBLE bool "Make the build reproducible (experimental)" # SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4 diff --git a/Config.in.legacy b/Config.in.legacy index a31543d5fa1d..10101d97b059 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_STRONGSWAN_SCEP + bool "strongswan SCEP client tool removed" + select BR2_LEGACY + help + "ipsec scepclient" tool has been removed and replaced by the + pki subcommands "pki --scep" and "pki --scepca" which + implement the new SCEP RFC 8894 standard that was released in + September 2020 and which supports trusted "certificate + renewal" based on the existing client certificate. + config BR2_PACKAGE_PUGIXML_HEADER_ONLY bool "pugixml header-only removed" select BR2_LEGACY @@ -325,6 +335,12 @@ config BR2_PACKAGE_USBREDIR_SERVER comment "Legacy options removed in 2022.11" +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.x has been removed" + select BR2_LEGACY + help + binutils 2.36 has been removed, use a newer version. + config BR2_PACKAGE_RABBITMQ_SERVER bool "rabbitmq-server removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 9ef47a60c872..364d16ed90ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -311,7 +311,7 @@ F: package/taskd/ N: Benjamin Kamath F: package/lapack/ -N: Bernd Kuhls +N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ @@ -321,19 +321,20 @@ F: package/apr-util/ F: package/bcg729/ F: package/bento4/ F: package/bitcoin/ -F: package/bluez-tools/ -F: package/boinc/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/ethtool/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ F: package/flac/ +F: package/flatbuffers/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ F: package/freetype/ @@ -341,13 +342,10 @@ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ F: package/gkrellm/ -F: package/gli/ -F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ -F: package/hdparm/ F: package/hddtemp/ -F: package/inih/ +F: package/hdparm/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ @@ -355,6 +353,7 @@ F: package/intel-microcode/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ +F: package/lcms2/ F: package/leafnode2/ F: package/libaacs/ F: package/libasplib/ @@ -362,6 +361,7 @@ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ F: package/libbroadvoice/ +F: package/libcap/ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ @@ -374,6 +374,7 @@ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ F: package/libfreeglut/ +F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ F: package/libglfw/ @@ -396,21 +397,27 @@ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ F: package/libsoundtouch/ -F: package/libsquish/ F: package/libudfread/ F: package/libunibreak/ F: package/liburiparser/ F: package/libutp/ +F: package/libuv/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ F: package/libvpx/ F: package/libyuv/ +F: package/linux-firmware/ +F: package/mc/ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ +F: package/mpg123/ +F: package/ntp/ F: package/nut/ +F: package/opus/ +F: package/pciutils/ F: package/perl-crypt-openssl-guess/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ @@ -429,33 +436,34 @@ F: package/perl-io-html/ F: package/perl-lwp-mediatypes/ F: package/perl-mail-dkim/ F: package/perl-mailtools/ +F: package/perl-netaddr-ip/ F: package/perl-net-dns/ F: package/perl-net-http/ -F: package/perl-netaddr-ip/ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ F: package/php/ -F: package/pixman/ F: package/pngquant/ -F: package/pound/ +F: package/pppd/ +F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ F: package/python-glslang/ +F: package/python-mako/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ -F: package/python-mako/ F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ +F: package/rrdtool/ F: package/rsync/ F: package/rtmpdump/ F: package/samba4/ -F: package/softether/ +F: package/sofia-sip/ F: package/spandsp/ F: package/sqlite/ F: package/stellarium/ @@ -465,13 +473,10 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ -F: package/utf8proc/ -F: package/vdr/ -F: package/vdr-plugin-vnsiserver/ F: package/vlc/ -F: package/vnstat/ -F: package/waylandpp/ -F: package/x11r7/ +F: package/wget/ +F: package/wireless-regdb/ +F: package/wireless_tools/ F: package/x264/ F: package/x265/ F: package/xmrig/ @@ -538,7 +543,7 @@ F: package/syslog-ng/ N: Christian Kellermann F: package/python-pylibftdi/ -N: Christian Stewart +N: Christian Stewart F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ @@ -552,6 +557,8 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ +F: package/go-bootstrap-stage1/ +F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ @@ -643,7 +650,7 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ -N: Daniel Lang +N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ F: package/cairomm/ @@ -657,12 +664,13 @@ F: package/libsigc2/ F: package/paho-mqtt-cpp/ F: package/pangomm/ F: package/pangomm2_46/ +F: package/sam-ba/ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ -N: Damien Le Moal +N: Damien Le Moal F: package/python-kflash/ F: board/canaan/ F: configs/canaan_kd233_defconfig @@ -860,7 +868,7 @@ F: package/szip/ N: Esben Haabendal F: package/python-kiwisolver/ -N: Etienne Carriere +N: Etienne Carriere F: boot/optee-os/ F: package/optee-benchmark/ F: package/optee-client/ @@ -1613,19 +1621,6 @@ N: José Luis Salvador Rufo F: package/zfs/ F: support/testing/tests/package/test_zfs.py -N: José Pekkarinen -F: package/alfred/ -F: package/avocado/ -F: package/bmx7/ -F: package/opensc/ -F: package/python-aexpect/ -F: package/python-alembic/ -F: package/python-lark/ -F: package/softhsm2/ -F: support/testing/tests/package/sample_python_aexpect.py -F: support/testing/tests/package/test_avocado.py -F: support/testing/tests/package/test_python_aexpect.py - N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ @@ -1707,6 +1702,7 @@ F: package/kexec/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openblas/ F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ @@ -2063,11 +2059,6 @@ F: package/protobuf/ F: package/re2/ F: package/spdlog/ -N: Michael Rommel -F: package/knock/ -F: package/python-crc16/ -F: package/python-pyzmq/ - N: Michael Trimarchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig @@ -2127,12 +2118,11 @@ N: Neal Frager F: board/versal/ F: board/zynq/ F: board/zynqmp/ -F: board/zynqmp/kria/ F: configs/versal_vck190_defconfig F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig -F: configs/zynqmp_kria_kv260_defconfig F: package/bootgen/ F: package/versal-firmware/ @@ -2396,7 +2386,7 @@ F: package/tree/ N: Pieter De Gendt F: package/libvips/ -N: Pieterjan Camerlynck +N: Pieterjan Camerlynck F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ @@ -2578,7 +2568,7 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats @@ -2850,6 +2840,7 @@ F: package/msmtp/ F: package/musl/ F: package/musl-fts/ F: package/ne10/ +F: package/nodejs/ F: package/pkg-python.mk F: package/pkg-autotools.mk F: package/pkg-generic.mk @@ -2995,6 +2986,10 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Woodrow Douglass +F: package/opencv4 +F: package/opencv4-contrib + N: Xuanhao Shi F: boot/ti-k3-r5-loader/ diff --git a/Makefile b/Makefile index 634780b42124..46ca0beba714 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02 +export BR2_VERSION := 2023.02.11 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1678652000 +BR2_VERSION_EPOCH = 1711484000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -596,6 +596,7 @@ prepare-sdk: world @$(call MESSAGE,"Rendering the SDK relocatable") PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging + $(call ppd-fixup-paths,$(BASE_DIR)) $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh mkdir -p $(HOST_DIR)/share/buildroot echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location @@ -712,7 +713,7 @@ STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.t .PHONY: host-finalize host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK) @$(call MESSAGE,"Finalizing host directory") - $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR)) + $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR),copy) .PHONY: staging-finalize staging-finalize: $(STAGING_DIR_SYMLINK) @@ -720,7 +721,7 @@ staging-finalize: $(STAGING_DIR_SYMLINK) .PHONY: target-finalize target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize @$(call MESSAGE,"Finalizing target directory") - $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR)) + $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR),copy) $(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep)) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ @@ -831,7 +832,7 @@ legal-info-clean: .PHONY: legal-info-prepare legal-info-prepare: $(LEGAL_INFO_DIR) @$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info") - @$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST) + @$(call legal-license-file,HOST,buildroot,buildroot,COPYING,COPYING,support/legal-info/buildroot.hash) @$(call legal-manifest,TARGET,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES) @$(call legal-manifest,HOST,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,DEPENDENCIES WITH LICENSES) @$(call legal-manifest,HOST,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved) @@ -1270,4 +1271,7 @@ include docs/manual/manual.mk .PHONY: $(noconfig_targets) +# .WAIT was introduced in make 4.4. For older make, define it as phony. +.PHONY: .WAIT + endif #umask / $(CURDIR) / $(O) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index c770ae3ffe37..56ce1eb0cc0a 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -450,7 +450,6 @@ config BR2_x86_alderlake select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 - select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_rocketlake bool "rocketlake" diff --git a/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/board/bsh/imx8mn-bsh-smm-s2/readme.txt index 37081091e849..6b8cd0319907 100644 --- a/board/bsh/imx8mn-bsh-smm-s2/readme.txt +++ b/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -2,7 +2,7 @@ i.MX8MN BSH SMM S2 ================== This tutorial describes how to use the predefined Buildroot -configuration for the i.MX8MN BSH SMM S2 PRO board. +configuration for the i.MX8MN BSH SMM S2 board. Building -------- diff --git a/board/orangepi/orangepi-lite2/readme.txt b/board/orangepi/orangepi-lite2/readme.txt index bed561b5620d..7f88250418e0 100644 --- a/board/orangepi/orangepi-lite2/readme.txt +++ b/board/orangepi/orangepi-lite2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Lite2. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Lite2 link: -http://www.orangepi.org/Orange%20Pi%20Lite%202/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Lite-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2 diff --git a/board/orangepi/orangepi-one-plus/readme.txt b/board/orangepi/orangepi-one-plus/readme.txt index 87f6de851007..547f87428807 100644 --- a/board/orangepi/orangepi-one-plus/readme.txt +++ b/board/orangepi/orangepi-one-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi One Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi One Plus link: -http://www.orangepi.org/OrangePiOneplus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-One-Plus.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus diff --git a/board/orangepi/orangepi-zero-plus/readme.txt b/board/orangepi/orangepi-zero-plus/readme.txt index 5556eae8907b..1e60e0f825ba 100644 --- a/board/orangepi/orangepi-zero-plus/readme.txt +++ b/board/orangepi/orangepi-zero-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus link: -http://www.orangepi.org/OrangePiZeroPlus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus.html This configuration uses U-Boot mainline and kernel mainline. diff --git a/board/orangepi/orangepi-zero-plus2/readme.txt b/board/orangepi/orangepi-zero-plus2/readme.txt index 322ba0e12ae4..2df6dd9b112a 100644 --- a/board/orangepi/orangepi-zero-plus2/readme.txt +++ b/board/orangepi/orangepi-zero-plus2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus2. With the current configuratio it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus2 link: -http://www.orangepi.org/OrangePiZeroPlus2/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2 diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt index 059f55fbc917..b57c97464a8a 100644 --- a/board/qemu/ppc64le-powernv8/readme.txt +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig +qemu-system-ppc64 -M powernv9 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=output/images/rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig The login prompt will appear in the terminal window. diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index 195bad449e8b..bc59d5fad2ef 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index 195bad449e8b..bc59d5fad2ef 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 34412fa9e82b..667287112573 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -26,7 +26,7 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index ea02d3f07130..74a7b270cdf5 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index 41c7e97e99b2..a4ae327d2a2d 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -26,11 +26,7 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on - -dtoverlay=vc4-kms-v3d-pi4 -dtoverlay=imx219 -#dtoverlay=ov5647 +dtparam=krnbt=on # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 9e6b7f5ccfd7..55095f64a7df 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -26,4 +26,4 @@ gpu_mem_1024=100 dtoverlay=miniuart-bt # enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtoverlay=krnbt=on +dtparam=krnbt=on diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 1fa3f5096fd9..313f85f651cc 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg index acd23e7ca8f5..dad927553751 100644 --- a/board/raspberrypi/genimage-raspberrypi2.cfg +++ b/board/raspberrypi/genimage-raspberrypi2.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 5e5eb7110076..0bd7bc3d1711 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -8,4 +8,12 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab +# systemd doesn't use /etc/inittab, enable getty.tty1.service instead +elif [ -d ${TARGET_DIR}/etc/systemd ]; then + mkdir -p "${TARGET_DIR}/etc/systemd/system/getty.target.wants" + ln -sf /lib/systemd/system/getty@.service \ + "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi + +# ensure overlays exists for genimage +mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index c81fd801aede..21a136eb8326 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -17,8 +17,8 @@ How to build it Configure Buildroot ------------------- -There are two RaspberryPi defconfig files in Buildroot, one for each -major variant, which you should base your work on: +There are several Raspberry Pi defconfig files in Buildroot, one for +each major variant, which you should base your work on: For models A, B, A+ or B+: @@ -133,7 +133,7 @@ How to write to CM4 eMMC memory =============================== For CM4 modules without eMMC memory see above for booting from SD card, -for CM4 moduels with eMMC memory proceed as following: +for CM4 modules with eMMC memory proceed as following: - fit jumper on IO Board header J2 to disable eMMC boot - connect IO Board micro USB port (J11 USB slave) to your host linux system diff --git a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh index e324afe59a98..2ac9c653c327 100755 --- a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh +++ b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh @@ -2,7 +2,3 @@ # Kernel is built without devpts support sed -i '/^devpts/d' ${TARGET_DIR}/etc/fstab - -# Kernel is built without network support -rm -f ${TARGET_DIR}/etc/init.d/S40network -rm -rf ${TARGET_DIR}/etc/network/ diff --git a/board/stmicroelectronics/stm32f429-disco/linux.config b/board/stmicroelectronics/stm32f429-disco/linux.config index 7b5c60f18062..02d9c2d1e094 100644 --- a/board/stmicroelectronics/stm32f429-disco/linux.config +++ b/board/stmicroelectronics/stm32f429-disco/linux.config @@ -95,10 +95,6 @@ CONFIG_STM32_MDMA=y CONFIG_SYNC_FILE=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_IIO_STM32_TIMER_TRIGGER=y # CONFIG_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash b/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash new file mode 120000 index 000000000000..5808d92afe89 --- /dev/null +++ b/board/toradex/apalis-imx6/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/toradex/apalis-imx6/patches/linux/linux.hash b/board/toradex/apalis-imx6/patches/linux/linux.hash new file mode 100644 index 000000000000..1138ec3b9349 --- /dev/null +++ b/board/toradex/apalis-imx6/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9c69a1c283db6ee8042cc6f013a159473f257e71751887312c7dd2902f01bec8 linux-d899927728beca8357a5b4120b690cb3c1d80844-br1.tar.gz diff --git a/board/toradex/apalis-imx6/patches/uboot/uboot.hash b/board/toradex/apalis-imx6/patches/uboot/uboot.hash new file mode 100644 index 000000000000..a81a7d8d4abb --- /dev/null +++ b/board/toradex/apalis-imx6/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9a540b08ccb7e8a0252f86d0bad5d676d0964725a7f2a06d798225c2a3024878 uboot-30a1208727729dae22cb42f9ba9ba17efe5e6f77-br1.tar.gz diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh index ff8f8a60719f..ed08ea2d4979 100755 --- a/board/versal/post-build.sh +++ b/board/versal/post-build.sh @@ -3,9 +3,8 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 92e65ed3b73b..1d9802c34d2a 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -6,12 +6,12 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" -BOARD_NAME=$4 +BOARD_DIR="$(dirname "$0")" +BOARD_NAME="$4" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" @@ -23,7 +23,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf } } image { - id = 0x1c000000, name=apu_subsystem + id = 0x1c000000, name=apu_subsystem { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } @@ -31,5 +31,5 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } __HEADER_EOF -${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on -support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg +"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynq/post-build.sh b/board/zynq/post-build.sh index 9fd8bbf2c8d0..810fe9987945 100755 --- a/board/zynq/post-build.sh +++ b/board/zynq/post-build.sh @@ -3,6 +3,6 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index ac74286cf6d8..192354b5bea4 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -1,15 +1,15 @@ #!/bin/sh -# By default U-Boot loads DTB from a file named "devicetree.dtb", so +# By default U-Boot loads DTB from a file named "system.dtb", so # let's use a symlink with that name that points to the *first* # devicetree listed in the config. FIRST_DT=$(sed -n \ 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e3467f30686c..dc92c51d43ee 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -1,12 +1,16 @@ #!/bin/sh # This is a temporary work around for generating kv260 u-boot.itb. -# The problem is there is no way to currently configure u-boot to apply -# the carrier board dtb overlay during build, so all kv260 carrier board +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kv260 carrier board # drivers are missing. # This will be removed when u-boot can build the kv260 u-boot.itb natively. -UBOOT_DIR=$4 +UBOOT_DIR="$4" -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo -${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh index 0713bd1b05b2..747991e3f1da 100755 --- a/board/zynqmp/post-build.sh +++ b/board/zynqmp/post-build.sh @@ -3,14 +3,13 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" label linux kernel /Image devicetree /system.dtb - append console=${CONSOLE} root=/dev/${ROOT} rw rootwait + append console="${CONSOLE}" root="/dev/${ROOT}" rw rootwait __HEADER_EOF diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index c5de2db82070..f44b66342d4b 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -6,10 +6,10 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1164c8141061..3bee2d42b6a1 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -60,9 +60,11 @@ endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ + BUILD_STRING=$(ARM_TRUSTED_FIRMWARE_VERSION) \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ - TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) \ + HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ @@ -140,18 +142,6 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl -# fiptool only exists in newer (>= 1.3) versions of ATF, so we build -# it conditionally. We need to explicitly build it as it requires -# OpenSSL, and therefore needs to be passed proper variables to find -# the host OpenSSL. -define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL - if test -d $(@D)/tools/fiptool; then \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/fiptool \ - $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDLIBS="$(HOST_LDFLAGS) -lcrypto" ; \ - fi -endef endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) @@ -199,7 +189,6 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH), cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/ ) - $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \ $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) diff --git a/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 000000000000..9e0ea74248b3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 000000000000..9e0ea74248b3 --- /dev/null +++ b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index 1a084756fd2a..385957b5d47f 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -32,8 +32,14 @@ endef AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES endif +# The at91bootstrap Makefile doesn't support customizing +# CFLAGS/LDFLAGS, so we cheat and pass our custom flags through CC and +# LD. define AT91BOOTSTRAP_BUILD_CMDS - $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR) + $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) \ + CC="$(TARGET_CC) -fno-stack-protector" \ + LD="$(TARGET_CC) -fno-PIE" \ + -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR) endef define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index c66f27e34313..cb329a90dff4 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -11,9 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES +AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AT91DATAFLASHBOOT_CFLAGS += -marm +endif + define AT91DATAFLASHBOOT_BUILD_CMDS make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" + CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index fb6b9a32808c..69a0d7ca57e4 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -137,7 +137,13 @@ EDK2_BASETOOLS_OPTS = \ EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) +# EDK2 "build" script internally uses and calls "make", which controls +# its own flags. It is mainly tested while not being a sub-make. In +# order to stay in that configuration, we avoid leaking top-level +# Buildroot make flags into EDK2 build by clearing the MAKEFLAGS +# environment variable. EDK2_BUILD_ENV += \ + MAKEFLAGS= \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ PYTHON_COMMAND=$(HOST_DIR)/bin/python3 \ diff --git a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch index 0d6a1a6e0100..ba9c8a93444e 100644 --- a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch +++ b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch @@ -1,4 +1,4 @@ -From 8418defaf0902bdd8af188221ae54c5a3d6ad05d Mon Sep 17 00:00:00 2001 +From 4c1ad500e73d46c83dec369da85db39ae2fe62dd Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 3 Dec 2021 16:13:28 +0800 Subject: [PATCH] grub-mkconfig: Restore umask for the grub.cfg @@ -17,7 +17,7 @@ Fixes: CVE-2021-3981 Signed-off-by: Michael Chang Reviewed-by: Daniel Kiper -[Upstream: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=0adec29674561034771c13e446069b41ef41e4d4] +Upstream: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=0adec29674561034771c13e446069b41ef41e4d4 Signed-off-by: Thomas Petazzoni --- util/grub-mkconfig.in | 3 +++ @@ -39,5 +39,5 @@ index f8cbb8d7a..84f356ea4 100644 fi fi -- -2.37.2 +2.41.0 diff --git a/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch new file mode 100644 index 000000000000..f6073add0bf7 --- /dev/null +++ b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch @@ -0,0 +1,126 @@ +From dfdc742bdb22be468035f96cce0be5fee23b6df5 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:02:04 +0100 +Subject: [PATCH] loader/efi/chainloader: Simplify the loader state + +The chainloader command retains the source buffer and device path passed +to LoadImage(), requiring the unload hook passed to grub_loader_set() to +free them. It isn't required to retain this state though - they aren't +required by StartImage() or anything else in the boot hook, so clean them +up before grub_cmd_chainloader() finishes. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 1469983ebb9674753ad333d37087fb8cb20e1dce +[Thomas: needed to cherry-pick +04c86e0bb7b58fc2f913f798cdb18934933e532d which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 38 +++++++++++++++++------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index 2bd80f4db..d1602c89b 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,25 +44,20 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_physical_address_t address; +-static grub_efi_uintn_t pages; +-static grub_efi_device_path_t *file_path; + static grub_efi_handle_t image_handle; +-static grub_efi_char16_t *cmdline; + + static grub_err_t + grub_chainloader_unload (void) + { ++ grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + ++ loaded_image = grub_efi_get_loaded_image (image_handle); ++ if (loaded_image != NULL) ++ grub_free (loaded_image->load_options); ++ + b = grub_efi_system_table->boot_services; + efi_call_1 (b->unload_image, image_handle); +- efi_call_2 (b->free_pages, address, pages); +- +- grub_free (file_path); +- grub_free (cmdline); +- cmdline = 0; +- file_path = 0; + + grub_dl_unref (my_mod); + return GRUB_ERR_NONE; +@@ -140,7 +135,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) + char *dir_start; + char *dir_end; + grub_size_t size; +- grub_efi_device_path_t *d; ++ grub_efi_device_path_t *d, *file_path; + + dir_start = grub_strchr (filename, ')'); + if (! dir_start) +@@ -222,11 +217,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_status_t status; + grub_efi_boot_services_t *b; + grub_device_t dev = 0; +- grub_efi_device_path_t *dp = 0; ++ grub_efi_device_path_t *dp = NULL, *file_path = NULL; + grub_efi_loaded_image_t *loaded_image; + char *filename; + void *boot_image = 0; + grub_efi_handle_t dev_handle = 0; ++ grub_efi_physical_address_t address = 0; ++ grub_efi_uintn_t pages = 0; ++ grub_efi_char16_t *cmdline = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -234,11 +232,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + + grub_dl_ref (my_mod); + +- /* Initialize some global variables. */ +- address = 0; +- image_handle = 0; +- file_path = 0; +- + b = grub_efi_system_table->boot_services; + + file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE); +@@ -408,6 +401,10 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_file_close (file); + grub_device_close (dev); + ++ /* We're finished with the source image buffer and file path now. */ ++ efi_call_2 (b->free_pages, address, pages); ++ grub_free (file_path); ++ + grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); + return 0; + +@@ -419,11 +416,18 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + if (file) + grub_file_close (file); + ++ grub_free (cmdline); + grub_free (file_path); + + if (address) + efi_call_2 (b->free_pages, address, pages); + ++ if (image_handle != NULL) ++ { ++ efi_call_1 (b->unload_image, image_handle); ++ image_handle = NULL; ++ } ++ + grub_dl_unref (my_mod); + + return grub_errno; +-- +2.41.0 + diff --git a/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch new file mode 100644 index 000000000000..30b410e38a67 --- /dev/null +++ b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch @@ -0,0 +1,165 @@ +From 8b6336696d93b51703c2015eff3e2d8a02145e43 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:58:28 +0100 +Subject: [PATCH] commands/boot: Add API to pass context to loader + +Loaders rely on global variables for saving context which is consumed +in the boot hook and freed in the unload hook. In the case where a loader +command is executed twice, calling grub_loader_set() a second time executes +the unload hook, but in some cases this runs when the loader's global +context has already been updated, resulting in the updated context being +freed and potential use-after-free bugs when the boot hook is subsequently +called. + +This adds a new API, grub_loader_set_ex(), which allows a loader to specify +context that is passed to its boot and unload hooks. This is an alternative +to requiring that loaders call grub_loader_unset() before mutating their +global context. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 14ceb3b3ff6db664649138442b6562c114dcf56e +[Thomas: needed to backport 04c86e0bb7b58fc2f913f798cdb18934933e532d, +which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/boot.c | 66 ++++++++++++++++++++++++++++++++++----- + include/grub/loader.h | 5 +++ + 2 files changed, 63 insertions(+), 8 deletions(-) + +diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c +index bbca81e94..61514788e 100644 +--- a/grub-core/commands/boot.c ++++ b/grub-core/commands/boot.c +@@ -27,10 +27,20 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + +-static grub_err_t (*grub_loader_boot_func) (void); +-static grub_err_t (*grub_loader_unload_func) (void); ++static grub_err_t (*grub_loader_boot_func) (void *context); ++static grub_err_t (*grub_loader_unload_func) (void *context); ++static void *grub_loader_context; + static int grub_loader_flags; + ++struct grub_simple_loader_hooks ++{ ++ grub_err_t (*boot) (void); ++ grub_err_t (*unload) (void); ++}; ++ ++/* Don't heap allocate this to avoid making grub_loader_set() fallible. */ ++static struct grub_simple_loader_hooks simple_loader_hooks; ++ + struct grub_preboot + { + grub_err_t (*preboot_func) (int); +@@ -44,6 +54,29 @@ static int grub_loader_loaded; + static struct grub_preboot *preboots_head = 0, + *preboots_tail = 0; + ++static grub_err_t ++grub_simple_boot_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ return hooks->boot (); ++} ++ ++static grub_err_t ++grub_simple_unload_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ grub_err_t ret; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ ++ ret = hooks->unload (); ++ grub_memset (hooks, 0, sizeof (*hooks)); ++ ++ return ret; ++} ++ + int + grub_loader_is_loaded (void) + { +@@ -110,28 +143,45 @@ grub_loader_unregister_preboot_hook (struct grub_preboot *hnd) + } + + void +-grub_loader_set (grub_err_t (*boot) (void), +- grub_err_t (*unload) (void), +- int flags) ++grub_loader_set_ex (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = boot; + grub_loader_unload_func = unload; ++ grub_loader_context = context; + grub_loader_flags = flags; + + grub_loader_loaded = 1; + } + ++void ++grub_loader_set (grub_err_t (*boot) (void), ++ grub_err_t (*unload) (void), ++ int flags) ++{ ++ grub_loader_set_ex (grub_simple_boot_hook, ++ grub_simple_unload_hook, ++ &simple_loader_hooks, ++ flags); ++ ++ simple_loader_hooks.boot = boot; ++ simple_loader_hooks.unload = unload; ++} ++ + void + grub_loader_unset(void) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = 0; + grub_loader_unload_func = 0; ++ grub_loader_context = 0; + + grub_loader_loaded = 0; + } +@@ -158,7 +208,7 @@ grub_loader_boot (void) + return err; + } + } +- err = (grub_loader_boot_func) (); ++ err = (grub_loader_boot_func) (grub_loader_context); + + for (cur = preboots_tail; cur; cur = cur->prev) + if (! err) +diff --git a/include/grub/loader.h b/include/grub/loader.h +index b20864282..97f231054 100644 +--- a/include/grub/loader.h ++++ b/include/grub/loader.h +@@ -40,6 +40,11 @@ void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), + grub_err_t (*unload) (void), + int flags); + ++void EXPORT_FUNC (grub_loader_set_ex) (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags); ++ + /* Unset current loader, if any. */ + void EXPORT_FUNC (grub_loader_unset) (void); + +-- +2.41.0 + diff --git a/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch new file mode 100644 index 000000000000..4308e3170f6b --- /dev/null +++ b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch @@ -0,0 +1,80 @@ +From 583fca49f413e00fe26f8ae7abe0837bbc574f79 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 11:48:58 +0100 +Subject: [PATCH] loader/efi/chainloader: Use grub_loader_set_ex() + +This ports the EFI chainloader to use grub_loader_set_ex() in order to fix +a use-after-free bug that occurs when grub_cmd_chainloader() is executed +more than once before a boot attempt is performed. + +Fixes: CVE-2022-28736 + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 04c86e0bb7b58fc2f913f798cdb18934933e532d +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index d1602c89b..7557eb269 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,11 +44,10 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_handle_t image_handle; +- + static grub_err_t +-grub_chainloader_unload (void) ++grub_chainloader_unload (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + +@@ -64,8 +63,9 @@ grub_chainloader_unload (void) + } + + static grub_err_t +-grub_chainloader_boot (void) ++grub_chainloader_boot (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_efi_uintn_t exit_data_size; +@@ -225,6 +225,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_physical_address_t address = 0; + grub_efi_uintn_t pages = 0; + grub_efi_char16_t *cmdline = NULL; ++ grub_efi_handle_t image_handle = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -405,7 +406,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + grub_free (file_path); + +- grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); ++ grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0); + return 0; + + fail: +@@ -423,10 +424,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + + if (image_handle != NULL) +- { +- efi_call_1 (b->unload_image, image_handle); +- image_handle = NULL; +- } ++ efi_call_1 (b->unload_image, image_handle); + + grub_dl_unref (my_mod); + +-- +2.41.0 + diff --git a/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch new file mode 100644 index 000000000000..b6fec1e6bbec --- /dev/null +++ b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch @@ -0,0 +1,105 @@ +From 1e1b1271b7a7c6ac20a4c5f8e0dc29614b4975d1 Mon Sep 17 00:00:00 2001 +From: Julian Andres Klode +Date: Thu, 2 Dec 2021 15:03:53 +0100 +Subject: [PATCH] kern/efi/sb: Reject non-kernel files in the shim_lock + verifier + +We must not allow other verifiers to pass things like the GRUB modules. +Instead of maintaining a blocklist, maintain an allowlist of things +that we do not care about. + +This allowlist really should be made reusable, and shared by the +lockdown verifier, but this is the minimal patch addressing +security concerns where the TPM verifier was able to mark modules +as verified (or the OpenPGP verifier for that matter), when it +should not do so on shim-powered secure boot systems. + +Fixes: CVE-2022-28735 + +Signed-off-by: Julian Andres Klode +Reviewed-by: Daniel Kiper +Upstream: 6fe755c5c07bb386fda58306bfd19e4a1c974c53 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/efi/sb.c | 39 ++++++++++++++++++++++++++++++++++++--- + include/grub/verify.h | 1 + + 2 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c +index c52ec6226..89c4bb3fd 100644 +--- a/grub-core/kern/efi/sb.c ++++ b/grub-core/kern/efi/sb.c +@@ -119,10 +119,11 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + void **context __attribute__ ((unused)), + enum grub_verify_flags *flags) + { +- *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ *flags = GRUB_VERIFY_FLAGS_NONE; + + switch (type & GRUB_FILE_TYPE_MASK) + { ++ /* Files we check. */ + case GRUB_FILE_TYPE_LINUX_KERNEL: + case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: + case GRUB_FILE_TYPE_BSD_KERNEL: +@@ -130,11 +131,43 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + case GRUB_FILE_TYPE_PLAN9_KERNEL: + case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: + *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; ++ return GRUB_ERR_NONE; + +- /* Fall through. */ ++ /* Files that do not affect secureboot state. */ ++ case GRUB_FILE_TYPE_NONE: ++ case GRUB_FILE_TYPE_LOOPBACK: ++ case GRUB_FILE_TYPE_LINUX_INITRD: ++ case GRUB_FILE_TYPE_OPENBSD_RAMDISK: ++ case GRUB_FILE_TYPE_XNU_RAMDISK: ++ case GRUB_FILE_TYPE_SIGNATURE: ++ case GRUB_FILE_TYPE_PUBLIC_KEY: ++ case GRUB_FILE_TYPE_PUBLIC_KEY_TRUST: ++ case GRUB_FILE_TYPE_PRINT_BLOCKLIST: ++ case GRUB_FILE_TYPE_TESTLOAD: ++ case GRUB_FILE_TYPE_GET_SIZE: ++ case GRUB_FILE_TYPE_FONT: ++ case GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY: ++ case GRUB_FILE_TYPE_CAT: ++ case GRUB_FILE_TYPE_HEXCAT: ++ case GRUB_FILE_TYPE_CMP: ++ case GRUB_FILE_TYPE_HASHLIST: ++ case GRUB_FILE_TYPE_TO_HASH: ++ case GRUB_FILE_TYPE_KEYBOARD_LAYOUT: ++ case GRUB_FILE_TYPE_PIXMAP: ++ case GRUB_FILE_TYPE_GRUB_MODULE_LIST: ++ case GRUB_FILE_TYPE_CONFIG: ++ case GRUB_FILE_TYPE_THEME: ++ case GRUB_FILE_TYPE_GETTEXT_CATALOG: ++ case GRUB_FILE_TYPE_FS_SEARCH: ++ case GRUB_FILE_TYPE_LOADENV: ++ case GRUB_FILE_TYPE_SAVEENV: ++ case GRUB_FILE_TYPE_VERIFY_SIGNATURE: ++ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ return GRUB_ERR_NONE; + ++ /* Other files. */ + default: +- return GRUB_ERR_NONE; ++ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("prohibited by secure boot policy")); + } + } + +diff --git a/include/grub/verify.h b/include/grub/verify.h +index cd129c398..672ae1692 100644 +--- a/include/grub/verify.h ++++ b/include/grub/verify.h +@@ -24,6 +24,7 @@ + + enum grub_verify_flags + { ++ GRUB_VERIFY_FLAGS_NONE = 0, + GRUB_VERIFY_FLAGS_SKIP_VERIFICATION = 1, + GRUB_VERIFY_FLAGS_SINGLE_CHUNK = 2, + /* Defer verification to another authority. */ +-- +2.41.0 + diff --git a/boot/grub2/0007-video-Remove-trailing-whitespaces.patch b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch new file mode 100644 index 000000000000..94d6aeefe7db --- /dev/null +++ b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch @@ -0,0 +1,689 @@ +From 1faa412c502c7c4ca1230fc152be30b88847fdd2 Mon Sep 17 00:00:00 2001 +From: Elyes Haouas +Date: Fri, 4 Mar 2022 07:42:13 +0100 +Subject: [PATCH] video: Remove trailing whitespaces + +Signed-off-by: Elyes Haouas +Reviewed-by: Daniel Kiper +Upstream: 1f48917d8ddb490dcdc70176e0f58136b7f7811a +[Thomas: needed to backport patches fixing CVEs in the video code] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/bochs.c | 2 +- + grub-core/video/capture.c | 2 +- + grub-core/video/cirrus.c | 4 ++-- + grub-core/video/coreboot/cbfb.c | 2 +- + grub-core/video/efi_gop.c | 22 +++++++++---------- + grub-core/video/fb/fbblit.c | 8 +++---- + grub-core/video/fb/video_fb.c | 10 ++++----- + grub-core/video/i386/pc/vbe.c | 34 ++++++++++++++--------------- + grub-core/video/i386/pc/vga.c | 6 ++--- + grub-core/video/ieee1275.c | 4 ++-- + grub-core/video/radeon_fuloong2e.c | 6 ++--- + grub-core/video/radeon_yeeloong3a.c | 6 ++--- + grub-core/video/readers/png.c | 2 +- + grub-core/video/readers/tga.c | 2 +- + grub-core/video/sis315_init.c | 2 +- + grub-core/video/sis315pro.c | 8 +++---- + grub-core/video/sm712.c | 10 ++++----- + grub-core/video/video.c | 8 +++---- + 18 files changed, 69 insertions(+), 69 deletions(-) + +diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c +index 30ea1bd82..edc651697 100644 +--- a/grub-core/video/bochs.c ++++ b/grub-core/video/bochs.c +@@ -212,7 +212,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + + if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234) + return 0; +- ++ + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); + framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK; + if (!framebuffer.base) +diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c +index 4d3195e01..c653d89f9 100644 +--- a/grub-core/video/capture.c ++++ b/grub-core/video/capture.c +@@ -92,7 +92,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, + framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); + if (!framebuffer.ptr) + return grub_errno; +- ++ + err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, + &framebuffer.mode_info, + framebuffer.ptr); +diff --git a/grub-core/video/cirrus.c b/grub-core/video/cirrus.c +index e2149e8ce..f5542ccdc 100644 +--- a/grub-core/video/cirrus.c ++++ b/grub-core/video/cirrus.c +@@ -354,11 +354,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height, + grub_uint8_t sr_ext = 0, hidden_dac = 0; + + grub_vga_set_geometry (&config, grub_vga_cr_write); +- ++ + grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1, + GRUB_VGA_GR_MODE); + grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6); +- ++ + grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE); + + grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT) +diff --git a/grub-core/video/coreboot/cbfb.c b/grub-core/video/coreboot/cbfb.c +index 9af81fa5b..986003c51 100644 +--- a/grub-core/video/coreboot/cbfb.c ++++ b/grub-core/video/coreboot/cbfb.c +@@ -106,7 +106,7 @@ grub_video_cbfb_setup (unsigned int width, unsigned int height, + + grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c +index b7590dc6c..7a5054631 100644 +--- a/grub-core/video/efi_gop.c ++++ b/grub-core/video/efi_gop.c +@@ -273,7 +273,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + grub_efi_status_t status; + struct grub_efi_gop_mode_info *info = NULL; + struct grub_video_mode_info mode_info; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + + if (status) +@@ -390,7 +390,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + found = 1; + } + } +- ++ + if (!found) + { + unsigned mode; +@@ -399,7 +399,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + { + grub_efi_uintn_t size; + grub_efi_status_t status; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + if (status) + { +@@ -472,11 +472,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; + framebuffer.offscreen + = grub_malloc (framebuffer.mode_info.height +- * framebuffer.mode_info.width ++ * framebuffer.mode_info.width + * sizeof (struct grub_efi_gop_blt_pixel)); + + buffer = framebuffer.offscreen; +- ++ + if (!buffer) + { + grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); +@@ -485,11 +485,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + &framebuffer.mode_info); + buffer = framebuffer.ptr; + } +- ++ + grub_dprintf ("video", "GOP: initialising FB @ %p %dx%dx%d\n", + framebuffer.ptr, framebuffer.mode_info.width, + framebuffer.mode_info.height, framebuffer.mode_info.bpp); +- ++ + err = grub_video_fb_create_render_target_from_pointer + (&framebuffer.render_target, &framebuffer.mode_info, buffer); + +@@ -498,15 +498,15 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't create FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + { + grub_dprintf ("video", "GOP: Couldn't set FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +@@ -514,7 +514,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't set palette\n"); + else + grub_dprintf ("video", "GOP: Success\n"); +- ++ + return err; + } + +diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c +index d55924837..1010ef393 100644 +--- a/grub-core/video/fb/fbblit.c ++++ b/grub-core/video/fb/fbblit.c +@@ -466,7 +466,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr == 0xf0) ++ if (*srcptr == 0xf0) + col = palette[16]; + else + col = palette[*srcptr & 0xf]; +@@ -478,7 +478,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + srcptr++; + } + +@@ -651,7 +651,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr != 0xf0) ++ if (*srcptr != 0xf0) + { + col = palette[*srcptr & 0xf]; + #ifdef GRUB_CPU_WORDS_BIGENDIAN +@@ -662,7 +662,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + } + else + dstptr += 3; +diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c +index ae6b89f9a..fa4ebde26 100644 +--- a/grub-core/video/fb/video_fb.c ++++ b/grub-core/video/fb/video_fb.c +@@ -754,7 +754,7 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source, + *alpha = 0; + return; + } +- ++ + /* If we have an out-of-bounds color, return transparent black. */ + if (color > 255) + { +@@ -1141,7 +1141,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + /* If everything is aligned on 32-bit use 32-bit copy. */ + if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint32_t) == 0 +- && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) ++ && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) + % sizeof (grub_uint32_t) == 0 + && linelen % sizeof (grub_uint32_t) == 0 + && linedelta % sizeof (grub_uint32_t) == 0) +@@ -1155,7 +1155,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + else if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint16_t) == 0 + && (grub_addr_t) grub_video_fb_get_video_ptr (&target, +- dst_x, dst_y) ++ dst_x, dst_y) + % sizeof (grub_uint16_t) == 0 + && linelen % sizeof (grub_uint16_t) == 0 + && linedelta % sizeof (grub_uint16_t) == 0) +@@ -1170,7 +1170,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + { + grub_uint8_t *src, *dst; + DO_SCROLL +- } ++ } + } + + /* 4. Fill empty space with specified color. In this implementation +@@ -1615,7 +1615,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask, + framebuffer.render_target = framebuffer.back_target; + return GRUB_ERR_NONE; + } +- ++ + mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED + | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); + +diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c +index b7f911926..0e65b5206 100644 +--- a/grub-core/video/i386/pc/vbe.c ++++ b/grub-core/video/i386/pc/vbe.c +@@ -219,7 +219,7 @@ grub_vbe_disable_mtrr (int mtrr) + } + + /* Call VESA BIOS 0x4f09 to set palette data, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + grub_uint32_t start_index, + struct grub_vbe_palette_data *palette_data) +@@ -237,7 +237,7 @@ grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + } + + /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + { + struct grub_bios_int_registers regs; +@@ -251,7 +251,7 @@ grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + } + + /* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode_info (grub_uint32_t mode, + struct grub_vbe_mode_info_block *mode_info) + { +@@ -285,7 +285,7 @@ grub_vbe_bios_set_mode (grub_uint32_t mode, + } + + /* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode (grub_uint32_t *mode) + { + struct grub_bios_int_registers regs; +@@ -298,7 +298,7 @@ grub_vbe_bios_get_mode (grub_uint32_t *mode) + return regs.eax & 0xffff; + } + +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size) + { + struct grub_bios_int_registers regs; +@@ -346,7 +346,7 @@ grub_vbe_bios_get_memory_window (grub_uint32_t window, + } + + /* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_set_scanline_length (grub_uint32_t length) + { + struct grub_bios_int_registers regs; +@@ -354,14 +354,14 @@ grub_vbe_bios_set_scanline_length (grub_uint32_t length) + regs.ecx = length; + regs.eax = 0x4f06; + /* BL = 2, Set Scan Line in Bytes. */ +- regs.ebx = 0x0002; ++ regs.ebx = 0x0002; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + return regs.eax & 0xffff; + } + + /* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + { + struct grub_bios_int_registers regs; +@@ -377,7 +377,7 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + } + + /* Call VESA BIOS 0x4f07 to set display start, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + { + struct grub_bios_int_registers regs; +@@ -390,7 +390,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + regs.edx = y; + regs.eax = 0x4f07; + /* BL = 80h, Set Display Start during Vertical Retrace. */ +- regs.ebx = 0x0080; ++ regs.ebx = 0x0080; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + +@@ -401,7 +401,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + } + + /* Call VESA BIOS 0x4f07 to get display start, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_display_start (grub_uint32_t *x, + grub_uint32_t *y) + { +@@ -419,7 +419,7 @@ grub_vbe_bios_get_display_start (grub_uint32_t *x, + } + + /* Call VESA BIOS 0x4f0a. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_pm_interface (grub_uint16_t *segment, grub_uint16_t *offset, + grub_uint16_t *length) + { +@@ -896,7 +896,7 @@ vbe2videoinfo (grub_uint32_t mode, + case GRUB_VBE_MEMORY_MODEL_YUV: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_YUV; + break; +- ++ + case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_RGB; + break; +@@ -923,10 +923,10 @@ vbe2videoinfo (grub_uint32_t mode, + break; + case 8: + mode_info->bytes_per_pixel = 1; +- break; ++ break; + case 4: + mode_info->bytes_per_pixel = 0; +- break; ++ break; + } + + if (controller_info.version >= 0x300) +@@ -976,7 +976,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + + static grub_err_t + grub_video_vbe_setup (unsigned int width, unsigned int height, +- grub_video_mode_type_t mode_type, ++ grub_video_mode_type_t mode_type, + grub_video_mode_type_t mode_mask) + { + grub_uint16_t *p; +@@ -1193,7 +1193,7 @@ grub_video_vbe_print_adapter_specific_info (void) + controller_info.version & 0xFF, + controller_info.oem_software_rev >> 8, + controller_info.oem_software_rev & 0xFF); +- ++ + /* The total_memory field is in 64 KiB units. */ + grub_printf_ (N_(" total memory: %d KiB\n"), + (controller_info.total_memory << 6)); +diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c +index b2f776c99..50d0b5e02 100644 +--- a/grub-core/video/i386/pc/vga.c ++++ b/grub-core/video/i386/pc/vga.c +@@ -48,7 +48,7 @@ static struct + int back_page; + } framebuffer; + +-static unsigned char ++static unsigned char + grub_vga_set_mode (unsigned char mode) + { + struct grub_bios_int_registers regs; +@@ -182,10 +182,10 @@ grub_video_vga_setup (unsigned int width, unsigned int height, + + is_target = 1; + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c +index 17a3dbbb5..f8cf94d96 100644 +--- a/grub-core/video/ieee1275.c ++++ b/grub-core/video/ieee1275.c +@@ -234,7 +234,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + /* TODO. */ + return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height); + } +- ++ + err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info); + if (err) + { +@@ -261,7 +261,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + + grub_video_ieee1275_set_palette (0, framebuffer.mode_info.number_of_colors, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/radeon_fuloong2e.c b/grub-core/video/radeon_fuloong2e.c +index b4da34b5e..40917acb7 100644 +--- a/grub-core/video/radeon_fuloong2e.c ++++ b/grub-core/video/radeon_fuloong2e.c +@@ -75,7 +75,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x515a1002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -139,7 +139,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + framebuffer.mapped = 1; + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0x55, ++ grub_memset (framebuffer.ptr, 0x55, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -152,7 +152,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/radeon_yeeloong3a.c b/grub-core/video/radeon_yeeloong3a.c +index 52614feb6..48631c181 100644 +--- a/grub-core/video/radeon_yeeloong3a.c ++++ b/grub-core/video/radeon_yeeloong3a.c +@@ -74,7 +74,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x96151002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -137,7 +137,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + #endif + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -150,7 +150,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 0157ff742..54dfedf43 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -916,7 +916,7 @@ grub_png_convert_image (struct grub_png_data *data) + } + return; + } +- ++ + if (data->is_gray) + { + switch (data->bpp) +diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c +index 7cb9d1d2a..a9ec3a1b6 100644 +--- a/grub-core/video/readers/tga.c ++++ b/grub-core/video/readers/tga.c +@@ -127,7 +127,7 @@ tga_load_palette (struct tga_data *data) + + if (len > sizeof (data->palette)) + len = sizeof (data->palette); +- ++ + if (grub_file_read (data->file, &data->palette, len) + != (grub_ssize_t) len) + return grub_errno; +diff --git a/grub-core/video/sis315_init.c b/grub-core/video/sis315_init.c +index ae5c1419c..09c3c7bbe 100644 +--- a/grub-core/video/sis315_init.c ++++ b/grub-core/video/sis315_init.c +@@ -1,4 +1,4 @@ +-static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = ++static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = + { + { 0x28, 0x81 }, + { 0x2a, 0x00 }, +diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c +index 22a0c85a6..4d2f9999a 100644 +--- a/grub-core/video/sis315pro.c ++++ b/grub-core/video/sis315pro.c +@@ -103,7 +103,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SIS315PRO_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -218,7 +218,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + + #ifndef TEST + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + grub_arch_sync_dma_caches (framebuffer.ptr, + framebuffer.mode_info.height +@@ -231,7 +231,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 + | GRUB_VGA_IO_MISC_28MHZ + | GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS +- | GRUB_VGA_IO_MISC_COLOR, ++ | GRUB_VGA_IO_MISC_COLOR, + GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE); + + grub_vga_sr_write (0x86, 5); +@@ -335,7 +335,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + { + if (read_sis_cmd (0x5) != 0xa1) + write_sis_cmd (0x86, 0x5); +- ++ + write_sis_cmd (read_sis_cmd (0x20) | 0xa1, 0x20); + write_sis_cmd (read_sis_cmd (0x1e) | 0xda, 0x1e); + +diff --git a/grub-core/video/sm712.c b/grub-core/video/sm712.c +index 10c46eb65..65f59f84b 100644 +--- a/grub-core/video/sm712.c ++++ b/grub-core/video/sm712.c +@@ -167,7 +167,7 @@ enum + GRUB_SM712_CR_SHADOW_VGA_VBLANK_START = 0x46, + GRUB_SM712_CR_SHADOW_VGA_VBLANK_END = 0x47, + GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START = 0x48, +- GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, ++ GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, + GRUB_SM712_CR_SHADOW_VGA_OVERFLOW = 0x4a, + GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT = 0x4b, + GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c, +@@ -375,7 +375,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SM712_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -471,7 +471,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + + #if !defined (TEST) && !defined(GENINIT) + /* Prevent garbage from appearing on the screen. */ +- grub_memset ((void *) framebuffer.cached_ptr, 0, ++ grub_memset ((void *) framebuffer.cached_ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + #endif + +@@ -482,7 +482,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + grub_sm712_sr_write (0x2, 0x6b); + grub_sm712_write_reg (0, GRUB_VGA_IO_PIXEL_MASK); + grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC, GRUB_VGA_SR_RESET); +- grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY ++ grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY + | GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY + | GRUB_VGA_IO_MISC_UPPER_64K + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 +@@ -694,7 +694,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + for (i = 0; i < ARRAY_SIZE (dda_lookups); i++) + grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda, + dda_lookups[i].vcentering); +- ++ + /* Undocumented */ + grub_sm712_cr_write (0, 0x9c); + grub_sm712_cr_write (0, 0x9d); +diff --git a/grub-core/video/video.c b/grub-core/video/video.c +index 983424107..8937da745 100644 +--- a/grub-core/video/video.c ++++ b/grub-core/video/video.c +@@ -491,13 +491,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + current_mode); + + param++; +- ++ + *width = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Find height value. */ + value = param; + param = grub_strchr(param, 'x'); +@@ -513,13 +513,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + { + /* We have optional color depth value. */ + param++; +- ++ + *height = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Convert color depth value. */ + value = param; + *depth = grub_strtoul (value, 0, 0); +-- +2.41.0 + diff --git a/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch new file mode 100644 index 000000000000..94431a4ef17a --- /dev/null +++ b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch @@ -0,0 +1,204 @@ +From 91d16e415b79f5080fa2bcc21bff6471f6be9f08 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:02:55 +1000 +Subject: [PATCH] video/readers/png: Abort sooner if a read operation fails + +Fuzzing revealed some inputs that were taking a long time, potentially +forever, because they did not bail quickly upon encountering an I/O error. + +Try to catch I/O errors sooner and bail out. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: d5caac8ab79d068ad9a41030c772d03a4d4fbd7b +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 55 ++++++++++++++++++++++++++++++----- + 1 file changed, 47 insertions(+), 8 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 54dfedf43..d715c4629 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -142,6 +142,7 @@ static grub_uint8_t + grub_png_get_byte (struct grub_png_data *data) + { + grub_uint8_t r; ++ grub_ssize_t bytes_read = 0; + + if ((data->inside_idat) && (data->idat_remain == 0)) + { +@@ -175,7 +176,14 @@ grub_png_get_byte (struct grub_png_data *data) + } + + r = 0; +- grub_file_read (data->file, &r, 1); ++ bytes_read = grub_file_read (data->file, &r, 1); ++ ++ if (bytes_read != 1) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: unexpected end of data"); ++ return 0; ++ } + + if (data->inside_idat) + data->idat_remain--; +@@ -231,15 +239,16 @@ grub_png_decode_image_palette (struct grub_png_data *data, + if (len == 0) + return GRUB_ERR_NONE; + +- for (i = 0; 3 * i < len && i < 256; i++) ++ grub_errno = GRUB_ERR_NONE; ++ for (i = 0; 3 * i < len && i < 256 && grub_errno == GRUB_ERR_NONE; i++) + for (j = 0; j < 3; j++) + data->palette[i][j] = grub_png_get_byte (data); +- for (i *= 3; i < len; i++) ++ for (i *= 3; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_get_byte (data); + + grub_png_get_dword (data); + +- return GRUB_ERR_NONE; ++ return grub_errno; + } + + static grub_err_t +@@ -256,9 +265,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: invalid image size"); + + color_bits = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + data->is_16bit = (color_bits == 16); + + color_type = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* According to PNG spec, no other types are valid. */ + if ((color_type & ~(PNG_COLOR_MASK_ALPHA | PNG_COLOR_MASK_COLOR)) +@@ -340,14 +353,20 @@ grub_png_decode_image_header (struct grub_png_data *data) + if (grub_png_get_byte (data) != PNG_COMPRESSION_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: compression method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_FILTER_TYPE_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: filter method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_INTERLACE_NONE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: interlace method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* Skip crc checksum. */ + grub_png_get_dword (data); +@@ -449,7 +468,7 @@ grub_png_get_huff_code (struct grub_png_data *data, struct huff_table *ht) + int code, i; + + code = 0; +- for (i = 0; i < ht->max_length; i++) ++ for (i = 0; i < ht->max_length && grub_errno == GRUB_ERR_NONE; i++) + { + code = (code << 1) + grub_png_get_bits (data, 1); + if (code < ht->maxval[i]) +@@ -504,8 +523,14 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + grub_uint8_t lens[DEFLATE_HCLEN_MAX]; + + nl = DEFLATE_HLIT_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nd = DEFLATE_HDIST_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nb = DEFLATE_HCLEN_BASE + grub_png_get_bits (data, 4); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((nl > DEFLATE_HLIT_MAX) || (nd > DEFLATE_HDIST_MAX) || + (nb > DEFLATE_HCLEN_MAX)) +@@ -533,7 +558,7 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + data->dist_offset); + + prev = 0; +- for (i = 0; i < nl + nd; i++) ++ for (i = 0; i < nl + nd && grub_errno == GRUB_ERR_NONE; i++) + { + int n, code; + struct huff_table *ht; +@@ -721,17 +746,21 @@ grub_png_read_dynamic_block (struct grub_png_data *data) + len = cplens[n]; + if (cplext[n]) + len += grub_png_get_bits (data, cplext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + n = grub_png_get_huff_code (data, &data->dist_table); + dist = cpdist[n]; + if (cpdext[n]) + dist += grub_png_get_bits (data, cpdext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + pos = data->wp - dist; + if (pos < 0) + pos += WSIZE; + +- while (len > 0) ++ while (len > 0 && grub_errno == GRUB_ERR_NONE) + { + data->slide[data->wp] = data->slide[pos]; + grub_png_output_byte (data, data->slide[data->wp]); +@@ -759,7 +788,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int final; + + cmf = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + flg = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((cmf & 0xF) != Z_DEFLATED) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, +@@ -774,7 +807,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int block_type; + + final = grub_png_get_bits (data, 1); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + block_type = grub_png_get_bits (data, 2); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + switch (block_type) + { +@@ -790,7 +827,7 @@ grub_png_decode_image_data (struct grub_png_data *data) + grub_png_get_byte (data); + grub_png_get_byte (data); + +- for (i = 0; i < len; i++) ++ for (i = 0; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_output_byte (data, grub_png_get_byte (data)); + + break; +@@ -1045,6 +1082,8 @@ grub_png_decode_png (struct grub_png_data *data) + + len = grub_png_get_dword (data); + type = grub_png_get_dword (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ break; + data->next_offset = data->file->offset + len + 4; + + switch (type) +-- +2.41.0 + diff --git a/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch new file mode 100644 index 000000000000..903d33b7b518 --- /dev/null +++ b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch @@ -0,0 +1,34 @@ +From e170edd18fcfdd9e6f91ba750fd022cef8d43cd4 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:13:40 +1000 +Subject: [PATCH] video/readers/png: Refuse to handle multiple image headers + +This causes the bitmap to be leaked. Do not permit multiple image headers. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 166a4d61448f74745afe1dac2f2cfb85d04909bf +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index d715c4629..35ae553c8 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -258,6 +258,9 @@ grub_png_decode_image_header (struct grub_png_data *data) + int color_bits; + enum grub_video_blit_format blt; + ++ if (data->image_width || data->image_height) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: two image headers found"); ++ + data->image_width = grub_png_get_dword (data); + data->image_height = grub_png_get_dword (data); + +-- +2.41.0 + diff --git a/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch new file mode 100644 index 000000000000..686a0beafd7f --- /dev/null +++ b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch @@ -0,0 +1,173 @@ +From 5b42d132a029c1d245d94c813a45836522b46226 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 18:51:35 +1000 +Subject: [PATCH] video/readers/png: Drop greyscale support to fix heap + out-of-bounds write + +A 16-bit greyscale PNG without alpha is processed in the following loop: + + for (i = 0; i < (data->image_width * data->image_height); + i++, d1 += 4, d2 += 2) + { + d1[R3] = d2[1]; + d1[G3] = d2[1]; + d1[B3] = d2[1]; + } + +The increment of d1 is wrong. d1 is incremented by 4 bytes per iteration, +but there are only 3 bytes allocated for storage. This means that image +data will overwrite somewhat-attacker-controlled parts of memory - 3 bytes +out of every 4 following the end of the image. + +This has existed since greyscale support was added in 2013 in commit +3ccf16dff98f (grub-core/video/readers/png.c: Support grayscale). + +Saving starfield.png as a 16-bit greyscale image without alpha in the gimp +and attempting to load it causes grub-emu to crash - I don't think this code +has ever worked. + +Delete all PNG greyscale support. + +Fixes: CVE-2021-3695 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: e623866d9286410156e8b9d2c82d6253a1b22d08 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 87 +++-------------------------------- + 1 file changed, 7 insertions(+), 80 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 35ae553c8..a3161e25b 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -100,7 +100,7 @@ struct grub_png_data + + unsigned image_width, image_height; + int bpp, is_16bit; +- int raw_bytes, is_gray, is_alpha, is_palette; ++ int raw_bytes, is_alpha, is_palette; + int row_bytes, color_bits; + grub_uint8_t *image_data; + +@@ -296,13 +296,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + data->bpp = 3; + else + { +- data->is_gray = 1; +- data->bpp = 1; ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: color type not supported"); + } + + if ((color_bits != 8) && (color_bits != 16) + && (color_bits != 4 +- || !(data->is_gray || data->is_palette))) ++ || !data->is_palette)) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: bit depth must be 8 or 16"); + +@@ -331,7 +331,7 @@ grub_png_decode_image_header (struct grub_png_data *data) + } + + #ifndef GRUB_CPU_WORDS_BIGENDIAN +- if (data->is_16bit || data->is_gray || data->is_palette) ++ if (data->is_16bit || data->is_palette) + #endif + { + data->image_data = grub_calloc (data->image_height, data->row_bytes); +@@ -899,27 +899,8 @@ grub_png_convert_image (struct grub_png_data *data) + int shift; + int mask = (1 << data->color_bits) - 1; + unsigned j; +- if (data->is_gray) +- { +- /* Generic formula is +- (0xff * i) / ((1U << data->color_bits) - 1) +- but for allowed bit depth of 1, 2 and for it's +- equivalent to +- (0xff / ((1U << data->color_bits) - 1)) * i +- Precompute the multipliers to avoid division. +- */ +- +- const grub_uint8_t multipliers[5] = { 0xff, 0xff, 0x55, 0x24, 0x11 }; +- for (i = 0; i < (1U << data->color_bits); i++) +- { +- grub_uint8_t col = multipliers[data->color_bits] * i; +- palette[i][0] = col; +- palette[i][1] = col; +- palette[i][2] = col; +- } +- } +- else +- grub_memcpy (palette, data->palette, 3 << data->color_bits); ++ ++ grub_memcpy (palette, data->palette, 3 << data->color_bits); + d1c = d1; + d2c = d2; + for (j = 0; j < data->image_height; j++, d1c += data->image_width * 3, +@@ -957,60 +938,6 @@ grub_png_convert_image (struct grub_png_data *data) + return; + } + +- if (data->is_gray) +- { +- switch (data->bpp) +- { +- case 4: +- /* 16-bit gray with alpha. */ +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 4) +- { +- d1[R4] = d2[3]; +- d1[G4] = d2[3]; +- d1[B4] = d2[3]; +- d1[A4] = d2[1]; +- } +- break; +- case 2: +- if (data->is_16bit) +- /* 16-bit gray without alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R3] = d2[1]; +- d1[G3] = d2[1]; +- d1[B3] = d2[1]; +- } +- } +- else +- /* 8-bit gray with alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R4] = d2[1]; +- d1[G4] = d2[1]; +- d1[B4] = d2[1]; +- d1[A4] = d2[0]; +- } +- } +- break; +- /* 8-bit gray without alpha. */ +- case 1: +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 3, d2++) +- { +- d1[R3] = d2[0]; +- d1[G3] = d2[0]; +- d1[B3] = d2[0]; +- } +- break; +- } +- return; +- } +- + { + /* Only copy the upper 8 bit. */ + #ifndef GRUB_CPU_WORDS_BIGENDIAN +-- +2.41.0 + diff --git a/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch new file mode 100644 index 000000000000..19fde07060c8 --- /dev/null +++ b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch @@ -0,0 +1,44 @@ +From 43a7d9cb829467993ba683a26c980fcfdaa924c8 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 23:25:07 +1000 +Subject: [PATCH] video/readers/png: Avoid heap OOB R/W inserting huff table + items + +In fuzzing we observed crashes where a code would attempt to be inserted +into a huffman table before the start, leading to a set of heap OOB reads +and writes as table entries with negative indices were shifted around and +the new code written in. + +Catch the case where we would underflow the array and bail. + +Fixes: CVE-2021-3696 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 210245129c932dc9e1c2748d9d35524fb95b5042 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index a3161e25b..d7ed5aa6c 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -438,6 +438,13 @@ grub_png_insert_huff_item (struct huff_table *ht, int code, int len) + for (i = len; i < ht->max_length; i++) + n += ht->maxval[i]; + ++ if (n > ht->num_values) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: out of range inserting huffman table item"); ++ return; ++ } ++ + for (i = 0; i < n; i++) + ht->values[ht->num_values - i] = ht->values[ht->num_values - i - 1]; + +-- +2.41.0 + diff --git a/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch new file mode 100644 index 000000000000..75c3f8e43b70 --- /dev/null +++ b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch @@ -0,0 +1,78 @@ +From 6be7ccfcc33da513de66f71de63fdc129fa019c2 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Wed, 7 Jul 2021 15:38:19 +1000 +Subject: [PATCH] video/readers/jpeg: Block int underflow -> wild pointer write + +Certain 1 px wide images caused a wild pointer write in +grub_jpeg_ycrcb_to_rgb(). This was caused because in grub_jpeg_decode_data(), +we have the following loop: + +for (; data->r1 < nr1 && (!data->dri || rst); + data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) + +We did not check if vb * width >= hb * nc1. + +On a 64-bit platform, if that turns out to be negative, it will underflow, +be interpreted as unsigned 64-bit, then be added to the 64-bit pointer, so +we see data->bitmap_ptr jump, e.g.: + +0x6180_0000_0480 to +0x6181_0000_0498 + ^ + ~--- carry has occurred and this pointer is now far away from + any object. + +On a 32-bit platform, it will decrement the pointer, creating a pointer +that won't crash but will overwrite random data. + +Catch the underflow and error out. + +Fixes: CVE-2021-3697 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/jpeg.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c +index e31602f76..1d256af01 100644 +--- a/grub-core/video/readers/jpeg.c ++++ b/grub-core/video/readers/jpeg.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -639,6 +640,7 @@ static grub_err_t + grub_jpeg_decode_data (struct grub_jpeg_data *data) + { + unsigned c1, vb, hb, nr1, nc1; ++ unsigned stride_a, stride_b, stride; + int rst = data->dri; + + vb = 8 << data->log_vs; +@@ -650,8 +652,14 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data) + return grub_error(GRUB_ERR_BAD_FILE_TYPE, + "jpeg: attempted to decode data before start of stream"); + ++ if (grub_mul(vb, data->image_width, &stride_a) || ++ grub_mul(hb, nc1, &stride_b) || ++ grub_sub(stride_a, stride_b, &stride)) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "jpeg: cannot decode image with these dimensions"); ++ + for (; data->r1 < nr1 && (!data->dri || rst); +- data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) ++ data->r1++, data->bitmap_ptr += stride * 3) + for (c1 = 0; c1 < nc1 && (!data->dri || rst); + c1++, rst--, data->bitmap_ptr += hb * 3) + { +-- +2.41.0 + diff --git a/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch new file mode 100644 index 000000000000..3acec5cc209c --- /dev/null +++ b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch @@ -0,0 +1,56 @@ +From cadde7e36b8797060ac8cdf7cca7d8e1e09697e6 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Mon, 20 Dec 2021 19:41:21 +1100 +Subject: [PATCH] net/ip: Do IP fragment maths safely + +We can receive packets with invalid IP fragmentation information. This +can lead to rsm->total_len underflowing and becoming very large. + +Then, in grub_netbuff_alloc(), we add to this very large number, which can +cause it to overflow and wrap back around to a small positive number. +The allocation then succeeds, but the resulting buffer is too small and +subsequent operations can write past the end of the buffer. + +Catch the underflow here. + +Fixes: CVE-2022-28733 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 3e4817538de828319ba6d59ced2fbb9b5ca13287 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/ip.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c +index ea5edf8f1..74e4e8b06 100644 +--- a/grub-core/net/ip.c ++++ b/grub-core/net/ip.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + struct iphdr { +@@ -512,7 +513,14 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb, + { + rsm->total_len = (8 * (grub_be_to_cpu16 (iph->frags) & OFFSET_MASK) + + (nb->tail - nb->data)); +- rsm->total_len -= ((iph->verhdrlen & 0xf) * sizeof (grub_uint32_t)); ++ ++ if (grub_sub (rsm->total_len, (iph->verhdrlen & 0xf) * sizeof (grub_uint32_t), ++ &rsm->total_len)) ++ { ++ grub_dprintf ("net", "IP reassembly size underflow\n"); ++ return GRUB_ERR_NONE; ++ } ++ + rsm->asm_netbuff = grub_netbuff_alloc (rsm->total_len); + if (!rsm->asm_netbuff) + { +-- +2.41.0 + diff --git a/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch new file mode 100644 index 000000000000..cd249299be61 --- /dev/null +++ b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch @@ -0,0 +1,50 @@ +From 6bb49bda656e1121fd303cf3e69709172e267718 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 18:17:03 +1100 +Subject: [PATCH] net/http: Fix OOB write for split http headers + +GRUB has special code for handling an http header that is split +across two packets. + +The code tracks the end of line by looking for a "\n" byte. The +code for split headers has always advanced the pointer just past the +end of the line, whereas the code that handles unsplit headers does +not advance the pointer. This extra advance causes the length to be +one greater, which breaks an assumption in parse_line(), leading to +it writing a NUL byte one byte past the end of the buffer where we +reconstruct the line from the two packets. + +It's conceivable that an attacker controlled set of packets could +cause this to zero out the first byte of the "next" pointer of the +grub_mm_region structure following the current_line buffer. + +Do not advance the pointer in the split header case. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: ec6bfd3237394c1c7dbf2fd73417173318d22f4b +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index b616cf40b..a19b0a205 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -190,9 +190,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), + int have_line = 1; + char *t; + ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data); +- if (ptr) +- ptr++; +- else ++ if (ptr == NULL) + { + have_line = 0; + ptr = (char *) nb->tail; +-- +2.41.0 + diff --git a/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch new file mode 100644 index 000000000000..684bb88a9c1a --- /dev/null +++ b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch @@ -0,0 +1,52 @@ +From 2974684d2f7f85a5c57af8155cc3b70c04ec1d6b Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 19:04:40 +1100 +Subject: [PATCH] net/http: Error out on headers with LF without CR + +In a similar vein to the previous patch, parse_line() would write +a NUL byte past the end of the buffer if there was an HTTP header +with a LF rather than a CRLF. + +RFC-2616 says: + + Many HTTP/1.1 header field values consist of words separated by LWS + or special characters. These special characters MUST be in a quoted + string to be used within a parameter value (as defined in section 3.6). + +We don't support quoted sections or continuation lines, etc. + +If we see an LF that's not part of a CRLF, bail out. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index a19b0a205..1fa62b5cb 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -68,7 +68,15 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len) + char *end = ptr + len; + while (end > ptr && *(end - 1) == '\r') + end--; ++ ++ /* LF without CR. */ ++ if (end == ptr + len) ++ { ++ data->errmsg = grub_strdup (_("invalid HTTP header - LF without CR")); ++ return GRUB_ERR_NONE; ++ } + *end = 0; ++ + /* Trailing CRLF. */ + if (data->in_chunk_len == 1) + { +-- +2.41.0 + diff --git a/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch new file mode 100644 index 000000000000..680df1f5e9b3 --- /dev/null +++ b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch @@ -0,0 +1,116 @@ +From 1aefeca0f6304a20c1a3711cb9e89c5fdb901b6b Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 00:51:20 +0800 +Subject: [PATCH] font: Fix size overflow in grub_font_get_glyph_internal() + +The length of memory allocation and file read may overflow. This patch +fixes the problem by using safemath macros. + +There is a lot of code repetition like "(x * y + 7) / 8". It is unsafe +if overflow happens. This patch introduces grub_video_bitmap_calc_1bpp_bufsz(). +It is safe replacement for such code. It has safemath-like prototype. + +This patch also introduces grub_cast(value, pointer), it casts value to +typeof(*pointer) then store the value to *pointer. It returns true when +overflow occurs or false if there is no overflow. The semantics of arguments +and return value are designed to be consistent with other safemath macros. + +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 9c76ec09ae08155df27cd237eaea150b4f02f532 +[Thomas: needed to backport 768e1ef2fc159f6e14e7246e4be09363708ac39e, +which fixes CVE-2022-2601] +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 17 +++++++++++++---- + include/grub/bitmap.h | 18 ++++++++++++++++++ + include/grub/safemath.h | 2 ++ + 3 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index d09bb38d8..876b5b695 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -739,7 +739,8 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + grub_int16_t xoff; + grub_int16_t yoff; + grub_int16_t dwidth; +- int len; ++ grub_ssize_t len; ++ grub_size_t sz; + + if (index_entry->glyph) + /* Return cached glyph. */ +@@ -766,9 +767,17 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + return 0; + } + +- len = (width * height + 7) / 8; +- glyph = grub_malloc (sizeof (struct grub_font_glyph) + len); +- if (!glyph) ++ /* Calculate real struct size of current glyph. */ ++ if (grub_video_bitmap_calc_1bpp_bufsz (width, height, &len) || ++ grub_add (sizeof (struct grub_font_glyph), len, &sz)) ++ { ++ remove_font (font); ++ return 0; ++ } ++ ++ /* Allocate and initialize the glyph struct. */ ++ glyph = grub_malloc (sz); ++ if (glyph == NULL) + { + remove_font (font); + return 0; +diff --git a/include/grub/bitmap.h b/include/grub/bitmap.h +index 5728f8ca3..0d9603f61 100644 +--- a/include/grub/bitmap.h ++++ b/include/grub/bitmap.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + struct grub_video_bitmap + { +@@ -79,6 +80,23 @@ grub_video_bitmap_get_height (struct grub_video_bitmap *bitmap) + return bitmap->mode_info.height; + } + ++/* ++ * Calculate and store the size of data buffer of 1bit bitmap in result. ++ * Equivalent to "*result = (width * height + 7) / 8" if no overflow occurs. ++ * Return true when overflow occurs or false if there is no overflow. ++ * This function is intentionally implemented as a macro instead of ++ * an inline function. Although a bit awkward, it preserves data types for ++ * safemath macros and reduces macro side effects as much as possible. ++ * ++ * XXX: Will report false overflow if width * height > UINT64_MAX. ++ */ ++#define grub_video_bitmap_calc_1bpp_bufsz(width, height, result) \ ++({ \ ++ grub_uint64_t _bitmap_pixels; \ ++ grub_mul ((width), (height), &_bitmap_pixels) ? 1 : \ ++ grub_cast (_bitmap_pixels / GRUB_CHAR_BIT + !!(_bitmap_pixels % GRUB_CHAR_BIT), (result)); \ ++}) ++ + void EXPORT_FUNC (grub_video_bitmap_get_mode_info) (struct grub_video_bitmap *bitmap, + struct grub_video_mode_info *mode_info); + +diff --git a/include/grub/safemath.h b/include/grub/safemath.h +index c17b89bba..bb0f826de 100644 +--- a/include/grub/safemath.h ++++ b/include/grub/safemath.h +@@ -30,6 +30,8 @@ + #define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) + #define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) + ++#define grub_cast(a, res) grub_add ((a), 0, (res)) ++ + #else + #error gcc 5.1 or newer or clang 3.8 or newer is required + #endif +-- +2.41.0 + diff --git a/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch new file mode 100644 index 000000000000..d8e5835e181c --- /dev/null +++ b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch @@ -0,0 +1,83 @@ +From fefba72d17364d6212cfd3be2232f4ce0ba23b82 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 01:58:27 +0800 +Subject: [PATCH] font: Fix several integer overflows in + grub_font_construct_glyph() + +This patch fixes several integer overflows in grub_font_construct_glyph(). +Glyphs of invalid size, zero or leading to an overflow, are rejected. +The inconsistency between "glyph" and "max_glyph_size" when grub_malloc() +returns NULL is fixed too. + +Fixes: CVE-2022-2601 + +Reported-by: Zhang Boyang +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 768e1ef2fc159f6e14e7246e4be09363708ac39e +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 876b5b695..0ff552578 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1515,6 +1515,7 @@ grub_font_construct_glyph (grub_font_t hinted_font, + struct grub_video_signed_rect bounds; + static struct grub_font_glyph *glyph = 0; + static grub_size_t max_glyph_size = 0; ++ grub_size_t cur_glyph_size; + + ensure_comb_space (glyph_id); + +@@ -1531,29 +1532,33 @@ grub_font_construct_glyph (grub_font_t hinted_font, + if (!glyph_id->ncomb && !glyph_id->attributes) + return main_glyph; + +- if (max_glyph_size < sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) ++ if (grub_video_bitmap_calc_1bpp_bufsz (bounds.width, bounds.height, &cur_glyph_size) || ++ grub_add (sizeof (*glyph), cur_glyph_size, &cur_glyph_size)) ++ return main_glyph; ++ ++ if (max_glyph_size < cur_glyph_size) + { + grub_free (glyph); +- max_glyph_size = (sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) * 2; +- if (max_glyph_size < 8) +- max_glyph_size = 8; +- glyph = grub_malloc (max_glyph_size); ++ if (grub_mul (cur_glyph_size, 2, &max_glyph_size)) ++ max_glyph_size = 0; ++ glyph = max_glyph_size > 0 ? grub_malloc (max_glyph_size) : NULL; + } + if (!glyph) + { ++ max_glyph_size = 0; + grub_errno = GRUB_ERR_NONE; + return main_glyph; + } + +- grub_memset (glyph, 0, sizeof (*glyph) +- + (bounds.width * bounds.height +- + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT); ++ grub_memset (glyph, 0, cur_glyph_size); + + glyph->font = main_glyph->font; +- glyph->width = bounds.width; +- glyph->height = bounds.height; +- glyph->offset_x = bounds.x; +- glyph->offset_y = bounds.y; ++ if (bounds.width == 0 || bounds.height == 0 || ++ grub_cast (bounds.width, &glyph->width) || ++ grub_cast (bounds.height, &glyph->height) || ++ grub_cast (bounds.x, &glyph->offset_x) || ++ grub_cast (bounds.y, &glyph->offset_y)) ++ return main_glyph; + + if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR) + grub_font_blit_glyph_mirror (glyph, main_glyph, +-- +2.41.0 + diff --git a/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch new file mode 100644 index 000000000000..1d3d26fb7bcf --- /dev/null +++ b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch @@ -0,0 +1,93 @@ +From 79bd19e078c5053d800b1b4d3a901083da947e70 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Mon, 24 Oct 2022 08:05:35 +0800 +Subject: [PATCH] font: Fix an integer underflow in blit_comb() + +The expression (ctx.bounds.height - combining_glyphs[i]->height) / 2 may +evaluate to a very big invalid value even if both ctx.bounds.height and +combining_glyphs[i]->height are small integers. For example, if +ctx.bounds.height is 10 and combining_glyphs[i]->height is 12, this +expression evaluates to 2147483647 (expected -1). This is because +coordinates are allowed to be negative but ctx.bounds.height is an +unsigned int. So, the subtraction operates on unsigned ints and +underflows to a very big value. The division makes things even worse. +The quotient is still an invalid value even if converted back to int. + +This patch fixes the problem by casting ctx.bounds.height to int. As +a result the subtraction will operate on int and grub_uint16_t which +will be promoted to an int. So, the underflow will no longer happen. Other +uses of ctx.bounds.height (and ctx.bounds.width) are also casted to int, +to ensure coordinates are always calculated on signed integers. + +Fixes: CVE-2022-3775 + +Reported-by: Daniel Axtens +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 992c06191babc1e109caf40d6a07ec6fdef427af +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 0ff552578..7b1cbde07 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1206,12 +1206,12 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + ctx.bounds.height = main_glyph->height; + + above_rightx = main_glyph->offset_x + main_glyph->width; +- above_righty = ctx.bounds.y + ctx.bounds.height; ++ above_righty = ctx.bounds.y + (int) ctx.bounds.height; + + above_leftx = main_glyph->offset_x; +- above_lefty = ctx.bounds.y + ctx.bounds.height; ++ above_lefty = ctx.bounds.y + (int) ctx.bounds.height; + +- below_rightx = ctx.bounds.x + ctx.bounds.width; ++ below_rightx = ctx.bounds.x + (int) ctx.bounds.width; + below_righty = ctx.bounds.y; + + comb = grub_unicode_get_comb (glyph_id); +@@ -1224,7 +1224,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + if (!combining_glyphs[i]) + continue; +- targetx = (ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; ++ targetx = ((int) ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; + /* CGJ is to avoid diacritics reordering. */ + if (comb[i].code + == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER) +@@ -1234,8 +1234,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + case GRUB_UNICODE_COMB_OVERLAY: + do_blit (combining_glyphs[i], + targetx, +- (ctx.bounds.height - combining_glyphs[i]->height) / 2 +- - (ctx.bounds.height + ctx.bounds.y), &ctx); ++ ((int) ctx.bounds.height - combining_glyphs[i]->height) / 2 ++ - ((int) ctx.bounds.height + ctx.bounds.y), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; + break; +@@ -1308,7 +1308,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + /* Fallthrough. */ + case GRUB_UNICODE_STACK_ATTACHED_ABOVE: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height + ctx.bounds.y + space ++ -((int) ctx.bounds.height + ctx.bounds.y + space + + combining_glyphs[i]->height), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +@@ -1316,7 +1316,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + case GRUB_UNICODE_COMB_HEBREW_DAGESH: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height / 2 + ctx.bounds.y ++ -((int) ctx.bounds.height / 2 + ctx.bounds.y + + combining_glyphs[i]->height / 2), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +-- +2.41.0 + diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 875884cf5c4a..6c3a861fb644 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -34,6 +34,25 @@ GRUB2_IGNORE_CVES += CVE-2020-15705 GRUB2_IGNORE_CVES += CVE-2021-3981 # vulnerability is specific to the SUSE distribution GRUB2_IGNORE_CVES += CVE-2021-46705 +# 0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch +GRUB2_IGNORE_CVES += CVE-2022-28736 +# 0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +GRUB2_IGNORE_CVES += CVE-2022-28735 +# 0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +GRUB2_IGNORE_CVES += CVE-2021-3695 +# 0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +GRUB2_IGNORE_CVES += CVE-2021-3696 +# 0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +GRUB2_IGNORE_CVES += CVE-2021-3697 +# 0013-net-ip-Do-IP-fragment-maths-safely.patch +GRUB2_IGNORE_CVES += CVE-2022-28733 +# 0014-net-http-Fix-OOB-write-for-split-http-headers.patch +# 0015-net-http-Error-out-on-headers-with-LF-without-CR.patch +GRUB2_IGNORE_CVES += CVE-2022-28734 +# 0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch +GRUB2_IGNORE_CVES += CVE-2022-2601 +# 0018-font-Fix-an-integer-underflow-in-blit_comb.patch +GRUB2_IGNORE_CVES += CVE-2022-3775 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES diff --git a/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch new file mode 100644 index 000000000000..5a623f28f95d --- /dev/null +++ b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch @@ -0,0 +1,49 @@ +From 4796a1eacc6a5ccb623e7d2e46a5196f8335e496 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 11 Aug 2023 11:19:49 +0300 +Subject: [PATCH] Allow access to low addresses with gcc 12 + +gcc 12 added a warning that triggers on access to low addresses. Add a +compile option that allows access to lower addresses. + +Add the 'cc_option' macro to avoid the compile option when the compiler +does not support it. + +This fixes build with TF-A. TF-A added a similar fix in commit +dea23e245fb89. + +See some more details in +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 + +Upstream: https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/42 +Signed-off-by: Baruch Siach +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 3f0dd89a7381..045284c30cbc 100644 +--- a/Makefile ++++ b/Makefile +@@ -108,6 +108,10 @@ MV_DDR_VER_CSRC = mv_ddr_build_message.c + # create mv_ddr build message and version string source file + $(shell $(MV_DDR_ROOT)/scripts/localversion.sh $(MV_DDR_ROOT) $(MV_DDR_VER_CSRC) 2> /dev/null) + ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # ****************** + # U-BOOT SPL SUPPORT + # ****************** +@@ -331,6 +335,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) + CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie ++CFLAGS += $(call cc_option, --param=min-pagesize=0) + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch similarity index 80% rename from boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch rename to boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch index 62b1000727f8..626279eb4714 100644 --- a/boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch +++ b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch @@ -10,25 +10,24 @@ routines. The mv-ddr-marvell Makefile provides no way to add custom CFLAGS. Patch Makefile to disable stack protection. +Upstream: not applicable; Buildroot specific Signed-off-by: Baruch Siach ---- -Upstream status: not applicable; Buildroot specific --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 3f0dd89a7381..feae75cc16e4 100644 +index 045284c30cbc..9641354bcf86 100644 --- a/Makefile +++ b/Makefile -@@ -331,6 +331,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) - CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 +@@ -336,6 +336,7 @@ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc CFLAGS += -march=armv8-a -fpie + CFLAGS += $(call cc_option, --param=min-pagesize=0) +CFLAGS += -fno-stack-protector # PLATFORM is set in ble/ble.mk ifneq ($(findstring a80x0,$(PLATFORM)),) -- -2.35.1 +2.40.1 diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index a0a9f06f35db..5aa4ca06e85c 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 0a6d1527aae6..ae57677320f4 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.4 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) diff --git a/boot/syslinux/0018-single-load-segment.patch b/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 000000000000..11d73c31a4e1 --- /dev/null +++ b/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998@free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index f5c20f51688e..085397d03d0c 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -492,6 +492,8 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW (e.g. http://...), and it will be downloaded and used from the download directory. + The PMU firmware binary can be either in ELF or BIN format. + If empty, the generated boot.bin will not contain a PMU firmware. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c373..c3e3829362d4 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -209,6 +209,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc +UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) @@ -216,7 +217,7 @@ UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-swig +UBOOT_DEPENDENCIES += host-python-pylibfdt endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index ff03a05a8eb3..0038acfcfdb6 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 09eddc4e68ab..7e119376e153 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.254" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 86513d8072fc..dddfaf5228d0 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -37,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index e7862d17380b..a5a8f7a65f2e 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -18,6 +18,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 967d064f1c5a..2b12b169a099 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 1cded537657c..903d0abd9f66 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index d1e81d90fdee..718d203319f7 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index 6c490f195bad..4ae3f45ff118 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 27cdc9e19e58..0d0482458bac 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 775bdecd90a9..ae53f5ce04e7 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index 0767ab137537..105d572a7fcd 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 50a0986ab215..a38f3a1c5ee7 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -22,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 25ecf31146f5..74b6a764cd3d 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -22,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 6bbcca0896de..591e6e336934 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -9,6 +9,7 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 872e4b6a306c..5640d9dc4d32 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -6,7 +6,7 @@ BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index ea1361efc02c..24791178f46f 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -14,10 +14,14 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index fc3b3f921396..ae2780556ad1 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index a487ce989148..b1826f2625c1 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -30,7 +30,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index f1f7baaa0806..b83cd6ef5932 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -30,7 +30,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y diff --git a/configs/stm32mp157c_odyssey_defconfig b/configs/stm32mp157c_odyssey_defconfig index 6b699830b171..ddcb4d4d2d28 100644 --- a/configs/stm32mp157c_odyssey_defconfig +++ b/configs/stm32mp157c_odyssey_defconfig @@ -17,8 +17,10 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-odyssey.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-odyssey.dtb E=0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y diff --git a/configs/toradex_apalis_imx6_defconfig b/configs/toradex_apalis_imx6_defconfig index 40a2d2d520d9..e447190e0cee 100644 --- a/configs/toradex_apalis_imx6_defconfig +++ b/configs/toradex_apalis_imx6_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_GLOBAL_PATCH_DIR="board/toradex/apalis-imx6/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/apalis-imx6/post-image.sh" BR2_LINUX_KERNEL=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 2808fa522b01..a393b681c867 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,4 +1,5 @@ BR2_aarch64=y +BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 5b07a8efbc3a..082dda4b2395 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz" diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index cd90a5871fa2..ef6dbd3c2b92 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -49,8 +49,25 @@ Buildroot configuration. Refer to xref:customize[] for more details. Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use -utils/docker-run script and inside it issue these commands: ++utils/docker-run+ script and inside it issue these commands: + -------------------- - $ make +_defconfig+ + $ make _defconfig $ make -------------------- + +By default, Buildroot developers use the official image hosted on the +https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com +registry] and it should be convenient for most usage. If you still want +to build your own docker image, you can base it off the official image +as the +FROM+ directive of your own _Dockerfile_: + +---- +FROM registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +RUN ... +COPY ... +---- + +The current version _YYYYMMDD.HHMM_ can be found in the +.gitlab-ci.yml+ +file at the top of the Buildroot source tree; all past versions are +listed in the aforementioned registry as well. diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 04f5241d053b..b7519cc01ae9 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at @@ -534,12 +534,18 @@ typically indicates that the +.hash+ file is wrong but the downloaded file is probably OK. Hashes are currently checked for files fetched from http/ftp servers, -Git repositories, files copied using scp and local files. Hashes are -not checked for other version control systems (such as Subversion, -CVS, etc.) because Buildroot currently does not generate reproducible +Git or subversion repositories, files copied using scp and local files. +Hashes are not checked for other version control systems (such as CVS, +mercurial) because Buildroot currently does not generate reproducible tarballs when source code is fetched from such version control systems. +Additionally, for packages for which it is possible to specify a custom +version (e.g. a custom version string, a remote tarball URL, or a VCS +repository location and changeset), Buildroot can't carry hashes for +those. It is however possible to xref:customize-hashes[provide a list of +extra hashes] that can cover such cases. + Hashes should only be added in +.hash+ files for files that are guaranteed to be stable. For example, patches auto-generated by Github are not guaranteed to be stable, and therefore their hashes can change diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index fbe37f9ca9ff..c6768a1f409b 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -499,7 +499,7 @@ not and can not work as people would expect it should: the package, or when the CVE for some reason does not affect the Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: - ++ ---------------------- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt index e9c6968e79c4..739bed25d5e9 100644 --- a/docs/manual/adding-packages-gettext.txt +++ b/docs/manual/adding-packages-gettext.txt @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 94f1c64496fd..2b90d13b41ad 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -247,6 +247,23 @@ which have the upstream license), and that you are allowed to do so. See http://developercertificate.org/[the Developer Certificate of Origin] for details. +To give credits to who sponsored the creation of a patch or the process of +upstreaming it, you may use +https://datatracker.ietf.org/doc/html/rfc5233[email subaddressing] for +your git identity (i.e. what is used as commit author and email +From:+ +field, as well as your Signed-off-by tag); add suffix to the local part, +separated from it by a plus `+` sign. E.g.: + +* for a company which sponsored the submitted work, use the company name + as the detail (suffix) part: ++ +`Your-Name Your-Surname ` + +* for an individual who sponsored the submitted work, use + their name and surname: ++ +`Your-Name Your-Surname ` + When adding new packages, you should submit every package in a separate patch. This patch should have the update to +package/Config.in+, the package +Config.in+ file, the +.mk+ file, the diff --git a/docs/manual/customize-patches.txt b/docs/manual/customize-patches.txt index eb98d1bea2c8..f33bbcdde7b4 100644 --- a/docs/manual/customize-patches.txt +++ b/docs/manual/customize-patches.txt @@ -1,8 +1,10 @@ // -*- mode:doc -*- ; // vim: set syntax=asciidoc: +=== Adding project-specific patches and hashes + [[customize-patches]] -=== Adding project-specific patches +==== Providing extra patches It is sometimes useful to apply 'extra' patches to packages - on top of those provided in Buildroot. This might be used to support custom @@ -57,3 +59,25 @@ are available at a URL. *Note:* +BR2_LINUX_KERNEL_PATCH+ specifies kernel patches that are applied after patches available in +BR2_GLOBAL_PATCH_DIR+, as it is done from a post-patch hook of the Linux package. + +[[customize-hashes]] +==== Providing extra hashes + +Buildroot bundles a xref:adding-packages-hash[list of hashes] against +which it checks the integrity of the downloaded archives, or of those +it generates locally from VCS checkouts. However, it can only do so +for the known versions; for packages where it is possible to specify +a custom version (e.g. a custom version string, a remote tarball URL, +or a VCS repository location and changeset), Buildroot can't carry +hashes for those. + +For users concerned with the integrity of such downloads, it is possible +to provide a list of hashes that Buildroot can use to check arbitrary +downloaded files. Those extra hashes are looked up similarly to the +extra patches (above); for each directory in +BR2_GLOBAL_PATCH_DIR+, +the first file to exist is used to check a package download: + +* +///.hash+ +* +//.hash+ + +The +utils/add-custom-hashes+ script can be used to generate these files. diff --git a/docs/manual/customize-quick-guide.txt b/docs/manual/customize-quick-guide.txt index 627ecbacb1e2..315027c5901c 100644 --- a/docs/manual/customize-quick-guide.txt +++ b/docs/manual/customize-quick-guide.txt @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt index d6efb31d4210..e63c9233eb2c 100644 --- a/docs/manual/makedev-syntax.txt +++ b/docs/manual/makedev-syntax.txt @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index 063ef984d824..dc35132ecfd2 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -144,24 +144,37 @@ AC_PROG_MAKE_SET +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) --------------- -=== Integrating patches found on the Web +=== Additional patch documentation -When integrating a patch of which you are not the author, you have to -add a few things in the header of the patch itself. +Ideally, all patches should document an upstream patch or patch submission, when +applicable, via the +Upstream+ trailer. -Depending on whether the patch has been obtained from the project -repository itself, or from somewhere on the web, add one of the -following tags: +When backporting an upstream patch that has been accepted into mainline, it is +preferred that the URL to the commit is referenced: --------------- -Backported from: +Upstream: --------------- -or +If a new issue is identified in Buildroot and upstream is generally affected by +the issue (it's not a Buildroot specific issue), users should submit the patch +upstream and provide a link to that submission when possible: --------------- -Fetch from: +Upstream: --------------- -It is also sensible to add a few words about any changes to the patch -that may have been necessary. +Patches that have been submitted but were denied upstream should note that and +include comments about why the patch is being used despite the upstream status. + +Note: in any of the above scenarios, it is also sensible to add a few words +about any changes to the patch that may have been necessary. + +If a patch does not apply upstream then this should be noted with a comment: + +--------------- +Upstream: N/A +--------------- + +Adding this documentation helps streamline the patch review process during +package version updates. \ No newline at end of file diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 48be489f90d4..262a5153f5a8 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -69,7 +69,7 @@ development packages typically have a _-dev_ or _-devel_ suffix. In the official tree, most of the package sources are retrieved using +wget+ from _ftp_, _http_ or _https_ locations. A few packages are only available through a version control system. Moreover, Buildroot is -capable of downloading sources via other tools, like +rsync+ or +scp+ +capable of downloading sources via other tools, like +git+ or +scp+ (refer to xref:download-infra[] for more details). If you enable packages using any of these methods, you will need to install the corresponding tool on the host system: @@ -78,7 +78,6 @@ corresponding tool on the host system: ** +cvs+ ** +git+ ** +mercurial+ -** +rsync+ ** +scp+ ** +sftp+ ** +subversion+ diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 758965d80a0a..13b7fd5bea6a 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -78,7 +78,7 @@ Do not align the +=+ signs. + --------------------- define LIBFOO_REMOVE_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \ + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef --------------------- @@ -118,7 +118,7 @@ YES: --------------------- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif @@ -128,7 +128,7 @@ NO: + --------------------- define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) diff --git a/docs/website/header.html b/docs/website/header.html index e1909291f68f..548ed7ad5329 100644 --- a/docs/website/header.html +++ b/docs/website/header.html @@ -6,7 +6,7 @@ - + Buildroot - Making Embedded Linux Easy diff --git a/linux/Config.in b/linux/Config.in index 5cbef197abbb..2d535e0afe69 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.82" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index f45b244e6bc4..eacdccecce00 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz +sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz -sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz -sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz +sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz +sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz +sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz -sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz +sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/Config.in b/package/Config.in index c7bb52d2788c..e9e8d93d6b18 100644 --- a/package/Config.in +++ b/package/Config.in @@ -796,6 +796,7 @@ menu "Perl libraries/modules" source "package/perl-class-method-modifiers/Config.in" source "package/perl-class-std/Config.in" source "package/perl-class-std-fast/Config.in" + source "package/perl-clone/Config.in" source "package/perl-convert-asn1/Config.in" source "package/perl-cookie-baker/Config.in" source "package/perl-crypt-blowfish/Config.in" @@ -966,6 +967,7 @@ menu "External python modules" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" + source "package/python-asttokens/Config.in" source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" @@ -1049,6 +1051,7 @@ menu "External python modules" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" + source "package/python-executing/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" @@ -1186,6 +1189,7 @@ menu "External python modules" source "package/python-psycopg2/Config.in" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" + source "package/python-pure-eval/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" source "package/python-pyalsa/Config.in" @@ -1304,6 +1308,7 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" + source "package/python-stack-data/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1b0..fff75cd1658d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -40,7 +40,8 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap/Config.in.host" + source "package/go-bootstrap-stage1/Config.in.host" + source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/Makefile.in b/package/Makefile.in index d70aded82ba5..e0f1c15881e8 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -17,7 +17,9 @@ else PARALLEL_JOBS := $(BR2_JLEVEL) endif -MAKE1 := $(HOSTMAKE) -j1 +# Only build one job at a time, *and* to not randomise goals and +# prerequisites ordering in make 4.4+ +MAKE1 := $(HOSTMAKE) -j1 $(if $(findstring --shuffle,$(MAKEFLAGS)),--shuffle=none) override MAKE = $(HOSTMAKE) \ $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) @@ -258,7 +260,9 @@ export PERL=$(shell which perl) # finds this perl module by exporting the proper value for PERL5LIB. export PERL5LIB=$(HOST_DIR)/lib/perl -TARGET_MAKE_ENV = PATH=$(BR_PATH) +TARGET_MAKE_ENV = \ + GIT_DIR=. \ + PATH=$(BR_PATH) TARGET_CONFIGURE_OPTS = \ $(TARGET_MAKE_ENV) \ @@ -302,6 +306,7 @@ TARGET_CONFIGURE_OPTS = \ HOST_MAKE_ENV = \ + GIT_DIR=. \ PATH=$(BR_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ diff --git a/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch new file mode 100644 index 000000000000..07981eff3e84 --- /dev/null +++ b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch @@ -0,0 +1,51 @@ +From 7e541e6dba8d4976bbb490838a09b569f38b047d Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Mon, 26 Jun 2023 17:45:00 +0200 +Subject: [PATCH] Snmpx: fix const/nonconst type mismatch + +Fixes build failure: + + snmp_pp_ext.cpp:1176:28: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers + 1176 | status = snmpmsg.load( pdu, community, version); + | ^~~ + +Fixes: + http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ + http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ + +Signed-off-by: Luca Ceresoli +Upstream: sent to katz.agentpp.com@magenta.de and support@agentpp.com +--- + include/agent_pp/snmp_pp_ext.h | 2 +- + src/snmp_pp_ext.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/agent_pp/snmp_pp_ext.h b/include/agent_pp/snmp_pp_ext.h +index 7c5a6783ee70..d8a46060db98 100644 +--- a/include/agent_pp/snmp_pp_ext.h ++++ b/include/agent_pp/snmp_pp_ext.h +@@ -807,7 +807,7 @@ public: + * SNMP_CLASS_SUCCESS on success and SNMP_CLASS_ERROR, + * SNMP_CLASS_TL_FAILED on failure. + */ +- int send (Pdux const &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); ++ int send (Pdux &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); + #endif + + /** +diff --git a/src/snmp_pp_ext.cpp b/src/snmp_pp_ext.cpp +index 54a29ec8ea28..b61cbf056246 100644 +--- a/src/snmp_pp_ext.cpp ++++ b/src/snmp_pp_ext.cpp +@@ -1203,7 +1203,7 @@ int Snmpx::send (Pdux &pdu, SnmpTarget* target) + + #else // _SNMPv3 is not defined + +-int Snmpx::send (Pdux const &pdu, ++int Snmpx::send (Pdux &pdu, + UdpAddress const &udp_address, + snmp_version version, + OctetStr const &community) +-- +2.34.1 + diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 99aae7026363..527414eed546 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5f2cfe98fd1d50683e02c65fccd9423351254df427e5825e4f321c488a9234eb agent++-4.5.4.tar.gz +sha256 e09dc2d40277d468c18f1539ad18f43e0c3a95b10fad8a02184e9ace8bac0d67 agent++-4.6.0.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index d020228e44bf..7616d3eb0c45 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,13 +4,14 @@ # ################################################################################ -AGENTPP_VERSION = 4.5.4 +AGENTPP_VERSION = 4.6.0 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 AGENTPP_LICENSE_FILES = LICENSE-2_0.txt AGENTPP_INSTALL_STAGING = YES AGENTPP_DEPENDENCIES = host-pkgconf snmppp +AGENTPP_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" AGENTPP_CONF_OPTS += \ --disable-proxy \ --disable-forwarder \ diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 5728ebfe37b2..d23a81c5eed7 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -20,6 +20,10 @@ ALSA_PLUGINS_CONF_OPTS = \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) +ALSA_PLUGINS_DEPENDENCIES += alsa-utils +endif + ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) ALSA_PLUGINS_CONF_OPTS += --enable-samplerate ALSA_PLUGINS_DEPENDENCIES += libsamplerate diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 36144917fba1..854bc85dcc54 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.56.tar.bz2.{sha256,sha512} -sha256 d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c httpd-2.4.56.tar.bz2 -sha512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 httpd-2.4.56.tar.bz2 +# From https://archive.apache.org/dist/httpd/httpd-2.4.58.tar.bz2.{sha256,sha512} +sha256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 httpd-2.4.58.tar.bz2 +sha512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 httpd-2.4.58.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 80205a63620c..3efa6b0ac19c 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.56 +APACHE_VERSION = 2.4.58 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,7 +17,7 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre2 +APACHE_DEPENDENCIES = host-pkgconf apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ diff --git a/package/apcupsd/apcupsd.mk b/package/apcupsd/apcupsd.mk index 80ed0b08327e..97e6d6a55811 100644 --- a/package/apcupsd/apcupsd.mk +++ b/package/apcupsd/apcupsd.mk @@ -71,8 +71,8 @@ APCUPSD_CONF_OPTS += --disable-usb endif define APCUPSD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/platforms + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/platforms endef define APCUPSD_INSTALL_TARGET_CMDS diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 5ffb50cd79c2..4bddb3598d8c 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help @@ -14,8 +14,6 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org -comment "assimp needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -comment "assimp needs exception_ptr" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "assimp needs a toolchain w/ C++, wchar, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 98ee3bdc71c9..41e1da29628d 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9b93006a87be9c29492299118200e4f66c8369851c66a50fdef5b15dfc4eb2c2 asterisk-16.29.1.tar.gz +sha256 ef1ddc07dc02bb0c5f5ba58a5e42e42bcb63e55ac94199be8e3b5d3910f43736 asterisk-16.30.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 22ac0334fd0b..4f1a80ba8bee 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.29.1 +ASTERISK_VERSION = 16.30.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index 9e2bb2830ca9..08cf86b3df9d 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.sha256sum -sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.sha256sum +sha256 6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079 atkmm-2.36.2.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b04706..8afd0586437b 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -5,7 +5,7 @@ ################################################################################ ATKMM_VERSION_MAJOR = 2.36 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 +ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index 64174a113ddc..bfc627fa919a 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -9,6 +9,7 @@ AUBIO_SITE = https://aubio.org/pub AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 AUBIO_LICENSE = GPL-3.0+ AUBIO_LICENSE_FILES = COPYING +AUBIO_CPE_ID_VENDOR = aubio AUBIO_INSTALL_STAGING = YES AUBIO_DEPENDENCIES = host-pkgconf diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk index d954f0295878..32f3bca1514d 100644 --- a/package/aufs-util/aufs-util.mk +++ b/package/aufs-util/aufs-util.mk @@ -6,7 +6,7 @@ # linux-headers AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION)) -AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util +AUFS_UTIL_SITE = https://git.code.sf.net/p/aufs/aufs-util AUFS_UTIL_SITE_METHOD = git AUFS_UTIL_LICENSE = GPL-2.0 AUFS_UTIL_LICENSE_FILES = COPYING diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk index 4e95a350a028..d00e7a1a2118 100644 --- a/package/aufs/aufs.mk +++ b/package/aufs/aufs.mk @@ -9,7 +9,7 @@ AUFS_LICENSE = GPL-2.0 AUFS_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_AUFS_SERIES),3) -AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone +AUFS_SITE = https://git.code.sf.net/p/aufs/aufs3-standalone AUFS_SITE_METHOD = git else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4) AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION)) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 42fdd56b4887..fef8dcccd069 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -14,4 +14,10 @@ AZURE_IOT_SDK_C_INSTALL_STAGING = YES AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON +ifeq ($(BR2_STATIC_LIBS),y) +AZURE_IOT_SDK_C_CONF_OPTS += -Duse_prov_client=OFF +else +AZURE_IOT_SDK_C_CONF_OPTS += -Duse_prov_client=ON +endif + $(eval $(cmake-package)) diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.mk b/package/bayer2rgb-neon/bayer2rgb-neon.mk index 212fe7676669..5147a985e872 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.mk +++ b/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -19,6 +19,14 @@ ifeq ($(BR2_arm),y) BAYER2RGB_NEON_CFLAGS += -mfpu=neon endif +# __builtin_prefetch() third argument must be a constant, but +# bayer2rgb-neon uses a variable, derived from a constant, so some +# optimization is needed to allow the compiler to turn it into a +# constant, otherwise the build fails +ifeq ($(BR2_OPTIMIZE_0),y) +BAYER2RGB_NEON_CFLAGS += -O1 +endif + BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(BAYER2RGB_NEON_CFLAGS)" $(eval $(autotools-package)) diff --git a/package/berkeleydb/Config.in b/package/berkeleydb/Config.in index f32d13ab1708..f8fbb5cc0934 100644 --- a/package/berkeleydb/Config.in +++ b/package/berkeleydb/Config.in @@ -13,6 +13,11 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185 help Build and install DB 1.85 compatibility API. +config BR2_PACKAGE_BERKELEYDB_DBM + bool "historic dbm interface" + help + Enable the historic dbm interface. + config BR2_PACKAGE_BERKELEYDB_TOOLS bool "install tools" help diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 36b1894f3407..1c121370db2e 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -39,6 +39,7 @@ define BERKELEYDB_CONFIGURE_CMDS --disable-java \ --disable-tcl \ $(if $(BR2_PACKAGE_BERKELEYDB_COMPAT185),--enable-compat185,--disable-compat185) \ + $(if $(BR2_PACKAGE_BERKELEYDB_DBM),--enable-dbm,--disable-dbm) \ $(SHARED_STATIC_LIBS_OPTS) \ --with-pic \ --enable-o_direct \ diff --git a/package/bind/Config.in b/package/bind/Config.in index 63ccd57db7c0..512e948ca226 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BIND depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_OPENSSL help @@ -43,7 +44,8 @@ config BR2_PACKAGE_BIND_TOOLS endif -comment "bind needs a toolchain w/ NPTL, dynamic library" +comment "bind needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 32804b5ce038..482b046c8d1b 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 70987a982381..0d81ffabd688 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.38 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. @@ -14,8 +14,6 @@ BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc BIND_SELINUX_MODULES = bind -# Only applies to RHEL6.x with DNSSEC validation on -BIND_IGNORE_CVES = CVE-2017-3139 # Library CVE and not used by bind but used by ISC DHCP BIND_IGNORE_CVES += CVE-2019-6470 BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage @@ -28,7 +26,6 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ --without-cmocka \ @@ -39,6 +36,14 @@ BIND_CONF_OPTS = \ BIND_DEPENDENCIES = host-pkgconf libuv openssl +BIND_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +BIND_CFLAGS += -O0 +endif + +BIND_CONF_OPTS += CFLAGS="$(BIND_CFLAGS)" + ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 1a8574de92be..5d45813b5ac9 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 3e00a1993db6..a62fbba630e9 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz +sha256 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 bird-2.0.12.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 1295358fb9de..f1b2ee6c5ea0 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.11 +BIRD_VERSION = 2.0.12 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README diff --git a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch b/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch deleted file mode 100644 index 8038a311d362..000000000000 --- a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 9 Nov 2020 21:18:40 +0100 -Subject: [PATCH] src/randomenv.cpp: fix build on uclibc - -Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using -getauxval to avoid a build failure on uclibc - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/bitcoin/bitcoin/pull/20358] ---- - src/randomenv.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/randomenv.cpp b/src/randomenv.cpp -index 07122b7f6..5e07c3db4 100644 ---- a/src/randomenv.cpp -+++ b/src/randomenv.cpp -@@ -53,7 +53,7 @@ - #include - #endif - #endif --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - #include - #endif - -@@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher) - // Bitcoin client version - hasher << CLIENT_VERSION; - --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - // Information available through getauxval() - # ifdef AT_HWCAP - hasher << getauxval(AT_HWCAP); -@@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher) - const char* exec_str = (const char*)getauxval(AT_EXECFN); - if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1); - # endif --#endif // __linux__ -+#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL - - #ifdef HAVE_GETCPUID - AddAllCPUID(hasher); --- -2.28.0 - diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index a344811d6b45..c4a2447fc959 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -11,8 +11,8 @@ config BR2_PACKAGE_BITCOIN bool "bitcoin" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST @@ -36,12 +36,9 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org -comment "bitcoin needs a toolchain w/ C++, threads, wchar" +comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "bitcoin needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 643fcbc14199..6b3008af863c 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,7 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc -sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz +# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS +# After checking pgp signature from: +# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc +sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz # Hash for license file -sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING +sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 10ae32202cf5..493c569336a0 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 0.21.2 +BITCOIN_VERSION = 26.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 83dfce61776c..649810b0ad43 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -20,6 +20,10 @@ BLUEZ_ALSA_CONF_OPTS = \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d +ifeq ($(BR2_PACKAGE_ALSA_PLUGINS),y) +BLUEZ_ALSA_DEPENDENCIES += alsa-plugins +endif + ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac BLUEZ_ALSA_CONF_OPTS += --enable-aac diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 59fbc950b01b..6cc211912c7f 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -67,6 +67,11 @@ BOTAN_DEPENDENCIES += sqlite BOTAN_CONF_OPTS += --with-sqlite endif +ifeq ($(BR2_PACKAGE_TROUSERS),y) +BOTAN_DEPENDENCIES += trousers +BOTAN_CONF_OPTS += --with-tpm +endif + ifeq ($(BR2_PACKAGE_XZ),y) BOTAN_DEPENDENCIES += xz BOTAN_CONF_OPTS += --with-lzma @@ -85,6 +90,10 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) BOTAN_CONF_OPTS += --disable-neon endif +ifeq ($(BR2_SOFT_FLOAT),y) +BOTAN_CONF_OPTS += --disable-neon +endif + define BOTAN_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) endef diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index dc5a38cddb10..4cab635b0c34 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch new file mode 100644 index 000000000000..4a194612b466 --- /dev/null +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch @@ -0,0 +1,39 @@ +From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 10 Apr 2023 17:26:04 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a +--- + miscutils/seedrng.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 967741dc7..7cc855141 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -45,6 +45,20 @@ + #include + #include + ++/* Fix up glibc <= 2.24 not having getrandom() */ ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++#include ++# define getrandom(...) bb_getrandom(__VA_ARGS__) ++static ssize_t getrandom(void *buffer, size_t length, unsigned flags) ++{ ++# if defined(__NR_getrandom) ++ return syscall(__NR_getrandom, buffer, length, flags); ++# else ++ return ENOSYS; ++# endif ++} ++#endif ++ + #ifndef GRND_INSECURE + #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ + #endif +-- +2.39.1 + diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch new file mode 100644 index 000000000000..d7298848056f --- /dev/null +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch @@ -0,0 +1,60 @@ +From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 10 Apr 2023 19:58:15 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header + + - dropped the wrong define (not sure why it was there) + - not available if glibc <= 2.24 + - GRND_NONBLOCK not defined if not included + - ret < 0 && errno == ENOSYS has to be true to get creditable set + +Signed-off-by: Thomas Devoogdt +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf +--- + miscutils/seedrng.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 7cc855141..3bf6e2ea7 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -42,25 +42,31 @@ + #include "libbb.h" + + #include +-#include + #include + + /* Fix up glibc <= 2.24 not having getrandom() */ + #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 + #include +-# define getrandom(...) bb_getrandom(__VA_ARGS__) + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { + # if defined(__NR_getrandom) + return syscall(__NR_getrandom, buffer, length, flags); + # else +- return ENOSYS; ++ errno = ENOSYS; ++ return -1; + # endif + } ++#else ++#include ++#endif ++ ++/* Apparently some headers don't ship with this yet. */ ++#ifndef GRND_NONBLOCK ++#define GRND_NONBLOCK 0x0001 + #endif + + #ifndef GRND_INSECURE +-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ ++#define GRND_INSECURE 0x0004 + #endif + + #define DEFAULT_SEED_DIR "/var/lib/seedrng" +-- +2.39.1 + diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch new file mode 100644 index 000000000000..140b27cae671 --- /dev/null +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -0,0 +1,124 @@ +From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Tue, 18 Apr 2023 15:54:43 +0200 +Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc <= 2.24 does not provide getrandom(). A check for it has been +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. + +However, building with a libc other than glibc can lead to the same +problem as not every other libc has getrandom() either: + +- uClibc provides it from v1.0.2 onwards, but requires to define +_GNU_SOURCE (all versions - we already define it by default), and +stddef to be included first (when using uClibc < 1.0.35 - we already +include it through libbb.h). + +- musl libc has getrandom(), but only from version 1.1.20 onwards. As +musl does not provide __MUSL__ or version information, it's not +possible to check for it like we did for glibc. + +All of this makes it difficult (or impossible in case of musl) to +check what we need to do to have getrandom() based on each libc +versions. + +On top of that, getrandom() is also not available on older kernels. As +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() +is declared so compiling works, but it fails at link time because +getrandom() is not defined. + +To make it easier, take a similar approach to what was done for the +crypt library: try to build a sample program to see if we have +getrandom(). To keep it compatible with different versions of +make (for reference see [1]), a variable for '#' is also introduced. + +Based on the new Makefile variable, we now either use the +libc-provided getrandom() when it's available, or use our own +implementation when it's not (like it was the case already for glibc < +2.25). + +This should fix compiling with many libc/kernel combinations. + +[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +Signed-off-by: Raphaël Mélotte +Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html +--- +Changes v3 -> v4: + - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier. + +Changes v2 -> v3: + - fix _GNU_SOURCE define location + +Changes v1 -> v2: + - move _GNU_SOURCE to bb_libtest.c + - remove GRND_NONBLOCK + +Note that I was not able to test every single combination, but I could +confirm it builds successfully for: +uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) +uClibc 1.0.36, linux headers 4.9 (libc getrandom used) +musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) +musl 1.2.1, linux headers (libc getrandom used) +glibc 2.25, linux headers 4.10 (libc getrandom used) + + Makefile.flags | 12 ++++++++++++ + miscutils/seedrng.c | 8 ++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/Makefile.flags b/Makefile.flags +index 1cec5ba20..0d437303a 100644 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y) + LDLIBS += rt + endif + ++# GNU Make version 4.2.1 and earlier require number signs ('#') ++# inside function invocations to be escaped, while versions 4.3+ ++# require them to be unescaped. Use a variable for it so that it works ++# for both versions: ++C := \# ++# Not all libc versions have getrandom, so check for it: ++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude \n$Cinclude \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) ++ ++ifeq ($(HAVE_GETRANDOM),y) ++CFLAGS += -DHAVE_GETRANDOM ++endif ++ + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. + # However, on *other platforms* it fails when some of those flags +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 3bf6e2ea7..2f1e18c32 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -44,8 +44,10 @@ + #include + #include + +-/* Fix up glibc <= 2.24 not having getrandom() */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ ++#if defined HAVE_GETRANDOM ++#include ++#else /* No getrandom */ + #include + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + return -1; + # endif + } +-#else +-#include + #endif + + /* Apparently some headers don't ship with this yet. */ +-- +2.39.1 + diff --git a/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch new file mode 100644 index 000000000000..8ebb487ec6d3 --- /dev/null +++ b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch @@ -0,0 +1,103 @@ +From 93e0898c663a533082b5f3c2e7dcce93ec47076d Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 26 Jan 2023 12:56:33 +0100 +Subject: [PATCH] shell: fix SIGWINCH and SIGCHLD (in hush) interrupting line + input, closes 15256 + +function old new delta +record_pending_signo 32 63 +31 +lineedit_read_key 231 224 -7 +------------------------------------------------------------------------------ +(add/remove: 0/0 grow/shrink: 1/1 up/down: 31/-7) Total: 24 bytes + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=93e0898c663a533082b5f3c2e7dcce93ec47076d +Signed-off-by: Romain Naour +--- + libbb/lineedit.c | 17 ++++++++++------- + shell/ash.c | 3 ++- + shell/hush.c | 10 ++++++++-- + 3 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/libbb/lineedit.c b/libbb/lineedit.c +index d6b2e76ff..b942f540a 100644 +--- a/libbb/lineedit.c ++++ b/libbb/lineedit.c +@@ -2180,7 +2180,8 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + * "\xff\n",pause,"ls\n" invalid and thus won't lose "ls". + * + * If LI_INTERRUPTIBLE, return -1 if got EINTR in poll() +- * inside read_key, or if bb_got_signal != 0 (IOW: if signal ++ * inside read_key and bb_got_signal became != 0, ++ * or if bb_got_signal != 0 (IOW: if signal + * arrived before poll() is reached). + * + * Note: read_key sets errno to 0 on success. +@@ -2197,14 +2198,16 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;) + if (errno != EINTR) + break; ++ /* It was EINTR. Repeat read_key() unless... */ + if (state->flags & LI_INTERRUPTIBLE) { +- /* LI_INTERRUPTIBLE bails out on EINTR, +- * but nothing really guarantees that bb_got_signal +- * is nonzero. Follow the least surprise principle: ++ /* LI_INTERRUPTIBLE bails out on EINTR ++ * if bb_got_signal became nonzero. ++ * (It may stay zero: for example, our SIGWINCH ++ * handler does not set it. This is used for signals ++ * which should not interrupt line editing). + */ +- if (bb_got_signal == 0) +- bb_got_signal = 255; +- goto ret; ++ if (bb_got_signal != 0) ++ goto ret; /* will return -1 */ + } + } + +diff --git a/shell/ash.c b/shell/ash.c +index 18ccc1329..5f8c8ea19 100644 +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -10821,7 +10821,8 @@ preadfd(void) + again: + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +diff --git a/shell/hush.c b/shell/hush.c +index d111f0cc5..f064b8fd2 100644 +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -1946,7 +1946,12 @@ static void record_pending_signo(int sig) + { + sigaddset(&G.pending_set, sig); + #if ENABLE_FEATURE_EDITING +- bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ if (sig != SIGCHLD ++ || (G_traps && G_traps[SIGCHLD] && G_traps[SIGCHLD][0]) ++ /* ^^^ if SIGCHLD, interrupt line reading only if it has a trap */ ++ ) { ++ bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ } + #endif + #if ENABLE_HUSH_FAST + if (sig == SIGCHLD) { +@@ -2669,7 +2674,8 @@ static int get_user_input(struct in_str *i) + } else { + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +-- +2.30.2 + diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1fb4e39e21d3..1e7ad1d357e1 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 4826fb824286..6e8bd2799d1b 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 6d1c36906dd2..6eba365ecc77 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sha256 +sha256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox-1.36.1.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1633ca525d15..eb5e7ad9222a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.36.0 +BUSYBOX_VERSION = 1.36.1 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 @@ -276,6 +276,15 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES endef endif +# Disable SHA1 and SHA256 HWACCEL to avoid segfault in init +# with some x86 toolchains (mostly musl?). +ifeq ($(BR2_i386),y) +define BUSYBOX_MUSL_DISABLE_SHA_HWACCEL + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA1_HWACCEL) + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA256_HWACCEL) +endef +endif + # Only install our logging scripts if no other package does it. ifeq ($(BR2_PACKAGE_SYSKLOGD)$(BR2_PACKAGE_RSYSLOG)$(BR2_PACKAGE_SYSLOG_NG),) define BUSYBOX_INSTALL_LOGGING_SCRIPT @@ -364,6 +373,7 @@ endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS define BUSYBOX_KCONFIG_FIXUP_CMDS + $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) $(BUSYBOX_PREFER_STATIC) $(BUSYBOX_SET_MDEV) diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index de09eafae5f5..bf3ed74afcfa 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -9,6 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING +BWM_NG_CPE_ID_VENDOR = bwm-ng_project BWM_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index edf891674ba5..9a2b69c73111 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file -sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md +sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 4332fc6919d0..c4441255a2d2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,13 +4,13 @@ # ################################################################################ -C_ARES_VERSION = 1.19.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch index b76c1bfd7f55..ed90c217eca8 100644 --- a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -1,4 +1,4 @@ -From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From a4e468a2a0afa80df174831c2f422184820bb0fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Jan 2022 23:15:00 +0100 Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional @@ -14,38 +14,39 @@ cryptography Python module is there, we perform the check, otherwise the check is skipped. Signed-off-by: Thomas Petazzoni +[Steve: refreshed to apply on ca-certificates version 20230311] +Signed-off-by: Steve Hay --- - mozilla/certdata2pem.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + mozilla/certdata2pem.py | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index ede23d4..a6261f8 100644 +index 4df86a2..3a6d7dc 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py -@@ -28,9 +28,6 @@ import sys +@@ -28,8 +28,6 @@ import sys import textwrap import io -from cryptography import x509 - -- + objects = [] - # Dirty file parser. -@@ -122,11 +119,16 @@ for obj in objects: +@@ -122,11 +120,16 @@ for obj in objects: if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: continue -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -- if cert.not_valid_after < datetime.datetime.now(): +- cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) +- if cert.not_valid_after < datetime.datetime.utcnow(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) - print('!'*74) + try: + from cryptography import x509 + -+ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ if cert.not_valid_after < datetime.datetime.now(): ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) ++ if cert.not_valid_after < datetime.datetime.utcnow(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) + print('!'*74) @@ -55,5 +56,5 @@ index ede23d4..a6261f8 100644 bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ .replace(' ', '_')\ -- -2.33.1 +2.30.2 diff --git a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch deleted file mode 100644 index 0537da92242d..000000000000 --- a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5e493ca307a031e81528ceddb96f3da40bc062cf Mon Sep 17 00:00:00 2001 -From: Wataru Ashihara -Date: Wed, 2 Nov 2022 12:40:05 -0400 -Subject: [PATCH] mozilla/certdata2pem.py: Fix compat with cryptography > 3.0 - -In newer cryptography packages, load_der_x509_certificate is enforced to be 'bytes' rather than currently used 'bytearray'. This fixes that. - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 -Signed-off-by: Justin Wood ---- - mozilla/certdata2pem.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index a6261f8..c0fa52c 100644 ---- a/mozilla/certdata2pem.py -+++ b/mozilla/certdata2pem.py -@@ -122,7 +122,7 @@ for obj in objects: - try: - from cryptography import x509 - -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) - if cert.not_valid_after < datetime.datetime.now(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) --- -2.38.1 - diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index a1675b999e73..8a5b48dd7916 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,4 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 bce5a8fac45456dbebf256f3a812c6cd0a853e3e ca-certificates_20211016.tar.xz -sha256 2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 ca-certificates_20211016.tar.xz - +sha256 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 ca-certificates_20230311.tar.xz # Locally computed sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 0b6962ab7b86..202d0b92ac51 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20211016 +CA_CERTIFICATES_VERSION = 20230311 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20230317T205011Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index e8a704c7da65..7bc8f92debe5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -26,7 +26,7 @@ ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" endif diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index 75f6692b8ab9..174f3967abdb 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_CAIROMM help The cairomm package is a set of C++ bindings for Cairo. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU diff --git a/package/cairomm/cairomm.hash b/package/cairomm/cairomm.hash index d14a65c2d6f7..254413af0907 100644 --- a/package/cairomm/cairomm.hash +++ b/package/cairomm/cairomm.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.16.2.tar.xz.sha1 +sha1 c24339d5962e2bcbbea85b2fc66347e71fd3db8c cairomm-1.16.2.tar.xz + # Locally computed -sha256 bb86d855041bd46d31b03e43ea355d233de44034b39d4200725b1e0947e63e67 cairomm-1.16.1.tar.gz +sha256 6a63bf98a97dda2b0f55e34d1b5f3fb909ef8b70f9b8d382cb1ff3978e7dc13f cairomm-1.16.2.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm/cairomm.mk b/package/cairomm/cairomm.mk index 856c9d67fc26..571512878e23 100644 --- a/package/cairomm/cairomm.mk +++ b/package/cairomm/cairomm.mk @@ -4,10 +4,11 @@ # ################################################################################ -CAIROMM_VERSION = 1.16.1 +CAIROMM_VERSION = 1.16.2 CAIROMM_LICENSE = LGPL-2.0+ CAIROMM_LICENSE_FILES = COPYING -CAIROMM_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM_VERSION) +CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz +CAIROMM_SITE = https://cairographics.org/releases CAIROMM_INSTALL_STAGING = YES CAIROMM_DEPENDENCIES = cairo libglib2 libsigc host-pkgconf CAIROMM_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in index 6e767d242831..e369aa6f4ad2 100644 --- a/package/cairomm1_14/Config.in +++ b/package/cairomm1_14/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CAIROMM1_14 This is the last version before the API and ABI change introduced in 1.16.0 which requires C++17. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash index 521e7cc54669..6d58de360abe 100644 --- a/package/cairomm1_14/cairomm1_14.hash +++ b/package/cairomm1_14/cairomm1_14.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.14.4.tar.xz.sha1 +sha1 a58419bb9792a2c998631704ce5671c38e0c82a1 cairomm-1.14.4.tar.xz + # Locally computed -sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 4749d25a2b2ef67cc0c014caaf5c87fa46792fc4b3ede186fb0fc932d2055158 cairomm-1.14.4.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk index 5d076ddf0a4a..6502d34c5a4e 100644 --- a/package/cairomm1_14/cairomm1_14.mk +++ b/package/cairomm1_14/cairomm1_14.mk @@ -7,8 +7,8 @@ CAIROMM1_14_VERSION = 1.14.4 CAIROMM1_14_LICENSE = LGPL-2.0+ CAIROMM1_14_LICENSE_FILES = COPYING -CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.gz -CAIROMM1_14_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM1_14_VERSION) +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.xz +CAIROMM1_14_SITE = https://cairographics.org/releases CAIROMM1_14_INSTALL_STAGING = YES CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false diff --git a/package/check/check.mk b/package/check/check.mk index ccffd08ee39d..d3977154df2f 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,12 +10,6 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER -CHECK_CONF_OPTS = --disable-build-docs +CHECK_CONF_OPTS = -DBUILD_TESTING=OFF -DINSTALL_CHECKMK=OFF -# Having checkmk in the target makes no sense -define CHECK_REMOVE_CHECKMK - rm -f $(TARGET_DIR)/usr/bin/checkmk -endef -CHECK_POST_INSTALL_TARGET_HOOKS += CHECK_REMOVE_CHECKMK - -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk index 8318c123bd95..581b2c51c230 100644 --- a/package/chocolate-doom/chocolate-doom.mk +++ b/package/chocolate-doom/chocolate-doom.mk @@ -8,6 +8,8 @@ CHOCOLATE_DOOM_VERSION = 3.0.1 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ CHOCOLATE_DOOM_LICENSE_FILES = COPYING +CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom +CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net # Avoid installing desktop entries, icons, etc. diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index c39e884cdd95..305dc0d7b865 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 cjson-1.7.15.tar.gz +sha256 c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c cjson-1.7.17.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index ad9d76a4bab2..f699c160ef9e 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = 1.7.15 +CJSON_VERSION = 1.7.17 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT diff --git a/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch deleted file mode 100644 index d4be5c7b297f..000000000000 --- a/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 7 May 2018 23:15:58 +0200 -Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace - support - -Since uClibc can be configured without support for backtrace, disable -the backtrace if we are building with a uClibc that was built without -backtrace. - -This is a bit hacky, and would greatly benefit from a test in ./configure -instead, but does nicely as a quick fix for now. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Bernd Kuhls -[Bernd: rebased for 0.103.0] ---- - libclamav/mbox.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libclamav/mbox.c b/libclamav/mbox.c -index 71f540c0a..4851297a9 100644 ---- a/libclamav/mbox.c -+++ b/libclamav/mbox.c -@@ -91,7 +91,7 @@ - #include - #endif - --#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__) - #define HAVE_BACKTRACE - #endif - #endif --- -2.14.3 - diff --git a/package/clamav/Config.in b/package/clamav/Config.in index 2857f9cbf439..ae5cad036ad7 100644 --- a/package/clamav/Config.in +++ b/package/clamav/Config.in @@ -1,14 +1,20 @@ config BR2_PACKAGE_CLAMAV bool "clamav" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen depends on BR2_USE_WCHAR + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMSPACK + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help @@ -20,4 +26,5 @@ config BR2_PACKAGE_CLAMAV comment "clamav needs a toolchain w/ C++, dynamic library, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 27f9b16a3922..cd03a1184027 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,14 +1,14 @@ # Locally calculated -sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz -sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING -sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 -sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file -sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING.getopt -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL -sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING.llvm -sha256 d96d71b66aa32c4a2d1619b9ca3347dafa9460bcf0fb5ac2408916067ad31dfc COPYING.lzma -sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING.pcre -sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING.regex -sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING.unrar -sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING.YARA -sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING.zlib +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz +sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt +sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 +sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file +sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING/COPYING.getopt +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING/COPYING.LGPL +sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING/COPYING.llvm +sha256 c7cbcf00b59dc61165b655b45bf6c21bb685d593861e7abbc78460c499167b42 COPYING/COPYING.lzma +sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING/COPYING.pcre +sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING/COPYING.regex +sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING/COPYING.unrar +sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING/COPYING.YARA +sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING/COPYING.zlib diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 0f0491bf0d3f..7c6dfce6f222 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,30 +4,38 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.8 +CLAMAV_VERSION = 1.0.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 -CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ - COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \ - COPYING.unrar COPYING.zlib +CLAMAV_LICENSE_FILES = \ + COPYING.txt \ + COPYING/COPYING.bzip2 \ + COPYING/COPYING.file \ + COPYING/COPYING.getopt \ + COPYING/COPYING.LGPL \ + COPYING/COPYING.llvm \ + COPYING/COPYING.lzma \ + COPYING/COPYING.pcre \ + COPYING/COPYING.regex \ + COPYING/COPYING.unrar \ + COPYING/COPYING.zlib CLAMAV_CPE_ID_VENDOR = clamav CLAMAV_SELINUX_MODULES = clamav # affects only Cisco devices CLAMAV_IGNORE_CVES += CVE-2016-1405 CLAMAV_DEPENDENCIES = \ + bzip2 \ host-pkgconf \ + host-rustc \ + json-c \ libcurl \ libmspack \ + libxml2 \ openssl \ + pcre2 \ zlib \ $(TARGET_NLS_DEPENDENCIES) -# mmap cannot be detected when cross-compiling, needed for mempool support -CLAMAV_CONF_ENV = \ - ac_cv_c_mmap_private=yes \ - have_cv_ipv6=yes \ - OBJC=$(TARGET_CC) - ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) CLAMAV_LIBS += -latomic endif @@ -40,66 +48,27 @@ endif CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" CLAMAV_CONF_OPTS = \ - --with-dbdir=/var/lib/clamav \ - --with-libcurl=$(STAGING_DIR)/usr \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-system-libmspack=$(STAGING_DIR)/usr \ - --with-zlib=$(STAGING_DIR)/usr \ - --disable-zlib-vcheck \ - --disable-rpath \ - --disable-clamav \ - --disable-milter \ - --disable-llvm \ - --disable-clamdtop \ - --enable-mempool - -ifeq ($(BR2_PACKAGE_BZIP2),y) -CLAMAV_DEPENDENCIES += bzip2 -# autodetection gets confused if host has bzip2, so force it -CLAMAV_CONF_ENV += \ - ac_cv_libbz2_libs=-lbz2 \ - ac_cv_libbz2_ltlibs=-lbz2 -else -CLAMAV_CONF_OPTS += --disable-bzip2 -endif - -ifeq ($(BR2_PACKAGE_JSON_C),y) -CLAMAV_CONF_OPTS += --with-libjson=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += json-c -else -CLAMAV_CONF_OPTS += --without-libjson -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -CLAMAV_CONF_ENV += ac_cv_path_xmlconfig=$(STAGING_DIR)/usr/bin/xml2-config -CLAMAV_CONF_OPTS += --with-xml=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += libxml2 -else -CLAMAV_CONF_OPTS += --disable-xml -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -CLAMAV_CONF_OPTS += --with-iconv -CLAMAV_DEPENDENCIES += libiconv -else -CLAMAV_CONF_OPTS += --without-iconv -endif - -ifeq ($(BR2_PACKAGE_PCRE2),y) -CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += pcre2 -else ifeq ($(BR2_PACKAGE_PCRE),y) -CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += pcre -else -CLAMAV_CONF_OPTS += --without-pcre -endif + -DCMAKE_SKIP_INSTALL_RPATH=ON \ + -DENABLE_JSON_SHARED=ON \ + -DENABLE_MAN_PAGES=OFF \ + -DENABLE_MILTER=OFF \ + -DENABLE_TESTS=OFF \ + -DHAVE_SYSTEM_LFS_FTS=ON \ + -DRUST_COMPILER_TARGET=$(RUSTC_TARGET_NAME) \ + -Dtest_run_result=ON \ + -Dtest_run_result__TRYRUN_OUTPUT=ON +ifeq ($(BR2_PACKAGE_NCURSES),y) +CLAMAV_CONF_OPTS += -DENABLE_APP=ON +CLAMAV_DEPENDENCIES += ncurses ifeq ($(BR2_INIT_SYSTEMD),y) -CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +CLAMAV_CONF_OPTS += -DENABLE_SYSTEMD=ON CLAMAV_DEPENDENCIES += systemd else -CLAMAV_CONF_OPTS += --with-systemdsystemunitdir=no +CLAMAV_CONF_OPTS += -DENABLE_SYSTEMD=OFF +endif +else +CLAMAV_CONF_OPTS += -DENABLE_APP=OFF -DENABLE_SYSTEMD=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 3c47fdcb497d..00692fe78a9d 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ BR2_i386 || BR2_x86_64 || BR2_xtensa || \ - BR2_s390x + BR2_s390x || BR2_riscv config BR2_PACKAGE_CMAKE bool @@ -14,7 +14,7 @@ config BR2_PACKAGE_CMAKE config BR2_PACKAGE_CMAKE_CTEST bool "ctest" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # jsoncpp, libuv depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS @@ -40,10 +40,10 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.9, NPTL" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b2e210ee2cb0..5de076537bc5 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -9,3 +9,30 @@ config BR2_PACKAGE_HOST_CMAKE the compiler environment of your choice. http://www.cmake.org/ + +# The minimum system cmake version we expect if 3.18 as provided by +# Debian bullseye, that we use in our reference build docker image. +config BR2_HOST_CMAKE_AT_LEAST_3_19 + bool + +config BR2_HOST_CMAKE_AT_LEAST_3_20 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_19 + +config BR2_HOST_CMAKE_AT_LEAST_3_21 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_20 + +config BR2_HOST_CMAKE_AT_LEAST_3_22 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_21 + +# This order guarantees that the highest version is set, as kconfig +# stops affecting a value on the first matching default. +config BR2_HOST_CMAKE_AT_LEAST + string + default "3.22" if BR2_HOST_CMAKE_AT_LEAST_3_22 + default "3.21" if BR2_HOST_CMAKE_AT_LEAST_3_21 + default "3.20" if BR2_HOST_CMAKE_AT_LEAST_3_20 + default "3.19" if BR2_HOST_CMAKE_AT_LEAST_3_19 + default "3.18" diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad60d..56c92e53e9ac 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,6 +4,7 @@ # ################################################################################ +# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.22 CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk index eafb4898e1e4..297f95f46504 100644 --- a/package/cmocka/cmocka.mk +++ b/package/cmocka/cmocka.mk @@ -21,4 +21,9 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON endif +# gcc for ARM Thumb1 doesn't implement -fstack-clash-protection +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +CMOCKA_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + $(eval $(cmake-package)) diff --git a/package/compiler-rt/compiler-rt.mk b/package/compiler-rt/compiler-rt.mk index c8ea86e899fe..fbf4707bfc37 100644 --- a/package/compiler-rt/compiler-rt.mk +++ b/package/compiler-rt/compiler-rt.mk @@ -12,6 +12,7 @@ COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmor COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_DEPENDENCIES = host-clang llvm +COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO COMPILER_RT_INSTALL_STAGING = YES COMPILER_RT_INSTALL_TARGET = NO diff --git a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch deleted file mode 100644 index d1a9d8f8fe28..000000000000 --- a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001 -From: Nathan Crandall -Date: Tue, 12 Jul 2022 08:56:34 +0200 -Subject: gweb: Fix OOB write in received_data() - -There is a mismatch of handling binary vs. C-string data with memchr -and strlen, resulting in pos, count, and bytes_read to become out of -sync and result in a heap overflow. Instead, do not treat the buffer -as an ASCII C-string. We calculate the count based on the return value -of memchr, instead of strlen. - -Fixes: CVE-2022-32292 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd] -Signed-off-by: Fabrice Fontaine ---- - gweb/gweb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gweb/gweb.c b/gweb/gweb.c -index 12fcb1d8..13c6c5f2 100644 ---- a/gweb/gweb.c -+++ b/gweb/gweb.c -@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond, - } - - *pos = '\0'; -- count = strlen((char *) ptr); -+ count = pos - ptr; - if (count > 0 && ptr[count - 1] == '\r') { - ptr[--count] = '\0'; - bytes_read--; --- -cgit - diff --git a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch deleted file mode 100644 index c2cebdfdcc2b..000000000000 --- a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Tue, 5 Jul 2022 08:32:12 +0200 -Subject: wispr: Add reference counter to portal context - -Track the connman_wispr_portal_context live time via a -refcounter. This only adds the infrastructure to do proper reference -counting. - -Fixes: CVE-2022-32293 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=72343929836de80727a27d6744c869dff045757c] -Signed-off-by: Fabrice Fontaine ---- - src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 42 insertions(+), 10 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index a07896ca..bde7e63b 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -56,6 +56,7 @@ struct wispr_route { - }; - - struct connman_wispr_portal_context { -+ int refcount; - struct connman_service *service; - enum connman_ipconfig_type type; - struct connman_wispr_portal *wispr_portal; -@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL; - static char *online_check_ipv6_url = NULL; - static bool enable_online_to_ready_transition = false; - -+#define wispr_portal_context_ref(wp_context) \ -+ wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__) -+#define wispr_portal_context_unref(wp_context) \ -+ wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__) -+ - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { - DBG(""); -@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context( - { - DBG("context %p", wp_context); - -- if (!wp_context) -- return; -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context( - g_free(wp_context); - } - -+static struct connman_wispr_portal_context * -+wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount + 1, file, line, caller); -+ -+ __sync_fetch_and_add(&wp_context->refcount, 1); -+ -+ return wp_context; -+} -+ -+static void wispr_portal_context_unref_debug( -+ struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ if (!wp_context) -+ return; -+ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount - 1, file, line, caller); -+ -+ if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1) -+ return; -+ -+ free_connman_wispr_portal_context(wp_context); -+} -+ - static struct connman_wispr_portal_context *create_wispr_portal_context(void) - { -- return g_try_new0(struct connman_wispr_portal_context, 1); -+ return wispr_portal_context_ref( -+ g_new0(struct connman_wispr_portal_context, 1)); - } - - static void free_connman_wispr_portal(gpointer data) -@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data) - if (!wispr_portal) - return; - -- free_connman_wispr_portal_context(wispr_portal->ipv4_context); -- free_connman_wispr_portal_context(wispr_portal->ipv6_context); -+ wispr_portal_context_unref(wispr_portal->ipv4_context); -+ wispr_portal_context_unref(wispr_portal->ipv6_context); - - g_free(wispr_portal); - } -@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result, - connman_info("Client-Timezone: %s", str); - - if (!enable_online_to_ready_transition) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); -@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service, - return; - } - -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - -@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) - - if (wp_context->token == 0) { - err = -EINVAL; -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - } - } else if (wp_context->timeout == 0) { - wp_context->timeout = g_idle_add(no_proxy_callback, wp_context); -@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service, - - /* If there is already an existing context, we wipe it */ - if (wp_context) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - wp_context = create_wispr_portal_context(); - if (!wp_context) --- -cgit - diff --git a/package/connman/0003-wispr-Update-portal-context-references.patch b/package/connman/0003-wispr-Update-portal-context-references.patch deleted file mode 100644 index 61c4e21f94e9..000000000000 --- a/package/connman/0003-wispr-Update-portal-context-references.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Tue, 5 Jul 2022 09:11:09 +0200 -Subject: wispr: Update portal context references - -Maintain proper portal context references to avoid UAF. - -Fixes: CVE-2022-32293 - -[Retrieved from: -https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a] -Signed-off-by: Fabrice Fontaine ---- - src/wispr.c | 34 ++++++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 12 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index bde7e63b..84bed33f 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false; - - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { -- DBG(""); -- - msg->has_error = false; - msg->current_element = NULL; - -@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context) - static void free_connman_wispr_portal_context( - struct connman_wispr_portal_context *wp_context) - { -- DBG("context %p", wp_context); -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result, - &str)) - connman_info("Client-Timezone: %s", str); - -- if (!enable_online_to_ready_transition) -- wispr_portal_context_unref(wp_context); -- - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); - -@@ -546,14 +539,17 @@ static void wispr_portal_request_portal( - { - DBG(""); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - wp_context->status_url, - wispr_portal_web_result, - wispr_route_request, - wp_context); - -- if (wp_context->request_id == 0) -+ if (wp_context->request_id == 0) { - wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); -+ } - } - - static bool wispr_input(const guint8 **data, gsize *length, -@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service, - return; - - if (!authentication_done) { -- wispr_portal_error(wp_context); - free_wispr_routes(wp_context); -+ wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - - /* Restarting the test */ - __connman_service_wispr_start(service, wp_context->type); -+ wispr_portal_context_unref(wp_context); - } - - static void wispr_portal_request_wispr_login(struct connman_service *service, -@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result, - - wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN; - -+ wispr_portal_context_ref(wp_context); - if (__connman_agent_request_login_input(wp_context->service, - wispr_portal_request_wispr_login, -- wp_context) != -EINPROGRESS) -+ wp_context) != -EINPROGRESS) { - wispr_portal_error(wp_context); -- else -+ wispr_portal_context_unref(wp_context); -+ } else - return true; - - break; -@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (length > 0) { - g_web_parser_feed_data(wp_context->wispr_parser, - chunk, length); -+ wispr_portal_context_unref(wp_context); - return true; - } - -@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - switch (status) { - case 000: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (g_web_result_get_header(result, "X-ConnMan-Status", - &str)) { - portal_manage_status(result, wp_context); -+ wispr_portal_context_unref(wp_context); - return false; -- } else -+ } else { -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->redirect_url, wp_context); -+ } - - break; - case 300: -@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - !g_web_result_get_header(result, "Location", - &redirect)) { - -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - wp_context->redirect_url = g_strdup(redirect); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - redirect, wispr_portal_web_result, - wispr_route_request, wp_context); -@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - break; - case 505: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - wp_context->request_id = 0; - done: - wp_context->wispr_msg.message_type = -1; -+ wispr_portal_context_unref(wp_context); - return false; - } - -@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data) - xml_wispr_parser_callback, wp_context); - - wispr_portal_request_portal(wp_context); -+ wispr_portal_context_unref(wp_context); - } - - static gboolean no_proxy_callback(gpointer user_data) --- -cgit - diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 6fc5edf29a2c..ea87f1ea17da 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz +sha256 a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa connman-1.42.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index fbd7318e4eb3..142a6583ad3c 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.41 +CONNMAN_VERSION = 1.42 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus @@ -13,13 +13,6 @@ CONNMAN_LICENSE = GPL-2.0 CONNMAN_LICENSE_FILES = COPYING CONNMAN_CPE_ID_VENDOR = intel -# 0001-gweb-Fix-OOB-write-in-received_data.patch -CONNMAN_IGNORE_CVES += CVE-2022-32292 - -# 0002-wispr-Add-reference-counter-to-portal-context.patch -# 0003-wispr-Update-portal-context-references.patch -CONNMAN_IGNORE_CVES += CVE-2022-32293 - CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 16474089d177..8404675e3062 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz +sha256 b109aceacc814d7a637ed94ba5ade829cd2642841d03e06971ef124fa3b86899 containerd-1.6.22.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 4a0d6ec38b49..68213c60bed1 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,12 +4,11 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.16 +CONTAINERD_VERSION = 1.6.22 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd diff --git a/package/coremark/coremark.mk b/package/coremark/coremark.mk index 418fd5c8d39b..9ea8693e7189 100644 --- a/package/coremark/coremark.mk +++ b/package/coremark/coremark.mk @@ -11,6 +11,7 @@ COREMARK_LICENSE_FILES = LICENSE.md define COREMARK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) \ + PORT_CFLAGS="$(TARGET_CFLAGS)" \ PORT_DIR=linux$(if $(BR2_ARCH_IS_64),64) EXE= link endef diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26daf..8043260cfcb5 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch new file mode 100644 index 000000000000..16296f619fa1 --- /dev/null +++ b/package/crudini/0001-prefer-shlex-over-pipes.patch @@ -0,0 +1,41 @@ +From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Tue, 2 Aug 2022 14:40:37 +0100 +Subject: [PATCH] prefer shlex over pipes + +pipes is deprecated since python 3.10 +and slated for removal in python 3.13 + +[Romain backport to 0.9.3] +Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3 +Signed-off-by: Romain Naour +--- + crudini | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/crudini b/crudini +index 669596b..a136241 100755 +--- a/crudini ++++ b/crudini +@@ -17,15 +17,17 @@ import getopt + import hashlib + import iniparse + import os +-import pipes ++import re + import shutil + import string + import tempfile + + if sys.version_info[0] >= 3: ++ import shlex as pipes + from io import StringIO + import configparser + else: ++ import pipes + from cStringIO import StringIO + import ConfigParser as configparser + +-- +2.34.3 + diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index c376c5f777f5..48e0ebde8ff5 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -9,6 +9,9 @@ CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION)) CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_CRUDINI_DEPENDENCIES = host-python-iniparse $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/cups-filters/0001-beh-backend-Use-execv-instead-of-system-CVE-2023-24805.patch b/package/cups-filters/0001-beh-backend-Use-execv-instead-of-system-CVE-2023-24805.patch new file mode 100644 index 000000000000..e527b20f9166 --- /dev/null +++ b/package/cups-filters/0001-beh-backend-Use-execv-instead-of-system-CVE-2023-24805.patch @@ -0,0 +1,208 @@ +From 93e60d3df358c0ae6f3dba79e1c9684657683d89 Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Wed, 17 May 2023 11:11:29 +0200 +Subject: [PATCH] beh backend: Use execv() instead of system() - CVE-2023-24805 + +With execv() command line arguments are passed as separate strings and +not the full command line in a single string. This prevents arbitrary +command execution by escaping the quoting of the arguments in a job +with a forged job title. + +In addition, done the following fixes and improvements: + +- Do not allow '/' in the scheme of the URI (= backend executable + name), to assure that only backends inside /usr/lib/cups/backend/ + are used. + +- URI must have ':', to split off scheme, otherwise error out. + +- Check return value of snprintf() to create call path for backend, to + error out on truncation of a too long scheme or on complete failure + due to a completely odd scheme. + +- Use strncat() instead of strncpy() for getting scheme from URI, the latter + does not require setting terminating zero byte in case of truncation. + +- Also exclude "." or ".." as scheme, as directories are not valid CUPS + backends. + +- Do not use fprintf() in sigterm_handler(), to not interfere with a + fprintf() which could be running in the main process when + sigterm_handler() is triggered. + +- Use "static volatile int" for global variable job_canceled. + +Upstream: https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89 +Signed-off-by: Fabrice Fontaine +--- + backend/beh.c | 107 +++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 84 insertions(+), 23 deletions(-) + +diff --git a/backend/beh.c b/backend/beh.c +index 225fd27d5..8d51235b1 100644 +--- a/backend/beh.c ++++ b/backend/beh.c +@@ -22,12 +22,13 @@ + #include "backend-private.h" + #include + #include ++#include + + /* + * Local globals... + */ + +-static int job_canceled = 0; /* Set to 1 on SIGTERM */ ++static volatile int job_canceled = 0; /* Set to 1 on SIGTERM */ + + /* + * Local functions... +@@ -213,21 +214,40 @@ call_backend(char *uri, /* I - URI of final destination */ + char **argv, /* I - Command-line arguments */ + char *filename) { /* I - File name of input data */ + const char *cups_serverbin; /* Location of programs */ ++ char *backend_argv[8]; /* Arguments for backend */ + char scheme[1024], /* Scheme from URI */ + *ptr, /* Pointer into scheme */ +- cmdline[65536]; /* Backend command line */ +- int retval; ++ backend_path[2048]; /* Backend path */ ++ int pid = 0, /* Process ID of backend */ ++ wait_pid, /* Process ID from wait() */ ++ wait_status, /* Status from child */ ++ retval = 0; ++ int bytes; + + /* + * Build the backend command line... + */ + +- strncpy(scheme, uri, sizeof(scheme) - 1); +- if (strlen(uri) > 1023) +- scheme[1023] = '\0'; ++ scheme[0] = '\0'; ++ strncat(scheme, uri, sizeof(scheme) - 1); + if ((ptr = strchr(scheme, ':')) != NULL) + *ptr = '\0'; +- ++ else { ++ fprintf(stderr, ++ "ERROR: beh: Invalid URI, no colon (':') to mark end of scheme part.\n"); ++ exit (CUPS_BACKEND_FAILED); ++ } ++ if (strchr(scheme, '/')) { ++ fprintf(stderr, ++ "ERROR: beh: Invalid URI, scheme contains a slash ('/').\n"); ++ exit (CUPS_BACKEND_FAILED); ++ } ++ if (!strcmp(scheme, ".") || !strcmp(scheme, "..")) { ++ fprintf(stderr, ++ "ERROR: beh: Invalid URI, scheme (\"%s\") is a directory.\n", ++ scheme); ++ exit (CUPS_BACKEND_FAILED); ++ } + if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL) + cups_serverbin = CUPS_SERVERBIN; + +@@ -235,16 +255,29 @@ call_backend(char *uri, /* I - URI of final destination */ + fprintf(stderr, + "ERROR: beh: Direct output into a file not supported.\n"); + exit (CUPS_BACKEND_FAILED); +- } else +- snprintf(cmdline, sizeof(cmdline), +- "%s/backend/%s '%s' '%s' '%s' '%s' '%s' %s", +- cups_serverbin, scheme, argv[1], argv[2], argv[3], +- /* Apply number of copies only if beh was called with a +- file name and not with the print data in stdin, as +- backends should handle copies only if they are called +- with a file name */ +- (argc == 6 ? "1" : argv[4]), +- argv[5], filename); ++ } ++ ++ backend_argv[0] = uri; ++ backend_argv[1] = argv[1]; ++ backend_argv[2] = argv[2]; ++ backend_argv[3] = argv[3]; ++ /* Apply number of copies only if beh was called with a file name ++ and not with the print data in stdin, as backends should handle ++ copies only if they are called with a file name */ ++ backend_argv[4] = (argc == 6 ? "1" : argv[4]); ++ backend_argv[5] = argv[5]; ++ backend_argv[6] = filename; ++ backend_argv[7] = NULL; ++ ++ bytes = snprintf(backend_path, sizeof(backend_path), ++ "%s/backend/%s", cups_serverbin, scheme); ++ if (bytes < 0 || bytes >= sizeof(backend_path)) ++ { ++ fprintf(stderr, ++ "ERROR: beh: Invalid scheme (\"%s\"), could not determing backend path.\n", ++ scheme); ++ return (CUPS_BACKEND_FAILED); ++ } + + /* + * Overwrite the device URI and run the actual backend... +@@ -253,18 +286,44 @@ call_backend(char *uri, /* I - URI of final destination */ + setenv("DEVICE_URI", uri, 1); + + fprintf(stderr, +- "DEBUG: beh: Executing backend command line \"%s\"...\n", +- cmdline); ++ "DEBUG: beh: Executing backend command line \"%s '%s' '%s' '%s' '%s' '%s' %s\"...\n", ++ backend_path, backend_argv[1], backend_argv[2], backend_argv[3], ++ backend_argv[4], backend_argv[5], backend_argv[6]); + fprintf(stderr, + "DEBUG: beh: Using device URI: %s\n", + uri); + +- retval = system(cmdline) >> 8; ++ if ((pid = fork()) == 0) { ++ /* ++ * Child comes here... ++ */ ++ ++ /* Run the backend */ ++ execv(backend_path, backend_argv); + +- if (retval == -1) + fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n", + strerror(errno)); + ++ exit(1); ++ } else if (pid < 0) { ++ /* ++ * Unable to fork! ++ */ ++ ++ return (CUPS_BACKEND_FAILED); ++ } ++ ++ while ((wait_pid = wait(&wait_status)) < 0 && errno == EINTR); ++ ++ if (wait_pid >= 0 && wait_status) { ++ if (WIFEXITED(wait_status)) ++ retval = WEXITSTATUS(wait_status); ++ else if (WTERMSIG(wait_status) != SIGTERM) ++ retval = WTERMSIG(wait_status); ++ else ++ retval = 0; ++ } ++ + return (retval); + } + +@@ -277,8 +336,10 @@ static void + sigterm_handler(int sig) { /* I - Signal number (unused) */ + (void)sig; + +- fprintf(stderr, +- "DEBUG: beh: Job canceled.\n"); ++ const char * const msg = "DEBUG: beh: Job canceled.\n"; ++ /* The if() is to eliminate the return value and silence the warning ++ about an unused return value. */ ++ if (write(2, msg, strlen(msg))); + + if (job_canceled) + _exit(CUPS_BACKEND_OK); diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index b910cdce134e..7fb3badf46dc 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ca77bb820719a040ff003ecb478d0c2ceffc94e8bd1cd03ddb5a199444127ba cups-filters-1.28.16.tar.gz +sha256 01a2acbd6bb78f09638047e4e9ce305d7e5ef4cb9ed6949672b5d901b7321dd4 cups-filters-1.28.17.tar.gz sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 3250649e0763..dcfb2e950090 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,12 +4,15 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.16 -CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters +CUPS_FILTERS_VERSION = 1.28.17 +CUPS_FILTERS_SITE = https://github.com/OpenPrinting/cups-filters/releases/download/$(CUPS_FILTERS_VERSION) CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING CUPS_FILTERS_CPE_ID_VENDOR = linuxfoundation +# 0001-beh-backend-Use-execv-instead-of-system-CVE-2023-24805.patch +CUPS_FILTERS_IGNORE_CVES += CVE-2023-24805 + CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg CUPS_FILTERS_CONF_OPTS = \ diff --git a/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch b/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch new file mode 100644 index 000000000000..d1dff4e1fa51 --- /dev/null +++ b/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch @@ -0,0 +1,45 @@ +From 2431caddb7e6a87f04ac90b5c6366ad268b6ff31 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 20 Sep 2023 14:45:17 +0200 +Subject: [PATCH] raster-interpret.c: Fix CVE-2023-4504 + +We didn't check for end of buffer if it looks there is an escaped +character - check for NULL terminator there and if found, return NULL +as return value and in `ptr`, because a lone backslash is not +a valid PostScript character. + +Upstream: https://github.com/OpenPrinting/cups/commit/2431caddb7e6a87f04ac90b5c6366ad268b6ff31 +[Peter: drop CHANGES hunk] +Signed-off-by: Peter Korsgaard +--- + cups/raster-interpret.c | 14 +++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c +index 6fcf731b5..b8655c8c6 100644 +--- a/cups/raster-interpret.c ++++ b/cups/raster-interpret.c +@@ -1116,7 +1116,19 @@ scan_ps(_cups_ps_stack_t *st, /* I - Stack */ + + cur ++; + +- if (*cur == 'b') ++ /* ++ * Return NULL if we reached NULL terminator, a lone backslash ++ * is not a valid character in PostScript. ++ */ ++ ++ if (!*cur) ++ { ++ *ptr = NULL; ++ ++ return (NULL); ++ } ++ ++ if (*cur == 'b') + *valptr++ = '\b'; + else if (*cur == 'f') + *valptr++ = '\f'; +-- +2.30.2 + diff --git a/package/cups/cups.hash b/package/cups/cups.hash index ba220e903e1f..501d8c12a622 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908 cups-2.4.2-source.tar.gz +sha256 58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262 cups-2.4.6-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE +sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index fed2aa809f1c..855328a7e73a 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.2 +CUPS_VERSION = 2.4.6 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception @@ -13,6 +13,9 @@ CUPS_CPE_ID_VENDOR = openprinting CUPS_SELINUX_MODULES = cups CUPS_INSTALL_STAGING = YES +# 0005-raster-interpret.c-Fix-CVE-2023-4504.patch +CUPS_IGNORE_CVES += CVE-2023-4504 + # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. define CUPS_RUN_AUTOCONF cd $(@D); $(AUTOCONF) -f @@ -37,10 +40,8 @@ CUPS_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) CUPS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system \ - --enable-systemd + --with-ondemand=systemd CUPS_DEPENDENCIES += systemd -else -CUPS_CONF_OPTS += --disable-systemd endif ifeq ($(BR2_PACKAGE_DBUS),y) @@ -51,8 +52,11 @@ CUPS_CONF_OPTS += --disable-dbus endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -CUPS_CONF_OPTS += --with-tls=yes +CUPS_CONF_OPTS += --with-tls=gnutls CUPS_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +CUPS_CONF_OPTS += --with-tls=openssl +CUPS_DEPENDENCIES += openssl else CUPS_CONF_OPTS += --with-tls=no endif @@ -64,11 +68,11 @@ else CUPS_CONF_OPTS += --disable-libusb endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_DEPENDENCIES += avahi -CUPS_CONF_OPTS += --enable-avahi +CUPS_CONF_OPTS += --with-dnssd=avahi else -CUPS_CONF_OPTS += --disable-avahi +CUPS_CONF_OPTS += --with-dnssd=no endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index bd1e04eee00f..64c15f16fee5 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -18,18 +18,18 @@ CVS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ cvs_cv_func_printf_ptr=yes -CVS_CONFIGURE_ARGS = --disable-old-info-format-support +CVS_CONF_OPTS = \ + --disable-old-info-format-support \ + --with-editor=/bin/vi ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONFIGURE_ARGS += --enable-server +CVS_CONF_OPTS += --enable-server else -CVS_CONFIGURE_ARGS += --disable-server +CVS_CONF_OPTS += --disable-server endif ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONFIGURE_ARGS += --with-external-zlib +CVS_CONF_OPTS += --with-external-zlib endif -CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS) - define CVS_BZIP_UNPACK $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 188afff767a6..84a787eebaeb 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz -sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c +sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz +sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index bda08899b853..e13f8f777082 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.14 +DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) -DARKHTTPD_LICENSE = MIT -DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_LICENSE = ISC +DARKHTTPD_LICENSE_FILES = COPYING DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS diff --git a/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch new file mode 100644 index 000000000000..eaa5d6cc6082 --- /dev/null +++ b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch @@ -0,0 +1,45 @@ +From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 17:26:28 +0100 +Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings + +Drop -Wl,--fatal-warnings with --enable-static to avoid the following +static build failure: + +configure:4778: checking for strtod +configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions +collect2: error: ld returned 1 exit status + +[...] + +In file included from arith_yylex.c:44: +system.h:74:22: error: static declaration of 'strtod' follows non-static declaration + static inline double strtod(const char *nptr, char **endptr) + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5524650..6993364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ fi + AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \ + [Build statical linked program])) + if test "$enable_static" = "yes"; then +- export LDFLAGS="-static -Wl,--fatal-warnings" ++ export LDFLAGS="-static" + fi + + AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \ +-- +2.43.0 + diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 6efc71e5684e..aebfd28be81e 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# We're patching configure.ac +DASH_AUTORECONF = YES # dash does not build in parallel DASH_MAKE = $(MAKE1) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 35d753fc27e5..68757060bfeb 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/1.0.0/dav1d-1.0.0.tar.xz.sha256 -sha256 51737db7e4897e599684f873a4725176dd3c779e639411d7c4fce134bb5ebb82 dav1d-1.0.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.2.1/dav1d-1.2.1.tar.xz.sha256 +sha256 4e33eb61ec54c768a16da0cf8fa0928b4c4593f5f804a3c887d4a21c318340b2 dav1d-1.2.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 2d42cdcb6778..e90f53dc1a14 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,11 +4,12 @@ # ################################################################################ -DAV1D_VERSION = 1.0.0 +DAV1D_VERSION = 1.2.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz -DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) +DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING +DAV1D_CPE_ID_VENDOR = videolan DAV1D_INSTALL_STAGING = YES DAV1D_CONF_OPTS = \ -Denable_tests=false \ diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in index e34adde570af..0201530f9166 100644 --- a/package/davinci-bootcount/Config.in +++ b/package/davinci-bootcount/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_DAVINCI_BOOTCOUNT SCRATCH2 register. This tool allows to read and write this register from userspace. - https://github.com/VoltServer/uboot-davinci-bootcount + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 695d39688ac6..884bf420f396 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -5,7 +5,7 @@ ################################################################################ DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 17c70004bad9..0e48d4dafde7 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.24.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.28.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 bc42d196c1756ac520d61bf3ccd6f42013617def45dd1e591a6091abf51dca38 dbus-1.12.24.tar.gz +sha256 9da1e3f2b73f75eec0a9e4509d64be43909d1f2853fe809528a0a53984d76420 dbus-1.12.28.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b3a79c431d81..7ddeb0e325e0 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -6,12 +6,11 @@ # When updating dbus, check if there are changes in session.conf and # system.conf, and update the versions in the dbus-broker package accordingly. -DBUS_VERSION = 1.12.24 +DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS diff --git a/package/dcron/0002-system-crontab.patch b/package/dcron/0002-system-crontab.patch new file mode 100644 index 000000000000..ac2936872759 --- /dev/null +++ b/package/dcron/0002-system-crontab.patch @@ -0,0 +1,28 @@ +From 1fd99b71b063b1573beaf9f6b801ec5be2fbe24f Mon Sep 17 00:00:00 2001 +From: Mario Haustein +Date: Fri, 2 Sep 2022 23:20:14 +0200 +Subject: [PATCH] Make @hourly, @daily, ... work again + +closes #15 + +Signed-off-by: Mario Haustein +Upstream: https://github.com/dubiousjim/dcron/pull/35 +--- + database.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/database.c b/database.c +index 37cf17a..6ec720e 100644 +--- a/database.c ++++ b/database.c +@@ -455,6 +455,8 @@ SynchronizeFile(const char *dpath, const char *fileName, const char *userName) + line.cl_Days[j] = 1; + for (j=0; j<12; ++j) + line.cl_Mons[j] = 1; ++ for (j=0; j<7; ++j) ++ line.cl_Dow[j] = ALL_DOW; + } + + while (*ptr == ' ' || *ptr == '\t') +-- +2.35.1 diff --git a/package/delve/delve.hash b/package/delve/delve.hash index bf730b9047ef..105249f7f9e5 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39d2e3ae965abf5e71f3d8efbef368b1ee1d7154ea6604ec71d508350d419d03 delve-1.20.0.tar.gz +sha256 58ad7a7fb42ae2ddd33e7d52dad688b249ca8a358eb73b9e48f91eda79e862a8 delve-1.20.2.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index b43d0f03c83a..f261d240b229 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.20.0 +DELVE_VERSION = 1.20.2 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 922d289b263e..bce39b59fa60 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -17,6 +17,9 @@ DHCPCD_CONFIG_OPTS = \ --os=linux \ --privsepuser=dhcpcd +DHCPCD_MAKE_OPTS = \ + BINMODE=755 + ifeq ($(BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP),y) DHCPCD_CONFIG_OPTS += --enable-privsep else @@ -43,11 +46,11 @@ define DHCPCD_CONFIGURE_CMDS endef define DHCPCD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(DHCPCD_MAKE_OPTS) all endef define DHCPCD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(DHCPCD_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) endef # When network-manager is enabled together with dhcpcd, it will use diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 6db68af7ec5a..510f3725bf68 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -10,6 +10,7 @@ DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) DIFFUTILS_LICENSE = GPL-3.0+ DIFFUTILS_LICENSE_FILES = COPYING +DIFFUTILS_CPE_ID_VENDOR = gnu # We're patching m4/stack-direction.m4 DIFFUTILS_AUTORECONF = YES diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index ec5484e66787..654c4cc537c6 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212 dmidecode-3.4.tar.xz +# Locally computed after checking pgp signature from: +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig +sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 352cdb106c47..353978daa941 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.4 +DMIDECODE_VERSION = 3.5 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656bfe..d11e8af59086 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 58c53904334a..9f342cb0499e 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ @@ -17,6 +17,9 @@ DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 DNSMASQ_CPE_ID_VENDOR = thekelleys DNSMASQ_SELINUX_MODULES = dnsmasq +# 0001-set-default-maximum-dns-udp-package-size.patch +DNSMASQ_IGNORE_CVES += CVE-2023-28450 + DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9b231f03b179..e9e9a18cb1ce 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94 docker-cli-23.0.1.tar.gz +sha256 2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd docker-cli-23.0.5.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 38d903150c38..522971ac9879 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.1 +DOCKER_CLI_VERSION = 23.0.5 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 99ab5e40035e..092ec989cf5c 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 docker-engine-23.0.1.tar.gz +sha256 f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3 docker-engine-23.0.5.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c61aa491c201..f904793aa2f6 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.1 +DOCKER_ENGINE_VERSION = 23.0.5 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0a4..a0e69a7601a3 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 451021150b13..4668ad864646 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 597492bc5e61..3eb9bcc47465 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -8,6 +8,7 @@ DRACUT_VERSION = 057 DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION)) DRACUT_LICENSE = GPL-2.0 DRACUT_LICENSE_FILES = COPYING +DRACUT_CPE_ID_VENDOR = dracut_project HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross diff --git a/package/dropbear/0001-Implement-Strict-KEX-mode.patch b/package/dropbear/0001-Implement-Strict-KEX-mode.patch new file mode 100644 index 000000000000..ce7b84861ca0 --- /dev/null +++ b/package/dropbear/0001-Implement-Strict-KEX-mode.patch @@ -0,0 +1,232 @@ +From 6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Mon, 20 Nov 2023 14:02:47 +0800 +Subject: [PATCH] Implement Strict KEX mode + +As specified by OpenSSH with kex-strict-c-v00@openssh.com and +kex-strict-s-v00@openssh.com. + +Upstream: https://github.com/mkj/dropbear/commit/6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 +Signed-off-by: Fabrice Fontaine +--- + src/cli-session.c | 11 +++++++++++ + src/common-algo.c | 6 ++++++ + src/common-kex.c | 26 +++++++++++++++++++++++++- + src/kex.h | 3 +++ + src/process-packet.c | 34 +++++++++++++++++++--------------- + src/ssh.h | 4 ++++ + src/svr-session.c | 3 +++ + 7 files changed, 71 insertions(+), 16 deletions(-) + +diff --git a/cli-session.c b/cli-session.c +index 5981b2470..d261c8f82 100644 +--- a/cli-session.c ++++ b/cli-session.c +@@ -46,6 +46,7 @@ static void cli_finished(void) ATTRIB_NORETURN; + static void recv_msg_service_accept(void); + static void cli_session_cleanup(void); + static void recv_msg_global_request_cli(void); ++static void cli_algos_initialise(void); + + struct clientsession cli_ses; /* GLOBAL */ + +@@ -117,6 +118,7 @@ void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection + } + + chaninitialise(cli_chantypes); ++ cli_algos_initialise(); + + /* Set up cli_ses vars */ + cli_session_init(proxy_cmd_pid); +@@ -487,3 +489,12 @@ void cli_dropbear_log(int priority, const char* format, va_list param) { + fflush(stderr); + } + ++static void cli_algos_initialise(void) { ++ algo_type *algo; ++ for (algo = sshkex; algo->name; algo++) { ++ if (strcmp(algo->name, SSH_STRICT_KEX_S) == 0) { ++ algo->usable = 0; ++ } ++ } ++} ++ +diff --git a/common-algo.c b/common-algo.c +index 378f0ca8e..f9d46ebb6 100644 +--- a/common-algo.c ++++ b/common-algo.c +@@ -307,6 +307,12 @@ algo_type sshkex[] = { + /* Set unusable by svr_algos_initialise() */ + {SSH_EXT_INFO_C, 0, NULL, 1, NULL}, + #endif ++#endif ++#if DROPBEAR_CLIENT ++ {SSH_STRICT_KEX_C, 0, NULL, 1, NULL}, ++#endif ++#if DROPBEAR_SERVER ++ {SSH_STRICT_KEX_S, 0, NULL, 1, NULL}, + #endif + {NULL, 0, NULL, 0, NULL} + }; +diff --git a/common-kex.c b/common-kex.c +index ac8844246..8e33b12a6 100644 +--- a/common-kex.c ++++ b/common-kex.c +@@ -183,6 +183,10 @@ void send_msg_newkeys() { + gen_new_keys(); + switch_keys(); + ++ if (ses.kexstate.strict_kex) { ++ ses.transseq = 0; ++ } ++ + TRACE(("leave send_msg_newkeys")) + } + +@@ -193,7 +197,11 @@ void recv_msg_newkeys() { + + ses.kexstate.recvnewkeys = 1; + switch_keys(); +- ++ ++ if (ses.kexstate.strict_kex) { ++ ses.recvseq = 0; ++ } ++ + TRACE(("leave recv_msg_newkeys")) + } + +@@ -550,6 +558,10 @@ void recv_msg_kexinit() { + + ses.kexstate.recvkexinit = 1; + ++ if (ses.kexstate.strict_kex && !ses.kexstate.donefirstkex && ses.recvseq != 1) { ++ dropbear_exit("First packet wasn't kexinit"); ++ } ++ + TRACE(("leave recv_msg_kexinit")) + } + +@@ -859,6 +871,18 @@ static void read_kex_algos() { + } + #endif + ++ if (!ses.kexstate.donefirstkex) { ++ const char* strict_name; ++ if (IS_DROPBEAR_CLIENT) { ++ strict_name = SSH_STRICT_KEX_S; ++ } else { ++ strict_name = SSH_STRICT_KEX_C; ++ } ++ if (buf_has_algo(ses.payload, strict_name) == DROPBEAR_SUCCESS) { ++ ses.kexstate.strict_kex = 1; ++ } ++ } ++ + algo = buf_match_algo(ses.payload, sshkex, kexguess2, &goodguess); + allgood &= goodguess; + if (algo == NULL || algo->data == NULL) { +diff --git a/kex.h b/kex.h +index 77cf21a37..7fcc3c252 100644 +--- a/kex.h ++++ b/kex.h +@@ -83,6 +83,9 @@ struct KEXState { + + unsigned our_first_follows_matches : 1; + ++ /* Boolean indicating that strict kex mode is in use */ ++ unsigned int strict_kex; ++ + time_t lastkextime; /* time of the last kex */ + unsigned int datatrans; /* data transmitted since last kex */ + unsigned int datarecv; /* data received since last kex */ +diff --git a/process-packet.c b/process-packet.c +index 945416023..133a152d0 100644 +--- a/process-packet.c ++++ b/process-packet.c +@@ -44,6 +44,7 @@ void process_packet() { + + unsigned char type; + unsigned int i; ++ unsigned int first_strict_kex = ses.kexstate.strict_kex && !ses.kexstate.donefirstkex; + time_t now; + + TRACE2(("enter process_packet")) +@@ -54,22 +55,24 @@ void process_packet() { + now = monotonic_now(); + ses.last_packet_time_keepalive_recv = now; + +- /* These packets we can receive at any time */ +- switch(type) { + +- case SSH_MSG_IGNORE: +- goto out; +- case SSH_MSG_DEBUG: +- goto out; ++ if (type == SSH_MSG_DISCONNECT) { ++ /* Allowed at any time */ ++ dropbear_close("Disconnect received"); ++ } + +- case SSH_MSG_UNIMPLEMENTED: +- /* debugging XXX */ +- TRACE(("SSH_MSG_UNIMPLEMENTED")) +- goto out; +- +- case SSH_MSG_DISCONNECT: +- /* TODO cleanup? */ +- dropbear_close("Disconnect received"); ++ /* These packets may be received at any time, ++ except during first kex with strict kex */ ++ if (!first_strict_kex) { ++ switch(type) { ++ case SSH_MSG_IGNORE: ++ goto out; ++ case SSH_MSG_DEBUG: ++ goto out; ++ case SSH_MSG_UNIMPLEMENTED: ++ TRACE(("SSH_MSG_UNIMPLEMENTED")) ++ goto out; ++ } + } + + /* Ignore these packet types so that keepalives don't interfere with +@@ -98,7 +101,8 @@ void process_packet() { + if (type >= 1 && type <= 49 + && type != SSH_MSG_SERVICE_REQUEST + && type != SSH_MSG_SERVICE_ACCEPT +- && type != SSH_MSG_KEXINIT) ++ && type != SSH_MSG_KEXINIT ++ && !first_strict_kex) + { + TRACE(("unknown allowed packet during kexinit")) + recv_unimplemented(); +diff --git a/ssh.h b/ssh.h +index 1b4fec65f..ef3efdca0 100644 +--- a/ssh.h ++++ b/ssh.h +@@ -100,6 +100,10 @@ + #define SSH_EXT_INFO_C "ext-info-c" + #define SSH_SERVER_SIG_ALGS "server-sig-algs" + ++/* OpenSSH strict KEX feature */ ++#define SSH_STRICT_KEX_S "kex-strict-s-v00@openssh.com" ++#define SSH_STRICT_KEX_C "kex-strict-c-v00@openssh.com" ++ + /* service types */ + #define SSH_SERVICE_USERAUTH "ssh-userauth" + #define SSH_SERVICE_USERAUTH_LEN 12 +diff --git a/svr-session.c b/svr-session.c +index 769f0731d..a538e2c5c 100644 +--- a/svr-session.c ++++ b/svr-session.c +@@ -370,6 +370,9 @@ static void svr_algos_initialise(void) { + algo->usable = 0; + } + #endif ++ if (strcmp(algo->name, SSH_STRICT_KEX_C) == 0) { ++ algo->usable = 0; ++ } + } + } + diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 36eb7898bad2..7ac8a3855914 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -14,6 +14,9 @@ DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh +# 0001-Implement-Strict-KEX-mode.patch +DROPBEAR_IGNORE_CVES += CVE-2023-48795 + # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This # prevents dropbear from using SSP support when not available. diff --git a/package/dt/Config.in b/package/dt/Config.in index 826a66ebd5d6..af20cc9bcad7 100644 --- a/package/dt/Config.in +++ b/package/dt/Config.in @@ -18,4 +18,4 @@ config BR2_PACKAGE_DT before exiting. Since verification of data is performed, dt can be thought of as a generic diagnostic tool. - http://www.scsifaq.org/RMiller_Tools/dt.html + https://github.com/RobinTMiller/dt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 674c5e932373..9b5fb65f062a 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -11,6 +11,7 @@ DUKTAPE_SITE = \ DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES +DUKTAPE_CPE_ID_VENDOR = duktape_project define DUKTAPE_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index c02495af90ec..ac1734109ef7 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -8,8 +8,8 @@ EARLYOOM_ARGS="" [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf() 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \ + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/earlyoom/earlyoom.mk b/package/earlyoom/earlyoom.mk index c7042a054e0a..808b9c49fa38 100644 --- a/package/earlyoom/earlyoom.mk +++ b/package/earlyoom/earlyoom.mk @@ -11,7 +11,7 @@ EARLYOOM_LICENSE_FILES = LICENSE EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom EARLYOOM_INSTALL_TARGETS = install-default install-bin -EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"' +EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"$(EARLYOOM_VERSION)\"' EARLYOOM_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index ddf1942c68a9..5ebecd73304a 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -8,5 +8,5 @@ config BR2_PACKAGE_EDID_DECODE https://git.linuxtv.org/edid-decode.git/ comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" - depends on !!BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index 7e463c02b1f4..f2fcde6e3424 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -5,7 +5,8 @@ ################################################################################ EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df -EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git +EDID_DECODE_SITE = https://git.linuxtv.org/edid-decode.git +EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8b1d338bece3..ee6d7302df4e 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -39,7 +39,7 @@ define EFIVAR_BUILD_CMDS endef define HOST_EFIVAR_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/usr/bin/makeguids + $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/bin/makeguids endef define EFIVAR_INSTALL_STAGING_CMDS diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 8d50400eb711..72ff3199d0fd 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://www.enlightenment.org/news/2022-01-03-efl-1.26.1 -sha256 86a9677e3d48dd0c13a399ebb417bd417bd8d150d6b06cc491bc92275c88a642 efl-1.26.1.tar.xz +# From https://www.enlightenment.org/news/2022-09-16-efl-1.26.3 +sha256 d9f83aa0fd9334f44deeb4e4952dc0e5144683afac786feebce6030951617d15 efl-1.26.3.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/package/efl/efl.mk b/package/efl/efl.mk index d4a16475e58b..29b3b1955aa0 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.26.1 +EFL_VERSION = 1.26.3 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = https://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT diff --git a/package/ell/ell.hash b/package/ell/ell.hash index c0f1731676b3..f5ded676c3d2 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz +sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 994b0e19f014..f43dbdb5f7e2 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.56 +ELL_VERSION = 0.63 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 2d977b86f75c..ed5d6b24ef77 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,4 +1,5 @@ -# From https://www.enlightenment.org/news/2022-01-03-enlightenment-0.25.1 -sha256 2cf05fe3d96ef35e823619dbc0ac513ecabcae2186800ecd804924a637112444 enlightenment-0.25.1.tar.xz +# From https://www.enlightenment.org/news/2022-09-15-enlightenment-0.25.4 +sha256 56db5d206b821b9a8831d26e713e410ac70b2255a6f43fcdf7c01eefde23b7a2 enlightenment-0.25.4.tar.xz +# Locally computed sha256 8d2fbc393e967cd6f5b8559d1744881a6a1ceb3ec6e1c2368c3916809ffccb8d COPYING sha256 cdc77ee1732455b203610f923fe4196046b3f7509038c48dc0b0c7e3492c23f3 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 95670e800da5..836c6e581d5c 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.25.1 +ENLIGHTENMENT_VERSION = 0.25.4 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = https://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index 29ec5a9a95e4..069ee25f9f1d 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) - for var in $(TARGET_CONFIGURE_OPTS); do \ + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) diff --git a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file mode 100644 index 000000000000..46961cc9d103 --- /dev/null +++ b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch @@ -0,0 +1,44 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 +Signed-off-by: Stefan Ott +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 + diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 49135b1da7e2..9f3100db7f75 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz.sha256 -sha256 56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742 exfatprogs-1.2.0.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.2/exfatprogs-1.2.2.tar.xz.sha256 +sha256 61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a exfatprogs-1.2.2.tar.xz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index d755c7a21455..40d907257173 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,11 +4,12 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.2.0 +EXFATPROGS_VERSION = 1.2.2 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ EXFATPROGS_LICENSE_FILES = COPYING +EXFATPROGS_CPE_ID_VENDOR = namjaejeon $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch deleted file mode 100644 index 57fa189b0430..000000000000 --- a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 15:37:40 +0100 -Subject: [PATCH] Fix $regex use-after-free. Bug 2915 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_08-Fix-regex-n-use-after-free.-Bug-2915.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 4 +--- - src/expand.c | 2 +- - src/functions.h | 1 + - src/globals.c | 2 +- - src/regex.c | 29 ++++++++++++++++++----------- - src/smtp_in.c | 2 ++ - test/confs/4002 | 10 ++++++++++ - test/mail/4002.userx | 7 +++++++ - test/scripts/4000-scanning/4002 | 7 +++++++ - 9 files changed, 53 insertions(+), 17 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1999,12 +1999,10 @@ - - regex_whitelisted_macro = - regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE); - #endif - --for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -- - /* If the program is called as "mailq" treat it as equivalent to "exim -bp"; - this seems to be a generally accepted convention, since one finds symbolic - links called "mailq" in standard OS configurations. */ - - if ((namelen == 5 && Ustrcmp(argv[0], "mailq") == 0) || -@@ -6082,11 +6080,11 @@ - callout_address = NULL; - sending_ip_address = NULL; - deliver_localpart_data = deliver_domain_data = - recipient_data = sender_data = NULL; - acl_var_m = NULL; -- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+ regex_vars_clear(); - - store_reset(reset_point); - } - - exim_exit(EXIT_SUCCESS); /* Never returns */ ---- a/src/expand.c -+++ b/src/expand.c -@@ -1871,11 +1871,11 @@ - { - tree_node * node = tree_search(router_var, name + 2); - return node ? node->data.ptr : strict_acl_vars ? NULL : US""; - } - --/* Handle $auth variables. */ -+/* Handle $auth, $regex variables. */ - - if (Ustrncmp(name, "auth", 4) == 0) - { - uschar *endptr; - int n = Ustrtoul(name + 4, &endptr, 10); ---- a/src/functions.h -+++ b/src/functions.h -@@ -436,10 +436,11 @@ - extern int regex(const uschar **); - #endif - extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); - extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); - extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); -+extern void regex_vars_clear(void); - extern void retry_add_item(address_item *, uschar *, int); - extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, - uschar **, uschar **); - extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); - extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, ---- a/src/globals.c -+++ b/src/globals.c -@@ -1313,11 +1313,11 @@ - #ifndef DISABLE_PIPE_CONNECT - const pcre2_code *regex_EARLY_PIPE = NULL; - #endif - const pcre2_code *regex_ismsgid = NULL; - const pcre2_code *regex_smtp_code = NULL; --const uschar *regex_vars[REGEX_VARS]; -+const uschar *regex_vars[REGEX_VARS] = { 0 };; - #ifdef WHITELIST_D_MACROS - const pcre2_code *regex_whitelisted_macro = NULL; - #endif - #ifdef WITH_CONTENT_SCAN - uschar *regex_match_string = NULL; ---- a/src/regex.c -+++ b/src/regex.c -@@ -94,22 +94,32 @@ - } - pcre2_match_data_free(md); - return FAIL; - } - -+ -+/* reset expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ - int --regex(const uschar **listptr) -+regex(const uschar ** listptr) - { - unsigned long mbox_size; --FILE *mbox_file; --pcre_list *re_list_head; --uschar *linebuffer; -+FILE * mbox_file; -+pcre_list * re_list_head; -+uschar * linebuffer; - long f_pos = 0; - int ret = FAIL; - --/* reset expansion variable */ --regex_match_string = NULL; -+regex_vars_clear(); - - if (!mime_stream) /* We are in the DATA ACL */ - { - if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL))) - { /* error while spooling */ -@@ -167,18 +177,17 @@ - - - int - mime_regex(const uschar **listptr) - { --pcre_list *re_list_head = NULL; --FILE *f; --uschar *mime_subject = NULL; -+pcre_list * re_list_head = NULL; -+FILE * f; -+uschar * mime_subject = NULL; - int mime_subject_len = 0; - int ret; - --/* reset expansion variable */ --regex_match_string = NULL; -+regex_vars_clear(); - - /* precompile our regexes */ - if (!(re_list_head = compile(*listptr))) - return FAIL; /* no regexes -> nothing to do */ - ---- a/src/smtp_in.c -+++ b/src/smtp_in.c -@@ -2155,12 +2155,14 @@ - prdr_requested = FALSE; - #endif - #ifdef SUPPORT_I18N - message_smtputf8 = FALSE; - #endif -+regex_vars_clear(); - body_linecount = body_zerocount = 0; - -+lookup_value = NULL; /* Can be set by ACL */ - sender_rate = sender_rate_limit = sender_rate_period = NULL; - ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ - /* Note that ratelimiters_conn persists across resets. */ - - /* Reset message ACL variables */ diff --git a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch new file mode 100644 index 000000000000..8ae63d222664 --- /dev/null +++ b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch @@ -0,0 +1,28 @@ +From 37b849dca4dfd855212a763662825e967a4d77b1 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Tue, 7 Nov 2023 15:02:18 +0000 +Subject: [PATCH] OpenSSL: fix non-DANE build + +Upstream: https://git.exim.org/exim.git/commitdiff/37b849dca4dfd855212a763662825e967a4d77b1 + +Signed-off-by: Bernd Kuhls +--- + src/tls-openssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c +index ef11de593..851ac77c5 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -2605,7 +2605,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + asking for certificate-status under DANE, so this callback won't run for + that combination. It still will for non-DANE. */ + +-#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER ++#if defined(EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER) && defined(SUPPORT_DANE) + X509 * signer; + + if ( tls_out.dane_verified +-- +2.30.2 + diff --git a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch deleted file mode 100644 index 9f87f18e00fe..000000000000 --- a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 17:03:37 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build. - -Broken-by: 4e9ed49f8f - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 11 +++++++++++ - src/regex.c | 10 ---------- - 2 files changed, 11 insertions(+), 10 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1677,10 +1677,21 @@ - if ((s = expand_string(big_buffer))) printf("%s\n", CS s); - else printf("Failed: %s\n", expand_string_message); - } - - -+/* reset regex expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ -+ - - /************************************************* - * Entry point and high-level code * - *************************************************/ - ---- a/src/regex.c -+++ b/src/regex.c -@@ -95,20 +95,10 @@ - pcre2_match_data_free(md); - return FAIL; - } - - --/* reset expansion variables */ --void --regex_vars_clear(void) --{ --regex_match_string = NULL; --for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; --} -- -- -- - int - regex(const uschar ** listptr) - { - unsigned long mbox_size; - FILE * mbox_file; diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch new file mode 100644 index 000000000000..6bbfc9eecd40 --- /dev/null +++ b/package/exim/0007-typoes.patch @@ -0,0 +1,58 @@ +From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 8 Nov 2023 14:22:37 +0000 +Subject: [PATCH] typoes + +Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 +Signed-off-by: Fabrice Fontaine +--- + src/src/tls-openssl.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 851ac77c5..237303ba9 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_KEYLOG + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + # define EXIM_HAVE_SESSION_TICKET +-# define EXIM_HAVE_OPESSL_TRACE +-# define EXIM_HAVE_OPESSL_GET0_SERIAL +-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++# define EXIM_HAVE_OPENSSL_TRACE ++# define EXIM_HAVE_OPENSSL_GET0_SERIAL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN + # ifndef DISABLE_OCSP + # define EXIM_HAVE_OCSP +@@ -1756,7 +1756,7 @@ level. */ + DEBUG(D_tls) + { + SSL_CTX_set_info_callback(ctx, info_callback); +-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) ++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) + /* this needs a debug build of OpenSSL */ + SSL_CTX_set_msg_callback(ctx, SSL_trace); + #endif +@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; + if (!olist) + return SSL_TLSEXT_ERR_NOACK; + +-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL ++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL + { + const X509 * cert_sent = SSL_get_certificate(s); + const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); +@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + + debug_printf("certs contained in basicresp:\n"); + x509_stack_dump_cert_s_names( +-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + OCSP_resp_get0_certs(bs) + #else + bs->certs +-- +2.30.2 + diff --git a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch deleted file mode 100644 index 43cc1d79a922..000000000000 --- a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 158dff9936e36a2d31d037d3988b9353458d6471 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 17:17:59 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (2) - -Broken-by: d8ecc7bf97 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 13 +------------ - src/functions.h | 2 +- - src/globals.h | 2 +- - src/regex.c | 10 ++++++++++ - src/smtp_in.c | 2 ++ - 5 files changed, 15 insertions(+), 14 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1677,21 +1677,10 @@ - if ((s = expand_string(big_buffer))) printf("%s\n", CS s); - else printf("Failed: %s\n", expand_string_message); - } - - --/* reset regex expansion variables */ --void --regex_vars_clear(void) --{ --regex_match_string = NULL; --for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; --} -- -- -- -- - - /************************************************* - * Entry point and high-level code * - *************************************************/ - -@@ -6085,17 +6074,17 @@ - deliver_domain_orig = NULL; - deliver_host = deliver_host_address = NULL; - dnslist_domain = dnslist_matched = NULL; - #ifdef WITH_CONTENT_SCAN - malware_name = NULL; -+ regex_vars_clear(); - #endif - callout_address = NULL; - sending_ip_address = NULL; - deliver_localpart_data = deliver_domain_data = - recipient_data = sender_data = NULL; - acl_var_m = NULL; -- regex_vars_clear(); - - store_reset(reset_point); - } - - exim_exit(EXIT_SUCCESS); /* Never returns */ ---- a/src/functions.h -+++ b/src/functions.h -@@ -432,15 +432,15 @@ - extern BOOL receive_msg(BOOL); - extern int_eximarith_t receive_statvfs(BOOL, int *); - extern void receive_swallow_smtp(void); - #ifdef WITH_CONTENT_SCAN - extern int regex(const uschar **); -+extern void regex_vars_clear(void); - #endif - extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); - extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); - extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); --extern void regex_vars_clear(void); - extern void retry_add_item(address_item *, uschar *, int); - extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, - uschar **, uschar **); - extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); - extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, ---- a/src/globals.h -+++ b/src/globals.h -@@ -895,16 +895,16 @@ - #ifndef DISABLE_PIPE_CONNECT - extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ - #endif - extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ - extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ --extern const uschar *regex_vars[]; /* $regexN variables */ - #ifdef WHITELIST_D_MACROS - extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ - #endif - #ifdef WITH_CONTENT_SCAN - extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */ -+extern const uschar *regex_vars[]; - #endif - extern int remote_delivery_count; /* Number of remote addresses */ - extern int remote_max_parallel; /* Maximum parallel delivery */ - extern uschar *remote_sort_domains; /* Remote domain sorting order */ - extern retry_config *retries; /* Chain of retry config information */ ---- a/src/regex.c -+++ b/src/regex.c -@@ -95,10 +95,20 @@ - pcre2_match_data_free(md); - return FAIL; - } - - -+/* reset expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ - int - regex(const uschar ** listptr) - { - unsigned long mbox_size; - FILE * mbox_file; ---- a/src/smtp_in.c -+++ b/src/smtp_in.c -@@ -2155,11 +2155,13 @@ - prdr_requested = FALSE; - #endif - #ifdef SUPPORT_I18N - message_smtputf8 = FALSE; - #endif -+#ifdef WITH_CONTENT_SCAN - regex_vars_clear(); -+#endif - body_linecount = body_zerocount = 0; - - lookup_value = NULL; /* Can be set by ACL */ - sender_rate = sender_rate_limit = sender_rate_period = NULL; - ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 000000000000..67d96fc1af0d --- /dev/null +++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,43 @@ +From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Feb 2024 21:45:42 +0100 +Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 + +OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and +https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 +resulting in the following build failure since version 4.97 and +https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: + +In file included from tls.c:473: +tls-openssl.c: In function 'tls_client_stapling_cb': +tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} + 2652 | bs->certs + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d + +Signed-off-by: Fabrice Fontaine +Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 +--- + src/src/tls-openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 237303ba9..c7f94c160 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + #endif + ++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS ++#endif ++ + #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) + # define EXIM_HAVE_EXPORT_CHNL_BNGNG + # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS +-- +2.43.0 + diff --git a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch deleted file mode 100644 index f9675c80d353..000000000000 --- a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 32da6327e434e986a18b75a84f2d8c687ba14619 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Thu, 1 Sep 2022 15:54:35 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (3) - -Broken-by: d8ecc7bf97 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/expand.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/expand.c b/src/expand.c -index 89de56255..831ca2b75 100644 ---- a/src/expand.c -+++ b/src/expand.c -@@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) - if (!*endptr && n != 0 && n <= AUTH_VARS) - return auth_vars[n-1] ? auth_vars[n-1] : US""; - } -+#ifdef WITH_CONTENT_SCAN - else if (Ustrncmp(name, "regex", 5) == 0) - { - uschar *endptr; -@@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) - if (!*endptr && n != 0 && n <= REGEX_VARS) - return regex_vars[n-1] ? regex_vars[n-1] : US""; - } -+#endif - - /* For all other variables, search the table */ - -@@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ - for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) - assert_variable_notin(US"auth", US auth_vars[i], &e); - -+#ifdef WITH_CONTENT_SCAN - /* check regex variables. assert_variable_notin() treats as const. */ - for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) - assert_variable_notin(US"regex", US regex_vars[i], &e); -+#endif - - /* check known-name variables */ - for (var_entry * v = var_table; v < var_table + var_table_size; v++) --- -2.35.1 - diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 2336aaa5c661..a3822302fbdc 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 299a56927b2eb3477daafd3c5bda02bc67e5c4e5898a7aeaf2740875278cf1a3 exim-4.96.tar.xz +sha256 bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9 exim-4.97.1.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e exim-4.96.tar.xz +sha512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc exim-4.97.1.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index b84a51d6de9a..84fe96218c39 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.96 +EXIM_VERSION = 4.97.1 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ @@ -103,6 +103,7 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) $(call exim-config-add,HOSTCC,$(HOSTCC)) $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) + $(call exim-config-add,EXTRALIBS,$(EXIM_EXTRALIBS)) $(EXIM_FIX_IP_OPTIONS_FOR_MUSL) endef @@ -126,6 +127,13 @@ ifeq ($(BR2_STATIC_LIBS),y) EXIM_STATIC_FLAGS = LFLAGS="-pthread --static" endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +EXIM_DEPENDENCIES += libexecinfo +EXIM_EXTRALIBS += -lexecinfo +else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +EXIM_CFLAGS = -DNO_EXECINFO +endif + # We need the host version of macro_predef during the build, before # building it we need to prepare the makefile. define EXIM_BUILD_CMDS @@ -136,16 +144,15 @@ define EXIM_BUILD_CMDS CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ - CFLAGS="-std=c99 $(TARGET_CFLAGS)" + CFLAGS="-std=c99 $(TARGET_CFLAGS) $(EXIM_CFLAGS)" exim endef # Need to replicate the LFLAGS in install, as exim still wants to build # something when installing... define EXIM_INSTALL_TARGET_CMDS - DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ - CFLAGS="-std=c99 $(TARGET_CFLAGS)" \ - install + cd $(@D)/build-br; \ + DESTDIR=$(TARGET_DIR) build=br \ + ../scripts/exim_install -no_chown -no_symlink exim chmod u+s $(TARGET_DIR)/usr/sbin/exim endef diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0be..63890b54df29 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.2/ +md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz +sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0fd..c6b7fc8b44f0 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.2 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/package/expect/Config.in b/package/expect/Config.in index 5557f4aee653..67dfe643b2dd 100644 --- a/package/expect/Config.in +++ b/package/expect/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_EXPECT Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - http://expect.sourceforge.net/ + https://core.tcl.tk/expect/ diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index 3a9c36df006d..b7813130fd66 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264 faad2-2.10.1.tar.gz +sha256 72dbc0494de9ee38d240f670eccf2b10ef715fd0508c305532ca3def3225bb06 faad2-2.11.1.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index eecab35af877..0b249b3450c5 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,16 +4,19 @@ # ################################################################################ -FAAD2_VERSION = 2.10.1 +FAAD2_VERSION = 2.11.1 FAAD2_SITE = $(call github,knik0,faad2,$(FAAD2_VERSION)) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 -# frontend/faad calls frexp() -FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES -# From git -FAAD2_AUTORECONF = YES -$(eval $(autotools-package)) +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + +$(eval $(cmake-package)) diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 7ad22d02d1df..34f2341d3303 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -12,9 +12,6 @@ FAIL2BAN_CPE_ID_VENDOR = fail2ban FAIL2BAN_SELINUX_MODULES = fail2ban FAIL2BAN_SETUP_TYPE = distutils -# 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch -FAIL2BAN_IGNORE_CVES += CVE-2021-32749 - define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 92d5c6183263..4245f9581ae1 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -8,7 +8,6 @@ FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt -FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch index 951ce4186d66..9c1baaa651d2 100644 --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch @@ -22,7 +22,7 @@ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index c12e88cbb5..4791e5b93a 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c -@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -71,6 +71,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); @@ -30,7 +30,7 @@ index c12e88cbb5..4791e5b93a 100644 if (EXTERNAL_SSSE3(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB32: -@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -99,6 +100,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) return yuv420_rgb15_ssse3; } } diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index 8b81e66981be..8dd689f5d0dc 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -20,7 +20,7 @@ diff --git a/configure b/configure index 6bfd98b384..773a7d516c 100755 --- a/configure +++ b/configure -@@ -2161,6 +2161,7 @@ HEADERS_LIST=" +@@ -2135,6 +2135,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,7 +28,7 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa +@@ -6182,6 +6183,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa check_headers windows.h check_headers X11/extensions/XvMClib.h check_headers asm/types.h diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch index dbc19c1cecb2..3247ab08fe43 100644 --- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch @@ -17,7 +17,7 @@ diff --git a/configure b/configure index 0bb3a7cf2b..3bda99e415 100755 --- a/configure +++ b/configure -@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") +@@ -7715,15 +7715,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 2efef7dd86e6..52029c2adeb5 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_FFMPEG FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. - http://www.ffmpeg.org + https://www.ffmpeg.org if BR2_PACKAGE_FFMPEG diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index c9d7ea7c41dd..b18218cb48fe 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e ffmpeg-4.4.3.tar.xz +sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 ffmpeg-4.4.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 136e3e24cafd..ce285bcc60ff 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,9 +4,9 @@ # ################################################################################ -FFMPEG_VERSION = 4.4.3 +FFMPEG_VERSION = 4.4.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz -FFMPEG_SITE = http://ffmpeg.org/releases +FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES FFMPEG_LICENSE = LGPL-2.1+, libjpeg license @@ -282,9 +282,14 @@ FFMPEG_CONF_OPTS += --disable-vdpau endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ +FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL FFMPEG_DEPENDENCIES += rpi-userland +ifeq ($(BR2_arm),y) +FFMPEG_CONF_OPTS += --enable-mmal +else +FFMPEG_CONF_OPTS += --disable-mmal +endif else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif @@ -549,6 +554,10 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FFMPEG_CFLAGS += -marm +endif + FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)" FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index b07aad8f1843..9e7364d76c79 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,5 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.8.tar.gz.md5sum -md5 8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz +# From http://fftw.org/fftw-3.3.10.tar.gz.md5sum +md5 8ccbf6a5ea78a16dbc3e1306e234cc5c fftw-3.3.10.tar.gz # Locally computed -sha256 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 fftw-3.3.7.tar.gz +sha256 56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467 fftw-3.3.10.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 279244a5dcef..1bb537aeb807 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.8 +FFTW_VERSION = 3.3.10 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 13818b60fd74..b46ece770286 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -26,7 +26,8 @@ FIO_DEPENDENCIES += zlib endif define FIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") + (cd $(@D); $(TARGET_MAKE_ENV) ./configure --disable-native \ + --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") endef define FIO_BUILD_CMDS diff --git a/package/flann/Config.in b/package/flann/Config.in index 180d7eae8a0a..8b32e9077c88 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_LZ4 help FLANN is a library for performing fast approximate nearest @@ -22,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flann/flann.mk b/package/flann/flann.mk index d1a622e68532..dc75b977afa6 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -18,7 +18,7 @@ FLANN_CONF_OPTS = \ -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) FLANN_CXXFLAGS += -O0 diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8ae..f2261f2da464 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 diff --git a/package/flite/flite.mk b/package/flite/flite.mk index 79b2288fe350..bee4c7394f8d 100644 --- a/package/flite/flite.mk +++ b/package/flite/flite.mk @@ -8,6 +8,7 @@ FLITE_VERSION = 2.2 FLITE_SITE = $(call github,festvox,flite,v$(FLITE_VERSION)) FLITE_LICENSE = BSD-4-Clause FLITE_LICENSE_FILES = COPYING +FLITE_CPE_ID_VENDOR = cmu FLITE_INSTALL_STAGING = YES # Patching configure.in diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 0caadcd56fa8..d60531438a4e 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz +sha256 aad5176cb4dcadacacd379ca43160074c6690012d37c4749536ac3b977d50495 fluent-bit-2.0.10.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 8ba16399bbbc..319815f05652 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.9 +FLUENT_BIT_VERSION = 2.0.10 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 3de41b168257..382a54abadfa 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz +sha256 321f7d3f72206b2522f30a1cb8ad1936fd4533ffc4d29dd335b1953c9fb371e6 fluidsynth-2.3.3.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ad1ed7df1149..52f8ec489fe9 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.1 +FLUIDSYNTH_VERSION = 2.3.3 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 398f88e4ad91..0cd55071c4e6 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -9,6 +9,8 @@ Upstream: Not applicable Signed-off-by: David Gouarin Signed-off-by: Matt Weber +[Fabrice: update for 3.2.3] +SIgned-off-by: Fabrice Fontaine --- scripts/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -18,13 +20,14 @@ index 57915e1053..c28260dd7e 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk @@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c -- $(Q)${CC} $< -o $@ +- $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo HOSTCC jlibtool.c -+ $(Q)${HOSTCC} $< -o $@ ++ $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS} clean: jlibtool_clean diff --git a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch index d6d1bcfc78a7..a34c872af7d6 100644 --- a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch +++ b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch @@ -19,6 +19,8 @@ Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/ Signed-off-by: David Gouarin Signed-off-by: Matt Weber Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- src/modules/rlm_krb5/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -28,15 +30,15 @@ index efc9f29d7f..98a97e438a 100644 --- a/src/modules/rlm_krb5/configure.ac +++ b/src/modules/rlm_krb5/configure.ac @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then - FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) - if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], -- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) -+ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], -+ [AC_MSG_WARN(cross compiling: not checking)]) - fi - else - krb5threadsafe="" + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" -- 2.17.1 diff --git a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch index b4cbc61a89e4..6633bd2786b3 100644 --- a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch +++ b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch @@ -12,6 +12,8 @@ FR_SMART_CHECK_LIB can find an incompatible library. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +[Fabrice: update for 3.2.3] +Signed-off-by: Fabrice Fontaine --- configure.ac | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) @@ -20,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index f431da6db5..faa7cfc2b4 100644 --- a/configure.ac +++ b/configure.ac -@@ -2165,26 +2165,26 @@ dnl # +@@ -2165,21 +2165,21 @@ dnl # smart_try_dir=$execinfo_include_dir FR_SMART_CHECK_INCLUDE(execinfo.h) if test "x$ac_cv_header_execinfo_h" = "xyes"; then @@ -28,39 +30,29 @@ index f431da6db5..faa7cfc2b4 100644 - FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) + dnl # Might be provided as part of libc + AC_MSG_CHECKING([if execinfo provided as part of libc]) -+ AC_TRY_LINK( -+ [ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include -+ ], -+ [ ++ ]], [[ + void *sym[1]; -+ backtrace_symbols(&sym, sizeof(sym)) ], -+ [ ++ backtrace_symbols(&sym, sizeof(sym)) ]])],[ + AC_MSG_RESULT(yes) + ac_cv_lib_execinfo_backtrace_symbols="yes" -+ ], -+ [ ++ ],[ + AC_MSG_RESULT(no) -+ ] -+ ) ++ ]) if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then - dnl # Might be provided as part of libc - AC_MSG_CHECKING([if execinfo provided as part of libc]) -- AC_TRY_LINK( -- [ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include -- ], -- [ +- ]], [[ - void *sym[1]; -- backtrace_symbols(&sym, sizeof(sym)) ], -- [ +- backtrace_symbols(&sym, sizeof(sym)) ]])],[ - AC_MSG_RESULT(yes) - ac_cv_lib_execinfo_backtrace_symbols="yes" -- ], -- [ +- ],[ - AC_MSG_RESULT(no) -- ] -- ) +- ]) + smart_try_dir=$execinfo_lib_dir + FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) fi diff --git a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch new file mode 100644 index 000000000000..c92b4171d2bb --- /dev/null +++ b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch @@ -0,0 +1,49 @@ +From 963edf3f87d34e274885d9cc448651d8a1601a6f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jan 2024 17:38:41 +0100 +Subject: [PATCH] src/modules/rlm_python: fix build with -Ofast + +Stripping logic wrongly translates -Ofast into ast resulting in the +following build failure: + +configure: /home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/bin/python3-config's cflags were "-I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -Wsign-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -DNDEBUG -g -fwrapv -O3 -Wall" +configure: Sanitized cflags were " -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ast -D_FORTIFY_SOURCE=2 -fwrapv " + +[...] + +powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input file not found: No such file or directory + +Fixes: + - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/5263 +--- + src/modules/rlm_python/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index e2f74574fb..ee30b324d9 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -59,7 +59,7 @@ else + + dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers + dnl # Strip -systemroot +- dnl # Strip optimisation flags (-O[0-9]?). We decide our optimisation level, not python. ++ dnl # Strip optimisation flags (-O[0-9|fast]?). We decide our optimisation level, not python. + dnl # -D_FORTIFY_SOURCE needs -O. + dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python + dnl # Strip -W*, we decide what warnings are important +@@ -73,7 +73,7 @@ else + mod_cflags=`echo " $python_cflags" | sed -e '\ + s/ -I/ -isystem/g;\ + s/ -isysroot[[ =]]\{0,1\}[[^-]]*/ /g;\ +- s/ -O[[^[[:blank:]]]]*/ /g;\ ++ s/ -O[[^[[:blank:]]*]]*/ /g;\ + s/ -Wp,-D_FORTIFY_SOURCE=[[[:digit:]]]/ /g;\ + s/ -g[[^ ]]*/ /g;\ + s/ -W[[^ ]]*/ /g;\ +-- +2.43.0 + diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index 33ec09e7b0b5..a267bd6f8cc9 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2.sig -sha256 a3071cd78ffcb4706217561d822ee4c760daeb277a63f36a9f11d412c3c39e56 freeradius-server-3.2.0.tar.bz2 +# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig +sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index af3320eb444e..1b5751d7534a 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERADIUS_SERVER_VERSION = 3.2.0 +FREERADIUS_SERVER_VERSION = 3.2.3 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius @@ -16,10 +16,16 @@ FREERADIUS_SERVER_DEPENDENCIES = libtalloc FREERADIUS_SERVER_AUTORECONF = YES # We're patching src/modules/rlm_krb5/configure.ac -define FREERADIUS_SERVER_RUN_KRB5_AUTOCONF - cd $(@D)/src/modules/rlm_krb5; $(AUTOCONF) -I$(@D) +define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF + cd $(@D)/src/modules/rlm_krb5; $(AUTORECONF) -I$(@D)/m4 endef -FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTOCONF +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTORECONF + +# We're patching src/modules/rlm_python3/configure.ac +define FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF + cd $(@D)/src/modules/rlm_python3; $(AUTORECONF) -I$(@D)/m4 +endef +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF # some compiler checks are not supported while cross compiling. # instead of removing those checks, we cache the answers @@ -45,9 +51,8 @@ FREERADIUS_SERVER_CONF_OPTS += \ FREERADIUS_SERVER_CONF_OPTS += \ --without-rlm_eap_ike \ --without-rlm_eap_tnc \ - --without-rlm_mschap \ --without-rlm_perl \ - --without-rlm_realm \ + --without-rlm_python \ --without-rlm_sql_iodbc \ --without-rlm_sql_oracle \ --without-rlm_sql_freetds \ @@ -71,6 +76,19 @@ FREERADIUS_SERVER_CONF_OPTS += \ --without-rlm_ippool endif +ifeq ($(BR2_PACKAGE_HIREDIS),y) +FREERADIUS_SERVER_CONF_OPTS += \ + --with-rlm_cache_redis \ + --with-rlm_redis \ + --with-rlm_rediswho +FREERADIUS_SERVER_DEPENDENCIES += hiredis +else +FREERADIUS_SERVER_CONF_OPTS += \ + --without-rlm_cache_redis \ + --without-rlm_redis \ + --without-rlm_rediswho +endif + ifeq ($(BR2_PACKAGE_JSON_C)$(BR2_PACKAGE_LIBCURL),yy) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_rest FREERADIUS_SERVER_DEPENDENCIES += json-c libcurl @@ -137,10 +155,12 @@ FREERADIUS_SERVER_CONF_OPTS += --without-pcre endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -FREERADIUS_SERVER_CONF_OPTS += --with-rlm_python +FREERADIUS_SERVER_CONF_OPTS += \ + --with-rlm_python3 \ + --with-rlm-python3-config-bin=$(STAGING_DIR)/usr/bin/python3-config FREERADIUS_SERVER_DEPENDENCIES += python3 else -FREERADIUS_SERVER_CONF_OPTS += --without-rlm_python +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_python3 endif ifeq ($(BR2_PACKAGE_READLINE),y) @@ -150,13 +170,6 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-readline endif -ifeq ($(BR2_PACKAGE_REDIS),y) -FREERADIUS_SERVER_CONF_OPTS += --with-rlm_redis --with-rlm_rediswho -FREERADIUS_SERVER_DEPENDENCIES += redis -else -FREERADIUS_SERVER_CONF_OPTS += --without-rlm_redis --without-rlm_rediswho -endif - ifeq ($(BR2_PACKAGE_SQLITE),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite FREERADIUS_SERVER_DEPENDENCIES += sqlite diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6d5..799a92734be7 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f462..1a4e89943073 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1bd7..63434e58f748 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch deleted file mode 100644 index 14f615e2e734..000000000000 --- a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 -From: akallabeth -Date: Mon, 20 Feb 2023 16:23:39 +0100 -Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl - -[Retrieved (and backported) from: -https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670] -Signed-off-by: Fabrice Fontaine ---- - libfreerdp/crypto/x509_utils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c -index 6e87a88b8d8..62cf2939be7 100644 ---- a/libfreerdp/crypto/crypto.c -+++ b/libfreerdp/crypto/crypto.c -@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) - return WINPR_MD_SHA512; - case NID_ripemd160: - return WINPR_MD_RIPEMD160; --#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER) - case NID_sha3_224: - return WINPR_MD_SHA3_224; - case NID_sha3_256: -@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert) - return WINPR_MD_SHA3_384; - case NID_sha3_512: - return WINPR_MD_SHA3_512; --#endif - case NID_shake128: - return WINPR_MD_SHAKE128; - case NID_shake256: - return WINPR_MD_SHAKE256; -+#endif - case NID_undef: - default: - return WINPR_MD_NONE; diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 55314cfdd3b7..daf933e0afe6 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 -sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 01c511819d38..29b33f61c324 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.10.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 99fe71a91c9c..4cceb670193d 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -14,6 +14,10 @@ FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_INSTALL_IMAGES = YES +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE),y) +FIRMWARE_IMX_DEPENDENCIES += linux-firmware +endif + define FIRMWARE_IMX_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bad101486cfa..1ab624c33cd8 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_JPEG diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 3497a3283f04..3f16467e22b2 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,5 +1,5 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.9.-release.tar.xz.sha256 -sha256 f649d53af7beccb59c1d03864cd8f2d287e4ea26ef652b5c4969d29121ced063 freeswitch-1.10.9.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.11.-release.tar.xz.sha256 +sha256 7f9603a691220d9f47da42f3b19290b629b69dceb2eee56448f0a7cefcf9d1a1 freeswitch-1.10.11.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 7497cc496499..5b9dc49c9b17 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.9 +FREESWITCH_VERSION = 1.10.11 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 36ef3cb5270e..759ce6db5db6 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPL-2.0+ +FREETYPE_LICENSE = FTL or GPL-2.0+ FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a272d..f6c058e6dfdc 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 836f130b93cd..4a61084baed3 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz +sha256 7ae9d8bafc65bb5d0f21061ac61dbc6cf93b2b05a5dae9e5eec72ed42388551e frr-8.5.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index abae784c40ec..a4b4bccaf9c6 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.4.2 +FRR_VERSION = 8.5.4 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 diff --git a/package/fstrcmp/fstrcmp.mk b/package/fstrcmp/fstrcmp.mk index 9c42159afb08..294104b28401 100644 --- a/package/fstrcmp/fstrcmp.mk +++ b/package/fstrcmp/fstrcmp.mk @@ -15,6 +15,12 @@ FSTRCMP_CONF_ENV = LIBTOOL="$(HOST_DIR)/bin/libtool" FSTRCMP_MAKE_OPTS = all-bin libdir/pkgconfig/fstrcmp.pc +# fstrcmp does not carry and use the usual ltmain.sh wrappers, so it does not +# inherit from our libtool patches to make -static behave like -all-static. +ifeq ($(BR2_STATIC_LIBS),y) +FSTRCMP_MAKE_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -all-static" +endif + # We need to install the package files ourselves due to upstream trying # to install a .lai file which is missing because of rpath removal define FSTRCMP_INSTALL_STAGING_CMDS diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index f04c7a848fc4..3af54a1afdfa 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,6 +15,10 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) +ifeq ($(BR2_OPTIMIZE_0),y) +FWTS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -O1" +endif + ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 000000000000..7e9714e9cbe8 --- /dev/null +++ b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 10.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch b/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch deleted file mode 100644 index 82a667ab7b98..000000000000 --- a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ca2c3a7d3db7a699c358d3408f820396dd536fc8 Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Tue, 1 Mar 2022 17:04:29 +0000 -Subject: [PATCH] rs6000: Improve .machine - -This adds more correct .machine for most older CPUs. It should be -conservative in the sense that everything we handled before we handle at -least as well now. This does not yet revamp the server CPU handling, it -is too risky at this point in time. - -Tested on powerpc64-linux {-m32,-m64}. Also manually tested with all --mcpu=, and the output of that passed through the GNU assembler. - -2022-03-04 Segher Boessenkool - - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Restructure a - bit. Handle most older CPUs. - -(cherry picked from commit 77eccbf39ed55297802bb66dff5f62507a7239e3) -(cherry picked from commit fc7e603edc67c66a14f893f3b5a0a34e7d26f77c) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 81 +++++++++++++++++++++++++------------- - 1 file changed, 54 insertions(+), 27 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0421dc7adb3..0a55c979c36 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5742,33 +5742,60 @@ const char *rs6000_machine; - const char * - rs6000_machine_from_flags (void) - { -- /* For some CPUs, the machine cannot be determined by ISA flags. We have to -- check them first. */ -- switch (rs6000_cpu) -- { -- case PROCESSOR_PPC8540: -- case PROCESSOR_PPC8548: -- return "e500"; -- -- case PROCESSOR_PPCE300C2: -- case PROCESSOR_PPCE300C3: -- return "e300"; -- -- case PROCESSOR_PPCE500MC: -- return "e500mc"; -- -- case PROCESSOR_PPCE500MC64: -- return "e500mc64"; -- -- case PROCESSOR_PPCE5500: -- return "e5500"; -- -- case PROCESSOR_PPCE6500: -- return "e6500"; -- -- default: -- break; -- } -+ /* e300 and e500 */ -+ if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3) -+ return "e300"; -+ if (rs6000_cpu == PROCESSOR_PPC8540 || rs6000_cpu == PROCESSOR_PPC8548) -+ return "e500"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC) -+ return "e500mc"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC64) -+ return "e500mc64"; -+ if (rs6000_cpu == PROCESSOR_PPCE5500) -+ return "e5500"; -+ if (rs6000_cpu == PROCESSOR_PPCE6500) -+ return "e6500"; -+ -+ /* 400 series */ -+ if (rs6000_cpu == PROCESSOR_PPC403) -+ return "\"403\""; -+ if (rs6000_cpu == PROCESSOR_PPC405) -+ return "\"405\""; -+ if (rs6000_cpu == PROCESSOR_PPC440) -+ return "\"440\""; -+ if (rs6000_cpu == PROCESSOR_PPC476) -+ return "\"476\""; -+ -+ /* A2 */ -+ if (rs6000_cpu == PROCESSOR_PPCA2) -+ return "a2"; -+ -+ /* Cell BE */ -+ if (rs6000_cpu == PROCESSOR_CELL) -+ return "cell"; -+ -+ /* Titan */ -+ if (rs6000_cpu == PROCESSOR_TITAN) -+ return "titan"; -+ -+ /* 500 series and 800 series */ -+ if (rs6000_cpu == PROCESSOR_MPCCORE) -+ return "\"821\""; -+ -+ /* 600 series and 700 series, "classic" */ -+ if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 -+ || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -+ || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ return "ppc"; -+ -+ /* Classic with AltiVec, "G4" */ -+ if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) -+ return "\"7450\""; -+ -+ /* The older 64-bit CPUs */ -+ if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -+ || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ return "ppc64"; - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch b/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch deleted file mode 100644 index 43fed4c19ffc..000000000000 --- a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6de33ed642f119f1e2543095dd56e4a94f97c27f Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Fri, 11 Mar 2022 21:15:18 +0000 -Subject: [PATCH] rs6000: Do not use rs6000_cpu for .machine ppc and ppc64 - (PR104829) - -Fixes: 77eccbf39ed5 - -rs6000.h has - #define PROCESSOR_POWERPC PROCESSOR_PPC604 - #define PROCESSOR_POWERPC64 PROCESSOR_RS64A -which means that if you use things like -mcpu=powerpc -mvsx it will no -longer work after my latest .machine patch. This causes GCC build errors -in some cases, not a good idea (even if the errors are actually -pre-existing: using -mvsx with a machine that does not have VSX cannot -work properly). - -2022-03-11 Segher Boessenkool - - PR target/104829 - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Don't output - "ppc" and "ppc64" based on rs6000_cpu. - -(cherry picked from commit 80fcc4b6afee72443bef551064826b3b4b6785e6) -(cherry picked from commit d87e0e297b1cba73a0c055d2a3e9267d288f435a) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0a55c979c36..7e5cdd34840 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5782,20 +5782,28 @@ rs6000_machine_from_flags (void) - if (rs6000_cpu == PROCESSOR_MPCCORE) - return "\"821\""; - -+#if 0 -+ /* This (and ppc64 below) are disabled here (for now at least) because -+ PROCESSOR_POWERPC, PROCESSOR_POWERPC64, and PROCESSOR_COMMON -+ are #define'd as some of these. Untangling that is a job for later. */ -+ - /* 600 series and 700 series, "classic" */ - if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 - || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -- || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ || rs6000_cpu == PROCESSOR_PPC750) - return "ppc"; -+#endif - - /* Classic with AltiVec, "G4" */ - if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) - return "\"7450\""; - -+#if 0 - /* The older 64-bit CPUs */ - if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -- || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ || rs6000_cpu == PROCESSOR_RS64A) - return "ppc64"; -+#endif - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch similarity index 95% rename from package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch rename to package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch index 4888f7e32077..f927cd007d13 100644 --- a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -1,4 +1,4 @@ -From 7a20b4574f06472086c786bd1b078ee962cdb02c Mon Sep 17 00:00:00 2001 +From 35c0801efa26bf248d278b5711b77a19e95b2f57 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Tue, 6 Apr 2021 05:47:17 +0900 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs @@ -28,7 +28,11 @@ gcc/ChangeLog: * config/or1k/or1k.opt (mcmodel=): New option. * doc/invoke.texi (OpenRISC Options): Document mcmodel. +Uptream: eff8110674ef193481d3657456a262beeb9951ff + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ gcc/config/or1k/or1k.c | 11 +++++++++-- @@ -166,7 +170,7 @@ index 6bd0f3eee6d..cc23e3b8856 100644 Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 35508efb4ef..a1b7608a3aa 100644 +index f1217812280..90c6186fc14 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -1136,7 +1136,8 @@ Objective-C and Objective-C++ Dialects}. @@ -179,7 +183,7 @@ index 35508efb4ef..a1b7608a3aa 100644 @emph{PDP-11 Options} @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -26443,6 +26444,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, +@@ -26444,6 +26445,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, @code{l.slli}) instructions. By default extra instructions will be generated to store the immediate to a register first. @@ -196,5 +200,5 @@ index 35508efb4ef..a1b7608a3aa 100644 @end table -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch similarity index 88% rename from package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch rename to package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch index 716f007a24fb..eb4517513567 100644 --- a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -1,4 +1,4 @@ -From c544a63928406b706b8493fd9b8ca2136b433cf0 Mon Sep 17 00:00:00 2001 +From f75178ccd2f5e4d73e27cccffffada859b87be7d Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Wed, 21 Apr 2021 05:33:15 +0900 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff @@ -21,7 +21,11 @@ libgcc/ChangeLog: * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. * config/or1k/t-crtstuff: New file. +Upstream: da8a9d695b3c4b9397b5d9a27660bfa48af8d707 + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- libgcc/config.host | 4 ++-- libgcc/config/or1k/t-crtstuff | 2 ++ @@ -29,10 +33,10 @@ Signed-off-by: Giulio Benetti create mode 100644 libgcc/config/or1k/t-crtstuff diff --git a/libgcc/config.host b/libgcc/config.host -index f2dc7e266f4..6f193c32fbd 100644 +index 45f8e19ada4..5523345abb0 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -1132,12 +1132,12 @@ nios2-*-*) +@@ -1150,12 +1150,12 @@ nios2-*-*) extra_parts="$extra_parts crti.o crtn.o" ;; or1k-*-linux*) @@ -56,5 +60,5 @@ index 00000000000..dcae7f3498e +# Compile crtbeginS.o and crtendS.o with -mcmodel=large +CRTSTUFF_T_CFLAGS_S += -mcmodel=large -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch similarity index 81% rename from package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch rename to package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch index e33dec3ff6cd..cb407c78fc10 100644 --- a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -1,4 +1,4 @@ -From 8ef5787701f4d7cf46a27771d38ab54af2499e25 Mon Sep 17 00:00:00 2001 +From 48ced46a5f81f49737ea13d11a099e03062cf141 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 27 Mar 2020 21:23:53 +0100 Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed @@ -8,7 +8,11 @@ is defined. Added the CPP_SPEC definition to correct this. Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 +Upstream: cac2f69cdad434ad5cb60f5fe931d45cd82ef476 + Signed-off-by: Bernd Kuhls +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/linux.h | 2 ++ 1 file changed, 2 insertions(+) @@ -27,5 +31,5 @@ index 196f3f3c8f0..0cbdc934af1 100644 #define LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch similarity index 92% rename from package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch index dba2d02d7f3d..817997e925e3 100644 --- a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch +++ b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch @@ -1,4 +1,4 @@ -From 3b9d7d397fa6dc290eb05bffca80968efb6ec2e5 Mon Sep 17 00:00:00 2001 +From 590ef1956786bfd49dae7a5e2fed67509d06f36b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 25 Jul 2022 00:29:55 +0200 Subject: [PATCH] disable split-stack for non-thread builds diff --git a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch similarity index 96% rename from package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch rename to package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch index 4e93f6ab96fd..88bc26e0d7e9 100644 --- a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch +++ b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -1,4 +1,4 @@ -From de3f4ee9a5bd2adcb5ff2e1690db2567fda1473c Mon Sep 17 00:00:00 2001 +From 3e878f9d1c473f91a1377193d4d8d2616357bed1 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 28 Jun 2021 13:54:58 +0800 Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) @@ -93,10 +93,10 @@ index 5b23a8b640d..404b420f302 100644 with the appropriate underscores, then leave it alone. We want exactly two leading and trailing underscores. */ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def -index 066bef99162..b7ad6982e96 100644 +index c2f54d1189a..b2841d384f3 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def -@@ -3154,7 +3154,8 @@ fix = { +@@ -3201,7 +3201,8 @@ fix = { c_fix = machine_name; test_text = "/* MACH_DIFF: */\n" @@ -120,5 +120,5 @@ index cf95321fb86..8b3accaf04e 100644 #endif /* MACHINE_NAME_CHECK */ -- -2.37.3 +2.34.3 diff --git a/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 000000000000..025e6cfe32a3 --- /dev/null +++ b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 11.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch deleted file mode 100644 index 5044942e9f7d..000000000000 --- a/package/gcc/12.2.0/0002-fix-condvar.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Thu, 22 Dec 2022 09:56:47 +0000 -Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait - [PR105730] - -The commit r12-5877-g9e18a25331fa25 removed the incorrect -noexcept-specifier from std::condition_variable::wait and gave the new -symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol -std::condition_variable::wait(unique_lock&)@GLIBCXX_3.4.11 as an -alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still -has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is -just a wrapper around the real condition_variable::wait which adds -noexcept and so terminates on a __forced_unwind exception. - -This doesn't work on uclibc, possibly due to a dynamic linker bug. When -__nothrow_wait_cv::wait calls the condition_variable::wait function it -binds to the alias symbol, which means it just calls itself recursively -until the stack overflows. - -This change avoids the possibility of a recursive call by changing the -__nothrow_wait_cv::wait function so that instead of calling -condition_variable::wait it re-implements it. This requires accessing -the private _M_cond member of condition_variable, so we need to use the -trick of instantiating a template with the member-pointer of the private -member. - -libstdc++-v3/ChangeLog: - - PR libstdc++/105730 - * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): - Access private data member of base class and call its wait - member. - -Signed-off-by: Gleb Mazovetskiy ---- - .../src/c++11/compatibility-condvar.cc | 22 ++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc -index e3a8b8403ca..3cef3bc0714 100644 ---- a/libstdc++-v3/src/c++11/compatibility-condvar.cc -+++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc -@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION - && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) - namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) - { -+namespace -+{ -+ // Pointer-to-member for private std::condition_variable::_M_cond member. -+ std::__condvar std::condition_variable::* __base_member; -+ -+ template -+ struct cracker -+ { static std::__condvar std::condition_variable::* value; }; -+ -+ // Initializer for this static member also initializes __base_member. -+ template -+ std::__condvar std::condition_variable::* -+ cracker::value = __base_member = X; -+ -+ // Explicit instantiation is allowed to access the private member. -+ template class cracker<&std::condition_variable::_M_cond>; -+} -+ - struct __nothrow_wait_cv : std::condition_variable - { - void wait(std::unique_lock&) noexcept; -@@ -76,7 +94,9 @@ __attribute__((used)) - void - __nothrow_wait_cv::wait(std::unique_lock& lock) noexcept - { -- this->condition_variable::wait(lock); -+ // In theory this could be simply this->std::condition_variable::wait(lock) -+ // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730. -+ (this->*__base_member).wait(*lock.mutex()); - } - } // namespace __gnu_cxx - --- -2.31.1 - diff --git a/package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 000000000000..4bac5972332a --- /dev/null +++ b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,48 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.cc ++++ b/gcc/config/or1k/or1k.cc +@@ -2206,8 +2206,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index cd1b9fa46d80..b6adf1f127e2 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -87,8 +87,8 @@ config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X - default "11.3.0" if BR2_GCC_VERSION_11_X - default "12.2.0" if BR2_GCC_VERSION_12_X + default "11.4.0" if BR2_GCC_VERSION_11_X + default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 666124fa6dbe..f478962af844 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -2,10 +2,10 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum -sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum -sha512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 gcc-12.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.4.0/sha512.sum +sha512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 gcc-11.4.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum +sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 25cb4ce8e29e..d5592b397495 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -41,7 +41,6 @@ define HOST_GCC_APPLY_PATCHES $(APPLY_PATCHES) $(@D) $${patchdir} \*.patch || exit 1; \ fi; \ done - $(HOST_GCC_APPLY_POWERPC_PATCH) endef HOST_GCC_EXCLUDES = \ @@ -89,27 +88,31 @@ HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot endif # Don't build documentation. It takes up extra space / build time, -# and sometimes needs specific makeinfo versions to work +# and sometimes needs specific makeinfo versions to work. Override the check +# for a modern makeinfo otherwise the configure scripts will still enable it. HOST_GCC_COMMON_CONF_ENV = \ MAKEINFO=missing +HOST_GCC_COMMON_MAKE_OPTS = \ + gcc_cv_prog_makeinfo_modern=no -GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) -GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) +# Target binaries and libraries which are being built as a part of GCC +# don't use Buildroot toolchain wrapper because, instead its very own "xgcc" +# binary is used. And so we need to explicitly propagate ALL the flags +# directly to "xgcc" and that is done via configure-time environment +# variables, see below setup of HOST_GCC_COMMON_CONF_ENV. +GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) +GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) +GCC_COMMON_TARGET_LDFLAGS = $(TARGET_LDFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) # used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] ifeq ($(BR2_ENABLE_DEBUG),y) GCC_COMMON_TARGET_CFLAGS += -Wno-error endif -# Make sure libgcc & libstdc++ always get built with -matomic on ARC700 -ifeq ($(GCC_TARGET_CPU):$(BR2_ARC_ATOMIC_EXT),arc700:y) -GCC_COMMON_TARGET_CFLAGS += -matomic -GCC_COMMON_TARGET_CXXFLAGS += -matomic -endif - # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" +HOST_GCC_COMMON_CONF_ENV += LDFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_LDFLAGS)" HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib # libitm needs sparc V9+ @@ -154,6 +157,14 @@ ifeq ($(BR2_mips)$(BR2_mipsel):$(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y:y) HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer endif +# libsanitizer is broken for Thumb1, sanitizer_linux.cc contains unconditional +# "ldr ip, [sp], #8", which causes: +# ....s: Assembler messages: +# ....s:4190: Error: lo register required -- `ldr ip,[sp],#8' +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer +endif + # The logic in libbacktrace/configure.ac to detect if __sync builtins # are available assumes they are as soon as target_subdir is not # empty, i.e when cross-compiling. However, some platforms do not have @@ -217,9 +228,17 @@ endif ifneq ($(GCC_TARGET_FP32_MODE),) HOST_GCC_COMMON_CONF_OPTS += --with-fp-32="$(GCC_TARGET_FP32_MODE)" endif + +# musl/uClibc-ng does not work with biarch powerpc toolchains, we +# need to configure gcc explicitely for 32 Bit for CPU's supporting +# 64 Bit and 32 Bit ifneq ($(GCC_TARGET_CPU),) +ifeq ($(BR2_powerpc),y) +HOST_GCC_COMMON_CONF_OPTS += --with-cpu-32=$(GCC_TARGET_CPU) +else HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(GCC_TARGET_CPU) endif +endif ifneq ($(GCC_TARGET_FPU),) HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU) @@ -280,7 +299,7 @@ HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' # For gcc-final, the gcc logic to detect whether SSP support is # available or not in the C library is not working properly for # uClibc, so let's be explicit as well. -HOST_GCC_COMMON_MAKE_OPTS = \ +HOST_GCC_COMMON_MAKE_OPTS += \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index ee7209566a35..24a1f06af236 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -1,18 +1,20 @@ config BR2_PACKAGE_GDAL bool "gdal" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on BR2_INSTALL_LIBSTDCPP # proj + depends on BR2_INSTALL_LIBSTDCPP # proj, qhull # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBGEOTIFF select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_PROJ + select BR2_PACKAGE_QHULL select BR2_PACKAGE_ZLIB help GDAL is a translator library for raster and vector geospatial diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index a3b11c53af9d..e3b1468eb3c7 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -27,16 +27,28 @@ GDAL_MAKE_OPTS += -f Makefile # enabled but it seems, in contrast to mrf driver support, that they # can be implicitly disabled, by configuring gdal without their # respectively needed dependencies. -GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib +GDAL_DEPENDENCIES = \ + giflib \ + host-pkgconf \ + jpeg \ + json-c \ + libgeotiff \ + libpng \ + proj \ + qhull \ + tiff \ + zlib # Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_GIF=ON \ -DGDAL_USE_JPEG=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ -DGDAL_USE_ARMADILLO=OFF \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ @@ -64,7 +76,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_KDU=OFF \ -DGDAL_USE_KEA=OFF \ -DGDAL_USE_LERC=OFF \ - -DGDAL_USE_GIF=OFF \ -DGDAL_USE_LIBLZMA=OFF \ -DGDAL_USE_DEFLATE=OFF \ -DGDAL_USE_MONGOCXX=OFF \ @@ -83,7 +94,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_PDFIUM=OFF \ -DGDAL_USE_PODOFO=OFF \ -DGDAL_USE_POPPLER=OFF \ - -DGDAL_USE_QHULL=OFF \ -DGDAL_USE_RASDAMAN=OFF \ -DGDAL_USE_RASTERLITE2=OFF \ -DGDAL_USE_RDB=OFF \ diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 80b1185b5e13..6986a6441aac 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze +comment "gdb needs a glibc or uclibc toolchain" + depends on BR2_or1k + depends on BR2_TOOLCHAIN_USES_MUSL + comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -17,7 +21,9 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_ZLIB + # The or1k musl port is incomplete, elf_gregset_t definition is missing: + # https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 + depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. @@ -54,6 +60,7 @@ config BR2_PACKAGE_GDB_DEBUGGER depends on !BR2_sh select BR2_PACKAGE_GMP if !BR2_GDB_VERSION_10 && !BR2_arc select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_ZLIB comment "full gdb on target needs a toolchain w/ wchar" depends on !BR2_sh diff --git a/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch new file mode 100644 index 000000000000..210ba6d60964 --- /dev/null +++ b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch @@ -0,0 +1,114 @@ +From 5ac588997c3c2d032d5d5145d9245eb37354c23b Mon Sep 17 00:00:00 2001 +From: Tom Tromey +Date: Tue, 30 Jun 2020 07:53:03 -0600 +Subject: [PATCH] Do not define basic_string_view::to_string + +gdb's copy of basic_string_view includes a to_string method. However, +according to cppreference, this is not a method on the real +std::basic_string_view: + +https://en.cppreference.com/w/cpp/string/basic_string_view + +This difference matters because gdb_string_view.h will use the +standard implementation when built with a C++17 or later. This caused +PR build/26183. + +This patch fixes the problem by changing the method to be a standalone +helper function, and then rewriting the uses. Tested by rebuilding +with a version of GCC that defaults to C++17. + +(Note that the build still is not clean; and also I noticed that the +libstdc++ string_view forbids the use of nullptr ... I wonder if gdb +violates that.) + +gdb/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * ada-lang.c (ada_lookup_name_info::ada_lookup_name_info): Use + gdb::to_string. + +gdbsupport/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * gdb_string_view.h (basic_string_view::to_string): Remove. + (gdb::to_string): New function. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ac588997c3c2d032d5d5145d9245eb37354c23b +Bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=26183 + +Signed-off-by: Bernd Kuhls +--- + gdb/ChangeLog | 6 ++++++ + gdb/ada-lang.c | 8 ++++---- + gdbsupport/ChangeLog | 6 ++++++ + gdbsupport/gdb_string_view.h | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 11 deletions(-) + +diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c +index 9b0c2efbfe2..98508c168bc 100644 +--- a/gdb/ada-lang.c ++++ b/gdb/ada-lang.c +@@ -13553,10 +13553,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + { + if (user_name.back () == '>') + m_encoded_name +- = user_name.substr (1, user_name.size () - 2).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 2)); + else + m_encoded_name +- = user_name.substr (1, user_name.size () - 1).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 1)); + m_encoded_p = true; + m_verbatim_p = true; + m_wild_match_p = false; +@@ -13575,10 +13575,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + if (encoded != NULL) + m_encoded_name = encoded; + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + } + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + + /* Handle the 'package Standard' special case. See description + of m_standard_p. */ +diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h +index c0ae7a8a2d9..65124e67e54 100644 +--- a/gdbsupport/gdb_string_view.h ++++ b/gdbsupport/gdb_string_view.h +@@ -245,13 +245,6 @@ namespace gdb { + return { this->_M_str, this->_M_len }; + } + +- template> +- std::basic_string<_CharT, _Traits, _Allocator> +- to_string(const _Allocator& __alloc = _Allocator()) const +- { +- return { this->_M_str, this->_M_len, __alloc }; +- } +- + size_type + copy(_CharT* __str, size_type __n, size_type __pos = 0) const + { +@@ -560,4 +553,14 @@ namespace gdb { + + #endif // __cplusplus < 201703L + ++namespace gdb { ++ ++static inline std::string ++to_string(const gdb::string_view &view) ++{ ++ return { view.data (), view.size () }; ++} ++ ++} ++ + #endif /* COMMON_GDB_STRING_VIEW_H */ +-- +2.39.3 + diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 04c7d02d2f6a..36e2685a25d7 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum +# From https://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4b9c5c6b7075..03db21063b9b 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -32,7 +32,6 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK # also need ncurses. # As for libiberty, gdb may use a system-installed one if present, so # we must ensure ours is installed first. -GDB_DEPENDENCIES = zlib HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib # Disable building documentation @@ -131,21 +130,29 @@ GDB_CONF_OPTS = \ --disable-sim \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ --without-included-gettext \ - --with-system-zlib \ --disable-werror \ --enable-static \ - --without-mpfr + --without-mpfr \ + --disable-source-highlight ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) +GDB_DEPENDENCIES += zlib GDB_CONF_OPTS += \ --enable-gdb \ - --with-curses + --with-curses \ + --with-system-zlib GDB_DEPENDENCIES += ncurses \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) else +# When only building gdbserver, we don't need zlib. But we have no way to +# tell the top-level configure that we don't need zlib: it either wants to +# build the bundled one, or use the system one. +# Since we're going to only install the gdbserver to the target, we don't +# care that the bundled zlib is built, as it is not used. GDB_CONF_OPTS += \ --disable-gdb \ - --without-curses + --without-curses \ + --without-system-zlib endif # Starting from GDB 11.x, gmp is needed as a dependency to build full @@ -164,13 +171,6 @@ else GDB_CONF_OPTS += --disable-gdbserver endif -# When gdb is built as C++ application for ARC it segfaults at runtime -# So we pass --disable-build-with-cxx config option to force gdb not to -# be built as C++ app. -ifeq ($(BR2_arc),y) -GDB_CONF_OPTS += --disable-build-with-cxx -endif - # gdb 7.12+ by default builds with a C++ compiler, which doesn't work # when we don't have C++ support in the toolchain ifneq ($(BR2_INSTALL_LIBSTDCPP),y) @@ -254,6 +254,7 @@ HOST_GDB_CONF_OPTS = \ --with-system-zlib \ --with-curses \ --without-mpfr \ + --disable-source-highlight \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c60..5a7106d70783 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling diff --git a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch new file mode 100644 index 000000000000..af69cd367072 --- /dev/null +++ b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch @@ -0,0 +1,34 @@ +From 088f3cd6e58cff5fa51e072d1829f7691a5f6681 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 20 Sep 2023 13:44:28 +0100 +Subject: [PATCH] Fix build without BUILD_PDF + +The PDFSetParams PostScript extension operator was missing a stub function definition +when the PDF interpreter is not built in. + + Author: Fabrice Fontaine +Upstream: https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=088f3cd6e58cff5fa51e072d1829f7691a5f6681 +Signed-off-by: Fabrice Fontaine +--- + psi/zpdfops.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/psi/zpdfops.c b/psi/zpdfops.c +index e7e0a42ee..271687a18 100644 +--- a/psi/zpdfops.c ++++ b/psi/zpdfops.c +@@ -1507,6 +1507,11 @@ static int zPDFdrawannots(i_ctx_t *i_ctx_p) + return_error(gs_error_undefined); + } + ++static int zPDFSetParams(i_ctx_t *i_ctx_p) ++{ ++ return_error(gs_error_undefined); ++} ++ + static int zPDFInit(i_ctx_t *i_ctx_p) + { + return_error(gs_error_undefined); +-- +2.34.1 + diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index ca26a38a02fa..849f6c64ba6e 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/SHA512SUMS -sha512 f498384af80654c040635564b8bc9a64c4bb5b0769bb00aade4042bbe9117c482362dc1a1fac72db3ce9487dd5a5bb8fb81b35b360680fe598df33dfbbe79499 ghostscript-9.56.1.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS +sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 5bf8b08966c6..6a28db8f8505 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.56.1 +GHOSTSCRIPT_VERSION = 10.02.1 +GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch new file mode 100644 index 000000000000..35d5f60a95d2 --- /dev/null +++ b/package/giflib/0002-Fix-CVE-2022-28506.patch @@ -0,0 +1,34 @@ +From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:24:32 -0700 +Subject: [PATCH] Fix CVE-2022-28506 + +From: giflib-5.2.1-17.fc39.src.rpm +Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 +Upstream: https://sourceforge.net/p/giflib/bugs/159/ + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + gif2rgb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gif2rgb.c b/gif2rgb.c +index 8d7c0ff..d9a469f 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { ++ /* Check if color is within color palete */ ++ if (GifRow[j] >= ColorMap->ColorCount) ++ { ++ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); ++ } + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + *BufferP++ = ColorMapEntry->Red; + *BufferP++ = ColorMapEntry->Green; +-- +2.43.0 + diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch new file mode 100644 index 000000000000..2ba01ac8a4d7 --- /dev/null +++ b/package/giflib/0003-Fix-CVE-2023-39742.patch @@ -0,0 +1,36 @@ +From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:35:40 -0700 +Subject: [PATCH] Fix CVE-2023-39742 + +From: giflib-5.2.1-17.fc39.src.rpm +Fix segmentation faults due to non correct checking for args +Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 +Upstream: https://sourceforge.net/p/giflib/bugs/166/ + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + getarg.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/getarg.c b/getarg.c +index d569f6c..51fbe0b 100644 +--- a/getarg.c ++++ b/getarg.c +@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], + int i = 0, ScanRes; + + while (!(ISSPACE(CtrlStrCopy[i]))) { ++ ++ if ((*argv) == argv_end) { ++ GAErrorToken = Option; ++ return CMD_ERR_NumRead; ++ } ++ + switch (CtrlStrCopy[i + 1]) { + case 'd': /* Get signed integers. */ + ScanRes = sscanf(*((*argv)++), "%d", +-- +2.43.0 + diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 000000000000..171976987227 --- /dev/null +++ b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,61 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, + 0, 0, Width, Height, false, NULL) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, + GifFile->Image.Width, GifFile->Image.Height); + + for (i = 0; i < Height; i++) { +- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) ++ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); ++ } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); + + Ptr += Width; +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index d47edfaa8b80..d91c77e2ee1c 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -11,6 +11,11 @@ GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VENDOR = giflib_project +# 0002-Fix-CVE-2022-28506.patch +GIFLIB_IGNORE_CVES = CVE-2022-28506 +# 0003-Fix-CVE-2023-39742.patch +GIFLIB_IGNORE_CVES += CVE-2023-39742 + ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch deleted file mode 100644 index 24100e1f6e49..000000000000 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Wed, 30 Nov 2022 16:15:14 -0500 -Subject: [PATCH] git-compat-util: avoid redefining system function names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Our git-compat-util header defines a few noop wrappers for system -functions if they are not available. This was originally done with a -macro, but in 15b52a44e0 (compat-util: type-check parameters of no-op -replacement functions, 2020-08-06) we switched to inline functions, -because it gives us basic type-checking. - -This can cause compilation failures when the system _does_ declare those -functions but we choose not to use them, since the compiler will -complain about the redeclaration. This was seen in the real world when -compiling against certain builds of uclibc, which may leave -_POSIX_THREAD_SAFE_FUNCTIONS unset, but still declare flockfile() and -funlockfile(). - -It can also be seen on any platform that has setitimer() if you choose -to compile without it (which plausibly could happen if the system -implementation is buggy). E.g., on Linux: - - $ make NO_SETITIMER=IWouldPreferNotTo git.o - CC git.o - In file included from builtin.h:4, - from git.c:1: - git-compat-util.h:344:19: error: conflicting types for ‘setitimer’; have ‘int(int, const struct itimerval *, struct itimerval *)’ - 344 | static inline int setitimer(int which UNUSED, - | ^~~~~~~~~ - In file included from git-compat-util.h:234: - /usr/include/x86_64-linux-gnu/sys/time.h:155:12: note: previous declaration of ‘setitimer’ with type ‘int(__itimer_which_t, const struct itimerval * restrict, struct itimerval * restrict)’ - 155 | extern int setitimer (__itimer_which_t __which, - | ^~~~~~~~~ - make: *** [Makefile:2714: git.o] Error 1 - -Here I think the compiler is complaining about the lack of "restrict" -annotations in our version, but even if we matched it completely (and -there is no way to match all platforms anyway), it would still complain -about a static declaration following a non-static one. Using macros -doesn't have this problem, because the C preprocessor rewrites the name -in our code before we hit this level of compilation. - -One way to fix this would just be to revert most of 15b52a44e0. What we -really cared about there was catching build problems with -precompose_argv(), which most platforms _don't_ build, and which is our -custom function. So we could just switch the system wrappers back to -macros; most people build the real versions anyway, and they don't -change. So the extra type-checking isn't likely to catch bugs. - -But with a little work, we can have our cake and eat it, too. If we -define the type-checking wrappers with a unique name, and then redirect -the system names to them with macros, we still get our type checking, -but without redeclaring the system function names. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/git-compat-util.h b/git-compat-util.h -index af05077560..f6882b9b50 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -341,11 +341,12 @@ struct itimerval { - #endif - - #ifdef NO_SETITIMER --static inline int setitimer(int which UNUSED, -- const struct itimerval *value UNUSED, -- struct itimerval *newvalue UNUSED) { -+static inline int git_setitimer(int which, -+ const struct itimerval *value, -+ struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - - #ifndef NO_LIBGEN_H -@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); - #endif - - #ifndef _POSIX_THREAD_SAFE_FUNCTIONS --static inline void flockfile(FILE *fh UNUSED) -+static inline void git_flockfile(FILE *fh) - { - ; /* nothing */ - } --static inline void funlockfile(FILE *fh UNUSED) -+static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#define flockfile(fh) git_flockfile(fh) -+#define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) - #endif - - -base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch deleted file mode 100644 index f6207300ee8b..000000000000 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 2 Dec 2022 06:05:38 -0500 -Subject: [PATCH] git-compat-util: undefine system names before redeclaring - them - -When we define a macro to point a system function (e.g., flockfile) to -our custom wrapper, we should make sure that the system did not already -define it as a macro. This is rarely a problem, but can cause -compilation failures if both of these are true: - - - we decide to define our own wrapper even though the system provides - the function; we know this happens at least with uclibc, which may - declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS - - - the system version is declared as a macro; we know this happens at - least with uclibc's version of getc_unlocked() - -So just handling getc_unlocked() would be sufficient to deal with the -real-world case we've seen. But since it's easy to do, we may as well be -defensive about the other macro wrappers added in the previous patch. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/git-compat-util.h b/git-compat-util.h -index f6882b9b50..dadb9e55cb 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -346,6 +346,7 @@ static inline int git_setitimer(int which, - struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#undef setitimer - #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - -@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#undef flockfile -+#undef funlockfile -+#undef getc_unlocked - #define flockfile(fh) git_flockfile(fh) - #define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/git.hash b/package/git/git.hash index b7840cd1eb62..d63fb0968669 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz +sha256 7aa19f7cd54df2edb9b66dd74c1acf9672ebfe1d018e0d88789450d31fdab7eb git-2.39.3.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 206d06ffe7f4..b0c70fa9e1b9 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.2 +GIT_VERSION = 2.39.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 2a687226630f..27a87be19051 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -12,7 +12,13 @@ GKRELLM_LICENSE_FILES = COPYING COPYRIGHT GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) GKRELLM_BUILD_OPTS = \ STRIP="" \ - SYS_LIBS=$(TARGET_NLS_LIBS) + SYS_LIBS="$(GKRELLM_SYS_LIBS)" + +GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GKRELLM_SYS_LIBS += -latomic +endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) GKRELLM_DEPENDENCIES += lm-sensors diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 4ce4c6f6d1fb..b2eee2e9af55 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz +sha256 30cdd65d82b6d53d4470e4bf89cab7c5cc1a8edaf8830358d8542e1c847e2d0b glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 354f035d3355..324fb0de9a65 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,8 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c +GLIBC_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 + # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -20,6 +21,56 @@ GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES GLIBC_CPE_ID_VENDOR = gnu +# Extract the base version (e.g. 2.36) from GLIBC_VERSION in order to +# allow proper matching with the CPE database. +GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) + +# Fixed by b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9, which is between +# 2.36 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2022-39046 + +# Fixed by 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f, which is between +# 2.36 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4527 + +# Fixed by a9728f798ec7f05454c95637ee6581afaa9b487d, which is between +# 2.36 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4806 + +# Fixed by 22955ad85186ee05834e47e665056148ca07699c, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-4911 + +# Fixed by 856bac55f98dc840e7c27cfa82262b933385de90, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-5156 + +# Fixed by d1a83b6767f68b3cb5b4b4ea2617254acd040c82, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by b9b7d6a27aa0632f334352fa400771115b3c69b7, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + +# All these CVEs are considered as not being security issues by +# upstream glibc: +# https://security-tracker.debian.org/tracker/CVE-2010-4756 +# https://security-tracker.debian.org/tracker/CVE-2019-1010022 +# https://security-tracker.debian.org/tracker/CVE-2019-1010023 +# https://security-tracker.debian.org/tracker/CVE-2019-1010024 +# https://security-tracker.debian.org/tracker/CVE-2019-1010025 +GLIBC_IGNORE_CVES += \ + CVE-2010-4756 \ + CVE-2019-1010022 \ + CVE-2019-1010023 \ + CVE-2019-1010024 \ + CVE-2019-1010025 + # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash index b7d19b261ce0..19272d2b9079 100644 --- a/package/glibmm2_66/glibmm2_66.hash +++ b/package/glibmm2_66/glibmm2_66.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum -sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.tar.xz +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.6.sha256sum +sha256 5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f glibmm-2.66.6.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk index b58c7ca8df21..7f28342c525c 100644 --- a/package/glibmm2_66/glibmm2_66.mk +++ b/package/glibmm2_66/glibmm2_66.mk @@ -5,7 +5,7 @@ ################################################################################ GLIBMM2_66_VERSION_MAJOR = 2.66 -GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).6 GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9b402767fd8e..a077c89d9277 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -23,6 +23,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP GMP_CONF_OPTS += --disable-assembly endif +# GMP needs M extension for riscv assembly +ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_CUSTOM_RVM),y:) +GMP_CONF_OPTS += --disable-assembly +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GMP_CONF_OPTS += --enable-cxx else diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in index 8e35fddbcb79..d456a23837d5 100644 --- a/package/gnu-efi/Config.in +++ b/package/gnu-efi/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_aarch64_be default y if BR2_i386 - default y if BR2_mips64el default y if BR2_x86_64 config BR2_PACKAGE_GNU_EFI diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 93b588837034..686a14be01bc 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -24,8 +24,6 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) GNU_EFI_PLATFORM = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 -else ifeq ($(BR2_mips64el),y) -GNU_EFI_PLATFORM = mips64el endif GNU_EFI_MAKE_OPTS = \ diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c642862fe2fd..c821afb55e35 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 -# Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 +sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 +# Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 73de185ba7c1..986da4790c9b 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.0 +GNUPG2_VERSION = 2.4.4 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index d9218b533d65..8eb7778d9975 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -116,6 +116,13 @@ ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to avoid pybind11 to overwrite variables provided +# by gnuradio and buildroot +GNURADIO_CONF_OPTS += -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF +# mandatory to avoid pybind11 to force libraries extensions +# with a name based on host architecture +GNURADIO_CONF_ENV += _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PYTHONPATH=$(PYTHON3_PATH) # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 303f1351e07c..47fb34ea7cb9 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig -sha256 c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 gnutls-3.7.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig +sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 6e2cc501ef26..8a4f3345aa9c 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,8 +5,8 @@ ################################################################################ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS -GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION_MAJOR = 3.8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) @@ -16,7 +16,6 @@ GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ @@ -44,7 +43,6 @@ GNUTLS_INSTALL_STAGING = YES HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle HOST_GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go-bootstrap-stage1/Config.in.host new file mode 100644 index 000000000000..56a743caf923 --- /dev/null +++ b/package/go-bootstrap-stage1/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of supported architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap/go-bootstrap.hash rename to package/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk new file mode 100644 index 000000000000..3e4ee5743291 --- /dev/null +++ b/package/go-bootstrap-stage1/go-bootstrap-stage1.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# go-bootstrap-stage1 +# +################################################################################ + +# Use last C-based Go compiler: v1.4.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE1_VERSION = 1.4-bootstrap-20171003 +GO_BOOTSTRAP_STAGE1_SITE = https://dl.google.com/go +GO_BOOTSTRAP_STAGE1_SOURCE = go$(GO_BOOTSTRAP_STAGE1_VERSION).tar.gz + +GO_BOOTSTRAP_STAGE1_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE1_LICENSE_FILES = LICENSE + +HOST_GO_BOOTSTRAP_STAGE1_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE1_VERSION) + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV = \ + GOOS=linux \ + GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_STAGE1_ROOT)" \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE1_BUILD_CMDS + cd $(@D)/src && $(HOST_GO_BOOTSTRAP_STAGE1_MAKE_ENV) ./make.bash +endef + +define HOST_GO_BOOTSTRAP_STAGE1_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ + + # The Go sources must be installed to the host/ tree for the Go stdlib. + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE1_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go-bootstrap-stage2/Config.in.host new file mode 100644 index 000000000000..967ddaed1dd3 --- /dev/null +++ b/package/go-bootstrap-stage2/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash new file mode 100644 index 000000000000..6d4c718a405b --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk new file mode 100644 index 000000000000..72f3200a2ef0 --- /dev/null +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# go-bootstrap-stage2 +# +################################################################################ + +# Use last Go version that go-bootstrap-stage1 can build: v1.19.x +# See https://golang.org/doc/install/source#bootstrapFromSource +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11 +GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE2_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE2_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage1 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE2_DEPENDENCIES = host-go-bootstrap-stage1 + +HOST_GO_BOOTSTRAP_STAGE2_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE2_VERSION) + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV = \ + GO111MODULE=off \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE1_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE2_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE2_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE2_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg + cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/pkg/ + + # The Go sources must be installed to the host/ tree for the Go stdlib. + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE2_ROOT)/ +endef + +$(eval $(host-generic-package)) diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host deleted file mode 100644 index fab80d24b4de..000000000000 --- a/package/go-bootstrap/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS - bool - # See src/cmd/dist/unix.c for the list of support - # architectures - default y if BR2_HOSTARCH = "x86" - default y if BR2_HOSTARCH = "x86_64" - default y if BR2_HOSTARCH = "arm" diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index 71696a1540e1..000000000000 --- a/package/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -# Use last C-based Go compiler: v1.4.x -# See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_VERSION = 1.4-bootstrap-20171003 -GO_BOOTSTRAP_SITE = https://dl.google.com/go -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3-Clause -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch new file mode 100644 index 000000000000..4f53356ffc6b --- /dev/null +++ b/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch @@ -0,0 +1,73 @@ +From 6b05378097c6a386ed9912d2471976dc39504e86 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Thu, 27 Jul 2023 21:28:47 -0700 +Subject: [PATCH] cmd/dist: set buildvcs=false when building go-bootstrap + +When building go-bootstrap as part of the make.bash process, the cmd/dist +invokes the bootstrap Go compiler to build the go_bootstrap tool: + +${GOROOT_BOOTSTRAP}/bin/go install -tags=math_big_pure_go compiler_bootstrap purego bootstrap/cmd/... + +If there is an invalid .git directory in a parent of ${GOROOT_BOOTSTRAP}, +make.bash will fail. Reproduction of the issue: + + mkdir go-issue-61620 + cd ./go-issue-61620 + wget https://go.dev/dl/go1.19.11.src.tar.gz + mkdir go-bootstrap + tar -xf go1.19.11.src.tar.gz -C ./go-bootstrap --strip-components=1 + cd ./go-bootstrap/src/ + bash make.bash + cd ../../ + wget https://go.dev/dl/go1.20.6.src.tar.gz + mkdir go + tar -xf go1.20.6.src.tar.gz -C ./go/ --strip-components=1 + printf "gitdir: ../../does/not/exist/.git" > ./.git + cd ./go/src/ + GOROOT_BOOTSTRAP=$(pwd)/../../go-bootstrap/ bash make.bash + +The build fails with the following error: + + Building Go toolchain1 using [snip]/go-1.19.10. + error obtaining VCS status: exit status 128 + Use -buildvcs=false to disable VCS stamping. + go tool dist: FAILED: [snip]/go-1.19.10/bin/go install -tags=math_big_pure_go \ + compiler_bootstrap purego bootstrap/cmd/...: exit status 1 + +This change unconditionally sets -buildvcs=false when compiling go-bootstrap. We +don't need the revision information in those binaries anyway. Setting this flag +was previously not done as we were unsure if the go-bootstrap compiler would be +new enough to support the buildvcs build flag. Since Go 1.20.x, Go 1.19.x is the +minimum version for go-bootstrap, and supports -buildvcs=false. We can now set +-buildvcs=false without worrying about compatibility. + +Related: https://github.com/golang/go/issues/54852 +Fixes: https://github.com/golang/go/issues/61620 + +--- + +Upstream: https://github.com/golang/go/pull/61621 + +Signed-off-by: Christian Stewart + +--- + src/cmd/dist/buildtool.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go +index a528d7aa76..3b411d6ebb 100644 +--- a/src/cmd/dist/buildtool.go ++++ b/src/cmd/dist/buildtool.go +@@ -221,6 +221,9 @@ func bootstrapBuildTools() { + cmd := []string{ + pathf("%s/bin/go", goroot_bootstrap), + "install", ++ // Fixes cases where an invalid .git is present in a parent of GOROOT_BOOTSTRAP. ++ // See: https://github.com/golang/go/issues/61620 ++ "-buildvcs=false", + "-tags=math_big_pure_go compiler_bootstrap purego", + } + if vflag > 0 { +-- +2.41.0 + diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch deleted file mode 100644 index f51c2ca093f5..000000000000 --- a/package/go/0003-runtime-support-riscv64-SV57-mode.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 -From: Dmitry Vyukov -Date: Fri, 27 May 2022 18:55:35 +0200 -Subject: [PATCH] runtime: support riscv64 SV57 mode - -Riscv64 has SV57 mode when user-space VA is 56 bits. -Linux kernel recently got support for this mode and Go binaries started crashing as: - -runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 -packed=0xffff5908a9400001 -> node=0xffff5908a940 - -Adjust lfstack code to use only 8 top bits of pointers on riscv64. - -For context see: -https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ - -Update #54104 - -Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 -Signed-off-by: Christian Stewart ---- - -Upstream: https://go-review.googlesource.com/c/go/+/409055/4 ---- - src/runtime/lfstack_64bit.go | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go -index 154130cf63..39fa647b9e 100644 ---- a/src/runtime/lfstack_64bit.go -+++ b/src/runtime/lfstack_64bit.go -@@ -36,12 +36,21 @@ const ( - // We use one bit to distinguish between the two ranges. - aixAddrBits = 57 - aixCntBits = 64 - aixAddrBits + 3 -+ -+ // Riscv64 SV57 mode gives 56 bits of userspace VA. -+ // lfstack code supports it, but broader support for SV57 mode is incomplete, -+ // and there may be other issues (see #54104). -+ riscv64AddrBits = 56 -+ riscv64CntBits = 64 - riscv64AddrBits + 3 - ) - - func lfstackPack(node *lfnode, cnt uintptr) uint64 { - if GOARCH == "ppc64" && GOOS == "aix" { - return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) - } -+ if GOARCH == "riscv64" { -+ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) -+ } - return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) - } --- -2.35.1 - diff --git a/package/go/Config.in.host b/package/go/Config.in.host index ded02d3b3ac2..b87b862cec09 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + # See https://go.dev/doc/install/source#environment + # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x @@ -28,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go/go.hash b/package/go/go.hash index 89e2fd952f01..3b6b542e31f5 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 go1.19.7.src.tar.gz +sha256 1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b67f4e go1.20.14.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index a94603f26886..937ebbdb6554 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.7 +GO_VERSION = 1.20.14 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -89,6 +89,7 @@ HOST_GO_TARGET_ENV = \ # any target package needing cgo support must include # 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +HOST_GO_DEPENDENCIES += toolchain HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 @@ -126,7 +127,7 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -145,21 +146,21 @@ define HOST_GO_INSTALL_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt + mkdir -p $(HOST_DIR)/bin ln -sf ../lib/go/bin/go $(HOST_DIR)/bin/ ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/bin/ cp -a $(@D)/lib $(HOST_GO_ROOT)/ mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ + cp -a $(@D)/pkg/include $(HOST_GO_ROOT)/pkg/ cp -a $(@D)/pkg/tool $(HOST_GO_ROOT)/pkg/ - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 + # The Go sources must be installed to the host/ tree for the Go stdlib. cp -a $(@D)/src $(HOST_GO_ROOT)/ - # Set all file timestamps to prevent the go compiler from rebuilding any - # built in packages when programs are built. + # Set file timestamps to prevent the Go compiler from rebuilding the stdlib + # when compiling other programs. find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef diff --git a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch new file mode 100644 index 000000000000..2c3619b74b1f --- /dev/null +++ b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch @@ -0,0 +1,30 @@ +From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 +From: mingtaoxt xt +Date: Wed, 19 Oct 2022 19:36:13 +0800 +Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include + " + +Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 +Reviewed-by: Mike Frysinger +Upstream: https://chromium.googlesource.com/breakpad/breakpad/+/7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa +Signed-off-by: Thomas Petazzoni +--- + src/client/linux/handler/minidump_descriptor.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h +index 4349b88f..d822c9d9 100644 +--- a/src/client/linux/handler/minidump_descriptor.h ++++ b/src/client/linux/handler/minidump_descriptor.h +@@ -32,6 +32,7 @@ + #include + #include + ++#include + #include + + #include "client/linux/handler/microdump_extra_info.h" +-- +2.43.0 + diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 4320ad64aa43..f03648e93673 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT @@ -34,14 +34,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - if BR2_PACKAGE_GOOGLE_BREAKPAD config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS @@ -51,3 +43,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS minidump_stackwalk and microdump_stackwalk. endif + +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/google-breakpad/gen-syms.sh b/package/google-breakpad/gen-syms.sh index 2bc0afafb6fe..4bc020ec1989 100755 --- a/package/google-breakpad/gen-syms.sh +++ b/package/google-breakpad/gen-syms.sh @@ -14,7 +14,7 @@ error() { exit 1 } -for FILE in ${@}; do +for FILE in "${@}"; do f="${TARGET_DIR}${FILE}" if [ ! -e "${f}" ]; then error "%s: No such file or directory\n" "${FILE}" diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch new file mode 100644 index 000000000000..250c0715823f --- /dev/null +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -0,0 +1,44 @@ +From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Damian Kurek +Date: Thu, 7 Jul 2022 03:39:16 +0000 +Subject: [PATCH] Fix NULL dereference when duplicating string argument + +poptGetArg can return NULL if there are no additional arguments, which +makes strdup dereference NULL on strlen + +Signed-off-by: Stefan Agner +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9 +--- + gptcl.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 0d578eb..ab95239 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = strdup((char*) poptGetArg(poptCon)); +- poptResetContext(poptCon); ++ device = (char*) poptGetArg(poptCon); + + if (device != NULL) { ++ device = strdup(device); ++ poptResetContext(poptCon); + JustLooking(); // reset as necessary + BeQuiet(); // Tell called functions to be less verbose & interactive + if (LoadPartitions((string) device)) { +@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + cerr << "Error encountered; not saving changes.\n"; + retval = 4; + } // if ++ free(device); + } // if (device != NULL) + poptFreeContext(poptCon); + return retval; +-- +2.40.0 + diff --git a/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch new file mode 100644 index 000000000000..22c34ced6f90 --- /dev/null +++ b/package/gptfdisk/0004-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch @@ -0,0 +1,41 @@ +From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Sat, 16 Apr 2022 09:32:04 -0400 +Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid + +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f +Signed-off-by: Ben Wolsieffer +--- + NEWS | 2 ++ + guid.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 9e153fd..9ec7e63 100644 +--- a/NEWS ++++ b/NEWS +@@ -6,6 +6,8 @@ + (commit 740, which is pre-release as I type; presumably version 1.19 and + later once released). + ++- Updated guid.cc to deal with minor change in libuuid. ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/guid.cc b/guid.cc +index 1e73ab7..d3e4fd5 100644 +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); +-- +2.42.0 + diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index f3fc9302025d..393ea9469a76 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -14,6 +14,8 @@ GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk GPTFDISK_DEPENDENCIES += util-linux +GPTFDISK_LDLIBS += -luuid + ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) GPTFDISK_DEPENDENCIES += host-pkgconf popt GPTFDISK_SGDISK_LDLIBS += `$(PKG_CONFIG_HOST_BINARY) --libs popt` diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index 80130da5d66c..a894aedf1186 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 GraphicsMagick-1.3.38.tar.xz +sha256 97dc1a9d4e89c77b25a3b24505e7ff1653b88f9bfe31f189ce10804b8efa7746 GraphicsMagick-1.3.40.tar.xz sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index dbaa8ddf7049..76b826ceef5a 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.38 +GRAPHICSMAGICK_VERSION = 1.3.40 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 51ea74a0cb65..86f8c772c93a 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum -sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.9.tar.xz.sha256sum +sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 6f7168279b37..32891bafa659 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.0 +GST_OMX_VERSION = 1.22.9 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 46480445abb1..6cf7c9597fa6 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum -sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum +sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 8fd3321d9e80..0c085b8b42b4 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.0 +GST1_DEVTOOLS_VERSION = 1.22.9 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index c2c58ab2fe90..b5bc84d672b1 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum -sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum +sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index d4b3873af119..1b872b7fa924 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.0 +GST1_LIBAV_VERSION = 1.22.9 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 90b3a18982b7..174c4ad572b1 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum -sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum +sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index edac81898592..a61038376f7c 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.0 +GST1_PLUGINS_BAD_VERSION = 1.22.9 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index bac4f8398ac5..060a871b954b 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum -sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum +sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 7d509331fe4a..512e3fdee21d 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.0 +GST1_PLUGINS_BASE_VERSION = 1.22.9 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 3e219faad867..4410da6ef403 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum -sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum +sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 93c2328bdace..fea35c647075 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.0 +GST1_PLUGINS_GOOD_VERSION = 1.22.9 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 21579216df06..20394619b0b5 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum -sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum +sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 9f16fa3da8fc..7bb95dd1d001 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.0 +GST1_PLUGINS_UGLY_VERSION = 1.22.9 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 128a739c2cad..2f352df92e70 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum -sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum +sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 2fc268b0aca7..501ca5e02b7d 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.0 +GST1_PYTHON_VERSION = 1.22.9 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES @@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \ # the correct .so file, and the resulting compiled library has the appropriate # path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so GST1_PYTHON_CONF_OPTS += \ - -Dlibpython-dir=/usr/lib/ + -Dlibpython-dir=/usr/lib/ \ + -Dtests=disabled $(eval $(meson-package)) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index f37e7bb292b6..21f380378cd1 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum -sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum +sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 6b4bd49fded3..87e6413d006d 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.0 +GST1_RTSP_SERVER_VERSION = 1.22.9 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.1+ diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index a1062097ed7e..d6a1542ad315 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 6dec625c9358..ec23ae7c6b62 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum -sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum +sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9533cdf2b60d..d934bab2333b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.0 +GST1_VAAPI_VERSION = 1.22.9 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ @@ -39,6 +39,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index df1d2f59c3ca..bfe1a40bfddb 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_GSTD select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_READLINE help GStreamer Daemon, also called gstd, is a GStreamer framework for controlling audio and video streaming using an diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index ccb3b3e1bc09..965ede7949eb 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -17,8 +17,7 @@ GSTD_DEPENDENCIES = \ libdaemon \ libedit \ libglib2 \ - libsoup \ - readline + libsoup GSTD_CONF_OPTS = \ -Denable-tests=disabled \ diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch deleted file mode 100644 index 6c190d37273d..000000000000 --- a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 31 Jan 2023 21:38:09 -0700 -Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name - -The gst-devtools project generates gstreamer-validate-1.0.pc, this -must match the dependency in gst-editing-services for detection -to work properly. - -Fixes: -Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index bdc47f5d8b..b949f55317 100644 ---- a/meson.build -+++ b/meson.build -@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' - endif - gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_controller_dep']) --gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), -+gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), - fallback : ['gst-devtools', 'validate_dep']) - - gio_dep = dependency('gio-2.0', version: glib_req) --- -2.34.1 - diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index bd5dcfdbafb6..2ea29dae6179 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum -sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum +sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 0ae9205c3b45..e2c0f1ccf810 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index db0ed5bede2a..b6ed001eb383 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum -sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum +sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 09d1a10ce756..5b9125e62a9c 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.0 +GSTREAMER1_VERSION = 1.22.9 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 000000000000..46e09c267eec --- /dev/null +++ b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,113 @@ +From c3d084736cca81dd4ec05f7e4b634050eb6e8525 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d + +Signed-off-by: Bernd Kuhls +[Bernd: backported to branch gupnp-1.4] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 8 ++++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index deb4b42..17c485a 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -613,8 +613,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..1c7489e 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,12 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); ++ + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index f089152..079219f 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -87,8 +87,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 5dd1bfc..eed9882 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1561,8 +1561,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 2794ebc..e82daaa 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -1002,8 +1002,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + +-- +2.39.2 + diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch new file mode 100644 index 000000000000..b3b1f732abc4 --- /dev/null +++ b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch @@ -0,0 +1,36 @@ +From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Thu, 8 Dec 2022 08:32:57 +0100 +Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a + +We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf +has minimal includes and among them bug.h which includes atomic.h. Atomic.h +may use "forceinline" without including compiler.h, hence the build error. +It was verified that adding it doesn't inflate the total headers. + +Since all other C files include api.h which already covers this, there's +no real need to bapkport this. The issue was already there in 2.3 though. + +Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1 + +Signed-off-by: Bernd Kuhls +--- + include/haproxy/atomic.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h +index f60be95..7e3c826 100644 +--- a/include/haproxy/atomic.h ++++ b/include/haproxy/atomic.h +@@ -23,6 +23,8 @@ + #ifndef _HAPROXY_ATOMIC_H + #define _HAPROXY_ATOMIC_H + ++#include ++ + /* A few notes for the macros and functions here: + * - this file is painful to edit, most operations exist in 3 variants, + * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when +-- +1.7.10.4 + diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index f5540ee44a2f..74390c2ff5e5 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 -sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz.sha256 +sha256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd haproxy-2.6.15.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 012c1dfdb67d..61a9ebebe4da 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch new file mode 100644 index 000000000000..7323ac70df02 --- /dev/null +++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch @@ -0,0 +1,57 @@ +From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001 +From: Andrew Sim +Date: Sat, 10 Jun 2023 09:00:24 +0200 +Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON + package + +This patch removes the need for an external package. + +Ported from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch +https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b + +Upstream: https://github.com/heimdal/heimdal/pull/1176 + +Signed-off-by: Bernd Kuhls +--- + cf/make-proto.pl | 4 ++-- + configure.ac | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/cf/make-proto.pl b/cf/make-proto.pl +index 36a040ce6..4af21916b 100644 +--- a/cf/make-proto.pl ++++ b/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +diff --git a/configure.ac b/configure.ac +index cedb4c01f..cecd030e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" || + AC_KRB_PROG_PERL + AC_KRB_PERL_MOD(Getopt::Std) + AC_KRB_PERL_MOD(File::Compare) +- AC_KRB_PERL_MOD(JSON) + fi + + AC_KRB_PROG_YACC +-- +2.39.2 + diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index cf822340daf4..250ddbbd4dbb 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,3 @@ -# From https://github.com/heimdal/heimdal/releases -sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz -sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed +sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 21b6c0ccb3bb..59b64c358b1a 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,9 +4,10 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.1 -HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) +HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ @@ -39,14 +40,7 @@ define HOST_HEIMDAL_INSTALL_COMPILE_ET $(HOST_DIR)/bin/compile_et endef -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/bin/asn1_compile -endef - HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET \ - HOST_HEIMDAL_MAKE_SYMLINK + HOST_HEIMDAL_INSTALL_COMPILE_ET $(eval $(host-autotools-package)) diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index d3b8ad437aed..063fccf5eb1c 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -12,8 +12,10 @@ HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssap HEIRLOOM_MAILX_LICENSE_FILES = COPYING HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx -# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches +# 0011-outof-Introduce-expandaddr-flag.patch in the Debian patches HEIRLOOM_MAILX_IGNORE_CVES += CVE-2014-7844 +# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches +HEIRLOOM_MAILX_IGNORE_CVES += CVE-2004-2771 ifeq ($(BR2_PACKAGE_OPENSSL),y) HEIRLOOM_MAILX_DEPENDENCIES += openssl diff --git a/package/htop/htop.hash b/package/htop/htop.hash index d43da134414c..12dc864de11d 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,5 +1,5 @@ -# From https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz.sha256 -sha256 5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb htop-3.2.1.tar.xz +# From https://github.com/htop-dev/htop/releases/download/3.2.2/htop-3.2.2.tar.xz.sha256 +sha256 bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 htop-3.2.2.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index df2ec25908de..aafda5d48fae 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.2.1 +HTOP_VERSION = 3.2.2 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 00fe6c145520..4bda6c732939 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -8,6 +8,7 @@ HWDATA_VERSION = 0.365 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE +HWDATA_INSTALL_STAGING = YES HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ @@ -15,7 +16,22 @@ HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) +define HWDATA_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define HWDATA_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc +endef + ifneq ($(strip $(HWDATA_FILES)),) +define HWDATA_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ + $(addprefix $(@D)/,$(HWDATA_FILES)) +endef define HWDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \ diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index b14647219553..8010b857f078 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,6 +1,5 @@ -# From https://www.open-mpi.org/software/hwloc/v2.8/ -md5 1d40ecdded67bbe4bafc8f8e8479376c hwloc-2.8.0.tar.bz2 -sha1 314faaeda9f1982da97fca93b83307bc34d5b414 hwloc-2.8.0.tar.bz2 -sha256 348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1 hwloc-2.8.0.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.9/ +sha1 76b49087619b46d71e18bd1131d35a5ccf5de791 hwloc-2.9.3.tar.bz2 +sha256 5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec hwloc-2.9.3.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 3f73b3ecc8c2..8fe9e648a7b0 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.8 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 +HWLOC_VERSION_MAJOR = 2.9 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).3 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 8107796ae95d..111c2124e4f0 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -17,9 +17,6 @@ ICU_CPE_ID_VENDOR = icu-project ICU_CPE_ID_PRODUCT = international_components_for_unicode ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION)) -# 0005-ICU-21587-Fix-memory-bug-w-baseName.patch -ICU_IGNORE_CVES += CVE-2021-30535 - ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES ICU_CONFIG_SCRIPTS = icu-config diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 8988dad5da04..fd80316ec572 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4333ef2fe63f2510988af82b726f5b1919ebd54037ea6674566c69fcceb67e11 imagemagick-7.1.0-51.tar.gz +sha256 09402e5f17c6575ef9f010bb2e21ae1710f1f3426f115ad4317ee9129c32608e imagemagick-7.1.1-21.tar.gz sha256 8cceeb67d4e783cb63075c7311fdb990fa0369ee80fbd0f481064cd02386ca2d LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 8a2ec460d5f1..57ea405e898e 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.1.0-51 +IMAGEMAGICK_VERSION = 7.1.1-21 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index 537e4abd2f77..c59437ec73e5 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on BR2_x86_64 depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d @@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8 endif # BR2_PACKAGE_INTEL_MEDIADRIVER -comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" +comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 56f023727722..742332d552f3 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8d14a914815f56c27b1f41be0fd699d1afcfdbc05432056427e455100798975e intel-microcode-20221108.tar.gz +sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 787537da785b..a159baa93d37 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20221108 +INTEL_MICROCODE_VERSION = 20231114 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/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index 50d08239fa8b..dec69d2abf57 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 +sha256 5ed8f20819a5bdb089829fc62c9a2c685252759d5c3ec289492e6ef5762f4e3b ipcalc-1.0.3.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index e63e174ce20b..c1eba5d59f46 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.2 +IPCALC_VERSION = 1.0.3 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 15c75b6dac24..02ada0dcc644 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.12.tar.gz.sha256 -sha256 72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 iperf-3.12.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 +sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz # Locally computed -sha256 a5c2e3d799f2835156e565a3de4fad33d32ed289cdc9e414dfaf75719fd12ef9 LICENSE +sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 9041c8657597..c00b16ce613d 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.12 +IPERF3_VERSION = 3.14 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index ecd339d83d4d..df72ee4d7678 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 79a4765d2dfe153c440a1775b074d5d0682b96814c7cf92325b5e15ce50e26a8 irssi-1.4.2.tar.xz +sha256 fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead irssi-1.4.4.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index c2d02289adca..6790bf0c966a 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.4.2 +IRSSI_VERSION = 1.4.4 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://codeberg.org/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 1647f93d9ef7..3f18146e133e 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz +sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index c54031b1021e..af6b2f849a7e 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.3 +IWD_VERSION = 2.16 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ diff --git a/package/jhead/jhead.hash b/package/jhead/jhead.hash index bd9c8560d5fd..1fe856198dc4 100644 --- a/package/jhead/jhead.hash +++ b/package/jhead/jhead.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 5c5258c3d7a840bf831e22174e4a24cb1de3baf442f7cb73d5ab31b4ae0b0058 jhead-3.06.0.1.tar.gz -sha256 8b709512c737fc0c1e1024800b9a44c54d14ab02132c636a66c3ac66955c3e95 readme.txt +sha256 999a81b489c7b2a7264118f194359ecf4c1b714996a2790ff6d5d2f3940f1e9f jhead-3.08.tar.gz +sha256 b3971a74d00c834bc7f112d8a0027b25663fd1637a21381a3e5df4bd2b614dff readme.txt diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index a206e2fe3429..f07739bc2134 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.06.0.1 +JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt diff --git a/package/joe/joe.mk b/package/joe/joe.mk index f0cac402e126..9346ec1fd3cb 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -8,6 +8,7 @@ JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING +JOE_CPE_ID_VENDOR = joseph_allen ifeq ($(BR2_PACKAGE_NCURSES),y) JOE_DEPENDENCIES += ncurses diff --git a/package/jq/Config.in b/package/jq/Config.in index 5edb5d0989b2..ed2e0fa34f18 100644 --- a/package/jq/Config.in +++ b/package/jq/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_JQ filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text. - http://stedolan.github.io/jq/ + https://jqlang.github.io/jq/ comment "jq needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/jq/jq.hash b/package/jq/jq.hash index 125781385c67..d4d8656ea03f 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20249104d4df2247253df6df4a980b8be1f5232f03fef7cd41bacb7e6eab04fd jq-a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz -sha256 c8437d414ca5b394718784c3bf5bdff7f01fee417625fabf1fb722ca263037da COPYING +sha256 478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2 jq-1.7.1.tar.gz +sha256 10e974638a41fadfd72357f2f3a4325e20b856c563365128f72feaa406f8c92d COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 7f890f89987c..8c417fad31a8 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,25 +4,18 @@ # ################################################################################ -JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 -JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) +JQ_VERSION = 1.7.1 +JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING JQ_CPE_ID_VENDOR = jq_project JQ_INSTALL_STAGING = YES -# currently using git version directly -JQ_AUTORECONF = YES - # uses c99 specific features -# _GNU_SOURCE added to fix gcc6+ host compilation -# (https://github.com/stedolan/jq/issues/1598) -JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" -HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE" +JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" +HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99" -# jq explicitly enables maintainer mode, which we don't need/want -JQ_CONF_OPTS += --disable-maintainer-mode -HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma +HOST_JQ_CONF_OPTS += --without-oniguruma ifeq ($(BR2_PACKAGE_ONIGURUMA),y) JQ_DEPENDENCIES += oniguruma diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 9af7f9a83efb..e4a2170f8742 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 7668f6724927..1f0e5efdb832 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 json-3.11.2.tar.gz +sha256 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 json-3.11.3.tar.gz sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 435644fd5338..b89eb32a45de 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.11.2 +JSON_FOR_MODERN_CPP_VERSION = 3.11.3 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index b31c66bbe725..c3e6ebefe5c7 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 09ab343e9bf10ddfdd3216f400b19740a391645bf3645fa6f136b8da36306559 ksmbd-tools-3.4.6.tar.gz +sha256 ab377b3044c48382303f3f7ec95f2e1a17592c774d70b2a11f32952099dbb214 ksmbd-tools-3.5.1.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index c4f9c503e66c..c56c6e10bbc8 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.6 +KSMBD_TOOLS_VERSION = 3.5.1 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index df6ae7e0f1fd..9c58e448763b 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -17,6 +17,7 @@ KVMTOOL_DEPENDENCIES = \ $(if $(BR2_PACKAGE_ZLIB),zlib) KVMTOOL_LICENSE = GPL-2.0 KVMTOOL_LICENSE_FILES = COPYING +KVMTOOL_CPE_ID_VENDOR = kvmtool_project # Disable -Werror, otherwise musl is not happy KVMTOOL_MAKE_OPTS = \ diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in index 042abd69df96..e5ff432d407f 100644 --- a/package/lcdproc/Config.in +++ b/package/lcdproc/Config.in @@ -1,4 +1,4 @@ -comment "lcdproc needs a toolchain w/ dynamic library" +comment "lcdproc needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_LCDPROC diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c27a..569d2829c345 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib diff --git a/package/less/less.mk b/package/less/less.mk index f01f94d6c852..2c68ac5a1193 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -14,8 +14,4 @@ LESS_DEPENDENCIES = ncurses # 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch LESS_IGNORE_CVES += CVE-2022-46663 -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef - $(eval $(autotools-package)) diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index e13e49346b59..12cfbc4ef42b 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -9,6 +9,7 @@ LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ LIBAIO_LICENSE_FILES = COPYING +LIBAIO_CPE_ID_VENDOR = libaio_project LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index beb7639b1f7f..bf9b8251d758 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz +sha256 f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 libass-0.17.1.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 1cc83103128c..8b14c899c4dc 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.17.0 +LIBASS_VERSION = 0.17.1 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4f98621bd831..8e9caf623bd3 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -29,12 +29,13 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO config BR2_PACKAGE_LIBBLOCKDEV_FS bool "filesystem" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_PARTED -comment "filesystem plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "filesystem plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_LOOP bool "loop" @@ -42,11 +43,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_LOOP config BR2_PACKAGE_LIBBLOCKDEV_LVM2 bool "lvm2" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED select BR2_PACKAGE_LVM2 -comment "lvm2 support needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "lvm2 support needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_MDRAID bool "mdraid" @@ -55,10 +57,11 @@ config BR2_PACKAGE_LIBBLOCKDEV_MDRAID config BR2_PACKAGE_LIBBLOCKDEV_PART bool "part" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED -comment "part plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "part plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 63c06173dbf2..e2c992e7c292 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -33,6 +33,13 @@ config BR2_PACKAGE_LIBCAMERA_V4L2 config BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE bool +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IMX8_ISI + bool "imx8-isi pipeline" + depends on BR2_arm || BR2_aarch64 + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for i.MX8 SoC ISI capture interface. + config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 bool "ipu3 pipeline" depends on BR2_i386 || BR2_x86_64 diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 01c4cb2ff263..550ae0289d36 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -19,6 +19,7 @@ LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ -Ddocumentation=disabled \ -Dtest=false \ + -Dpycamera=disabled \ -Dwerror=false LIBCAMERA_INSTALL_STAGING = YES LIBCAMERA_LICENSE = \ @@ -50,6 +51,7 @@ else LIBCAMERA_CONF_OPTS += -Dv4l2=false endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IMX8_ISI) += imx8-isi LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y) LIBCAMERA_PIPELINES-y += raspberrypi diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 46f72c702e2f..c33460d95142 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -12,10 +12,10 @@ LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -LIBCAP_NG_CONF_OPTS = --without-python +LIBCAP_NG_CONF_OPTS = --without-python --without-python3 HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -HOST_LIBCAP_NG_CONF_OPTS = --without-python +HOST_LIBCAP_NG_CONF_OPTS = --without-python --without-python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 5fc81739057d..0f1501d31bc3 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd libcap-2.65.tar.xz +sha256 f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz # Hash for license file: -sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License +sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 728a6ba6ccff..c9727c75c969 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.65 +LIBCAP_VERSION = 2.69 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause diff --git a/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch new file mode 100644 index 000000000000..e75250d613e7 --- /dev/null +++ b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch @@ -0,0 +1,38 @@ +From 2b28d8b0e9607e71a145345b4fe49517e052b7d9 Mon Sep 17 00:00:00 2001 +From: Jon Shallow +Date: Thu, 25 Jan 2024 18:03:17 +0000 +Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information + +Upstream: https://github.com/obgm/libcoap/commit/2b28d8b0e9607e71a145345b4fe49517e052b7d9 +Signed-off-by: Fabrice Fontaine +--- + src/coap_oscore.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coap_oscore.c b/src/coap_oscore.c +index 83f785c92..e0fb22947 100644 +--- a/src/coap_oscore.c ++++ b/src/coap_oscore.c +@@ -1678,11 +1678,12 @@ get_split_entry(const char **start, + oscore_value_t *value) { + const char *begin = *start; + const char *end; ++ const char *kend; + const char *split; + size_t i; + + retry: +- end = memchr(begin, '\n', size); ++ kend = end = memchr(begin, '\n', size); + if (end == NULL) + return 0; + +@@ -1693,7 +1694,7 @@ get_split_entry(const char **start, + + if (begin[0] == '#' || (end - begin) == 0) { + /* Skip comment / blank line */ +- size -= end - begin + 1; ++ size -= kend - begin + 1; + begin = *start; + goto retry; + } diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index e0006b62af9e..20abb94f8f49 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz +sha256 ae61a48c21f7b40e1442c9e1da9aab9e6f2cf0deccb02f3fed4de232a0b0522e libcoap-4.3.4.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE +sha256 bdd94ddd8e75010aebd045ead1c951110788003395c708811d6960248acb3891 LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index c0a941a0c83c..29161142f655 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,16 +4,20 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.1 +LIBCOAP_VERSION = 4.3.4 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE +LIBCOAP_CPE_ID_VENDOR = libcoap LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES +# 0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch +LIBCOAP_IGNORE_CVES += CVE-2024-0962 + ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls LIBCOAP_CONF_OPTS += \ diff --git a/package/libcue/libcue.hash b/package/libcue/libcue.hash index 93ae2dacdbaf..47fe906e1ac6 100644 --- a/package/libcue/libcue.hash +++ b/package/libcue/libcue.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 libcue-2.2.1.tar.gz +sha256 cc1b3a65c60bd88b77a1ddd1574042d83cf7cc32b85fe9481c99613359eb7cfe libcue-2.3.0.tar.gz sha256 c388d36583fa54e13b6d73ad924d0b68d073ed8a5771e17cb49104705df4504f LICENSE diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk index 3edb4f3b6926..7ef27f5a17c9 100644 --- a/package/libcue/libcue.mk +++ b/package/libcue/libcue.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCUE_VERSION = 2.2.1 +LIBCUE_VERSION = 2.3.0 LIBCUE_SITE = $(call github,lipnitsk,libcue,v$(LIBCUE_VERSION)) LIBCUE_LICENSE = GPL-2.0, BSD-2-Clause (rem.c) LIBCUE_LICENSE_FILES = LICENSE diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 000000000000..46df1e36a25e --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 218309ed56ff..adab1ca3e6d4 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -57,7 +57,6 @@ choice config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL config BR2_PACKAGE_LIBCURL_BEARSSL bool "BearSSL" diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 32b3d0b5e2b9..1f3dce0fd55c 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.88.1.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 1a1594a45e23..22f4b20b7b21 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.1 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -13,18 +13,26 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES -# We disable NTLM support because it uses fork(), which doesn't work -# on non-MMU platforms. Moreover, this authentication method is -# probably almost never used. See -# http://curl.se/docs/manpage.html#--ntlm. +# We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') +# support because it uses fork(), which doesn't work on non-MMU platforms. +# Moreover, this authentication method is probably almost never used (see +# https://curl.se/docs/manpage.html#--ntlm), so disable NTLM support overall. +# # Likewise, there is no compiler on the target, so libcurl-option (to # generate C code) isn't very useful -LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ - --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option --disable-ldap --disable-ldaps +LIBCURL_CONF_OPTS = \ + --disable-manual \ + --disable-ntlm \ + --disable-ntlm-wb \ + --with-random=/dev/urandom \ + --disable-curldebug \ + --disable-libcurl-option \ + --disable-ldap \ + --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -56,11 +64,6 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib LIBCURL_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else @@ -111,6 +114,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 67e97c6e5ec7..c09a03332512 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -9,8 +9,17 @@ LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES + +LIBDEFLATE_CFLAGS = -D_DEFAULT_SOURCE + +# Thumb build is broken, build in ARM mode, since all architectures +# that support Thumb1 also support ARM. +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBDEFLATE_CFLAGS += -marm +endif + LIBDEFLATE_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(LIBDEFLATE_CFLAGS)" ifeq ($(BR2_SHARED_LIBS),y) LIBDEFLATE_CONF_OPTS += \ diff --git a/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch b/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch deleted file mode 100644 index c7e789c02ebd..000000000000 --- a/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f0bfd53647961e799a43d918c46cf3b6bff89806 Mon Sep 17 00:00:00 2001 -From: Moritz Bunkus -Date: Sat, 27 Feb 2021 20:36:52 +0100 -Subject: [PATCH] include appropriate header files for std::numeric_limits - -Fixes #80. - -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 4 ++++ - src/EbmlString.cpp | 1 + - src/EbmlUnicodeString.cpp | 1 + - 3 files changed, 6 insertions(+) - -diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp -index 27e55fd..4c05fcf 100644 ---- a/src/EbmlString.cpp -+++ b/src/EbmlString.cpp -@@ -34,6 +34,7 @@ - \author Steve Lhomme - */ - #include -+#include - - #include "ebml/EbmlString.h" - -diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp -index 496a16a..99fc073 100644 ---- a/src/EbmlUnicodeString.cpp -+++ b/src/EbmlUnicodeString.cpp -@@ -36,6 +36,7 @@ - */ - - #include -+#include - - #include "ebml/EbmlUnicodeString.h" - diff --git a/package/libebml/Config.in b/package/libebml/Config.in index a00b89435834..b770154af795 100644 --- a/package/libebml/Config.in +++ b/package/libebml/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_LIBEBML bool "libebml" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 help Access library for the EBML (Extensible Binary Meta Language, a binary derivative of XML) format. http://matroska.org -comment "libebml needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR +comment "libebml needs a toolchain w/ C++, wchar, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libebml/libebml.hash b/package/libebml/libebml.hash index 32ca1e3dd320..34626eb1f47e 100644 --- a/package/libebml/libebml.hash +++ b/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41c7237ce05828fb220f62086018b080af4db4bb142f31bec0022c925889b9f2 libebml-1.4.2.tar.xz +sha256 4971640b0592da29c2d426f303e137a9b0b3d07e1b81d069c1e56a2f49ab221b libebml-1.4.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk index 056cf888e134..0f69de8c810d 100644 --- a/package/libebml/libebml.mk +++ b/package/libebml/libebml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBML_VERSION = 1.4.2 +LIBEBML_VERSION = 1.4.5 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES diff --git a/package/libfastjson/libfastjson.hash b/package/libfastjson/libfastjson.hash index 218a738b3792..f220c608dfea 100644 --- a/package/libfastjson/libfastjson.hash +++ b/package/libfastjson/libfastjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 881f954633aa76931e4c756ece0bda6fd8a673c6e66955a3db3b2bb9d6bbff72 libfastjson-0.99.9.tar.gz +sha256 67cde7e85fa372036d7694f3b32cfc666705ab19367920f555af9d1c183edfef libfastjson-0.99.9.1.tar.gz sha256 b29370bbfa98816e1fca0901f18149d920736771bfd68b4ee0eb00c78b38d245 COPYING diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk index 7ab978dc67d0..5ee33ba49665 100644 --- a/package/libfastjson/libfastjson.mk +++ b/package/libfastjson/libfastjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFASTJSON_VERSION = 0.99.9 +LIBFASTJSON_VERSION = 0.99.9.1 LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,v$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 96f5e6b76c07..cfbf9eaf17d1 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de libgcrypt-1.10.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 0b9555960d84a09ea14e52360808f2e02e9c12d2 libgcrypt-1.10.2.tar.bz2 +sha256 3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03 libgcrypt-1.10.2.tar.bz2 +# Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 9232debb3a5e..b74838b64993 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.1 +LIBGCRYPT_VERSION = 1.10.2 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB @@ -21,8 +21,8 @@ LIBGCRYPT_CONF_OPTS = \ $(if $(BR2_OPTIMIZE_0),--disable-ppc-crypto-support,) \ --with-gpg-error-prefix=$(STAGING_DIR)/usr -# Libgcrypt doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) +# disable asm for broken archs +ifeq ($(BR2_i386)$(BR2_m68k_cf),y) LIBGCRYPT_CONF_OPTS += --disable-asm endif diff --git a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch index 450286462ef9..33746872ac0d 100644 --- a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch +++ b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch @@ -10,6 +10,7 @@ So let's disable the build of unit tests by default and introduce --enable-unit-tests configure option to enable it. Signed-off-by: Sergio Prado +Upstream: https://github.com/mono/libgdiplus/pull/701 --- Makefile.am | 8 ++++++-- configure.ac | 4 ++++ diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index cd0a4e03309a..54f53d19debd 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 +sha256 b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc geos-3.11.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index c6d470dc9710..5a7932bad2bd 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.1 +LIBGEOS_VERSION = 3.11.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index e834525df599..9d2cb0db489c 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz -sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING +sha256 0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75 libgit2-1.6.5.tar.gz +sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index c962c8030fd1..cc267ecf1d38 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,14 +4,15 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.1 +LIBGIT2_VERSION = 1.6.5 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ MIT (sha1), \ BSD-3-Clause (sha256), \ wildmatch license (wildmatch), \ - CC0-1.0 (xoroshiro256) + CC0-1.0 (xoroshiro256), \ + BSD-2-Clause (basename_r) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -24,6 +25,8 @@ LIBGIT2_CONF_OPTS = \ -DUSE_NTLMCLIENT=OFF \ -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) +LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO + LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index ffe27e9d99c6..5c445ba0b277 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 - -# Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.tar.bz2 +sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 +sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3ab8535a9ce4..60e3da9de14a 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.46 +LIBGPG_ERROR_VERSION = 1.47 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 9fed2c9df2e8..c62dd82577f3 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum -sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.39.sha256sum +sha256 1cac3e566b9b2f3653a458c08c2dcdfdca9f908037ac03c9d8564b4295778d79 gtk+-3.24.39.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef9b..e59cf817ca2a 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).39 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ @@ -68,7 +68,7 @@ LIBGTK3_DEPENDENCIES += xlib_libXdamage endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += -Dprint_backends=cups +LIBGTK3_CONF_OPTS += -Dprint_backends=file,cups LIBGTK3_DEPENDENCIES += cups else LIBGTK3_CONF_OPTS += -Dprint_backends=auto @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index 8759823e161e..c016cb3439e3 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0afaff837c295c868db8c967b87b1b5e21c0386c15c3b5ead474799724c54ef8 libhtp-0.5.40.tar.gz +sha256 d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606 libhtp-0.5.45.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index bb8aa73b4249..8a732d1d5c5d 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.40 +LIBHTP_VERSION = 0.5.45 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 9bd55cb76a91..a3cfb74b033d 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -11,5 +11,15 @@ LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING LIBIEC61850_CPE_ID_VENDOR = mz-automation LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF +# Examples aren't build +# https://github.com/mz-automation/libiec61850/issues/442 +LIBIEC61850_IGNORE_CVES += CVE-2023-27772 + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBIEC61850_DEPENDENCIES += mbedtls +LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=ON +else +LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=OFF +endif $(eval $(cmake-package)) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 8b622d87a9a0..7dac198ab871 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 baa9bf9931427ef5e9ddfc5b72139981047a8d0d3c03a534d9716de38cf18bb5 libite-2.5.2.tar.xz +sha256 ca086adc7ebf0c2ebf2ed7a6787f9567fb802db8583576228dd5dd5ddfb7bb97 libite-2.5.3.tar.xz # Locally calculated sha256 20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f LICENSE diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 66a8253c6293..1cef992e5332 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = 2.5.2 +LIBITE_VERSION = 2.5.3 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause diff --git a/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch new file mode 100644 index 000000000000..b856b00728a6 --- /dev/null +++ b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch @@ -0,0 +1,47 @@ +From 42e944a471672dae8522fbcf161941895ba16632 Mon Sep 17 00:00:00 2001 +From: Eastdong <31920925+IEAST@users.noreply.github.com> +Date: Thu, 23 Feb 2023 06:08:36 +0800 +Subject: [PATCH] Add missing content to fix gcc compilation for RISCV + architecture. (#2211) + +* Add missing content to fix gcc compilation for RISCV architecture. + +* add name to AUTHORS + +* lint fix + +Co-authored-by: Moritz Firsching +Upstream: https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc +Signed-off-by: Julien Olivain +--- + AUTHORS | 1 + + lib/jxl/enc_xyb.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/AUTHORS b/AUTHORS +index 44dcc409..3340422d 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -30,6 +30,7 @@ Daniel Novomeský + David Burnett + Dirk Lemstra + Don Olmstead ++Dong Xu + Even Rouault + Fred Brennan + Heiko Becker +diff --git a/lib/jxl/enc_xyb.cc b/lib/jxl/enc_xyb.cc +index c7310765..2fd5d025 100644 +--- a/lib/jxl/enc_xyb.cc ++++ b/lib/jxl/enc_xyb.cc +@@ -6,6 +6,7 @@ + #include "lib/jxl/enc_xyb.h" + + #include ++#include + #include + + #undef HWY_TARGET_INCLUDE +-- +2.41.0 + diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in index da04b89f9b8c..923560298fce 100644 --- a/package/libjxl/Config.in +++ b/package/libjxl/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBJXL # libjxl fail to link statically due to libatomic issue depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_HOST_CMAKE_AT_LEAST_3_19 select BR2_PACKAGE_BROTLI select BR2_PACKAGE_HIGHWAY select BR2_PACKAGE_LCMS2 diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 6b4c9d8d0a3d..c8f98d10ea96 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz +sha256 c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 libjxl-0.8.2.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index f603327bf6d4..47c110eb5373 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.8.1 +LIBJXL_VERSION = 0.8.2 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 9bacfaee5854..65153be301ee 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -34,6 +34,13 @@ LIBKRB5_CONF_OPTS = \ --without-tcl \ --disable-rpath +# libkrb5 has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Enabling static and shared at the same time is not supported ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBKRB5_CONF_OPTS += --disable-static diff --git a/package/libks/libks.hash b/package/libks/libks.hash index dba442bdd29f..f66798699f54 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 131d7896c81a7f3c9bf06860e4f564ca558d4be1614568fec688b3eb66d38107 libks-1.8.2.tar.gz -sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright +sha256 af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63 libks-2.0.2.tar.gz +sha256 3aba376a08bf91c95518532e627157f0ee3ab2712d1198463e2b1ac9186dd142 copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index c4f0cd5c7838..c8bcb3096114 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.8.2 +LIBKS_VERSION = 2.0.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index b7c0508df8b4..122914d524ed 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -9,7 +9,7 @@ LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_CPE_ID_VENDOR = libksba_project +LIBKSBA_CPE_ID_VENDOR = gnupg LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/package/libmatroska/Config.in b/package/libmatroska/Config.in index ec0e8415d72d..b2e4354df585 100644 --- a/package/libmatroska/Config.in +++ b/package/libmatroska/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBMATROSKA bool "libmatroska" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libebml select BR2_PACKAGE_LIBEBML help Extensible open standard audio/video container format access @@ -9,5 +10,6 @@ config BR2_PACKAGE_LIBMATROSKA http://matroska.org -comment "libmatroska needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR +comment "libmatroska needs a toolchain w/ C++, wchar, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 7f95e78a6e9b..ce30e2ba1188 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb libmicrohttpd-0.9.75.tar.gz +sha256 f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c libmicrohttpd-0.9.76.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a2e..4e7b72b65c3a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.75 +LIBMICROHTTPD_VERSION = 0.9.76 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu diff --git a/package/libmodplug/0001-fix-cctype-ub.patch b/package/libmodplug/0001-fix-cctype-ub.patch new file mode 100644 index 000000000000..c75919b6a89d --- /dev/null +++ b/package/libmodplug/0001-fix-cctype-ub.patch @@ -0,0 +1,957 @@ +From dc6d5994b4912cb00d0d183b400edfd656d6530c Mon Sep 17 00:00:00 2001 +From: Gleb Mazovetskiy +Date: Wed, 21 Dec 2022 11:44:27 +0000 +Subject: [PATCH] Fix UB when calling cctype functions + +Calling cctype functions, such as isspace, with negative values +is undefined behaviour. + +While glibc allows it, it crashes on uClibc compiled without +`UCLIBC_HAS_CTYPE_SIGNED`. + +Fixes the undefined behaviour by casting all arguments to +cctype functions to `unsigned char`. + +Upstream: https://github.com/Konstanty/libmodplug/pull/92 +Signed-off-by: Gleb Mazovetskiy +--- + src/load_abc.cpp | 284 +++++++++++++++++++++++------------------------ + src/load_mid.cpp | 2 +- + src/load_pat.cpp | 30 ++--- + 3 files changed, 158 insertions(+), 158 deletions(-) + +diff --git a/src/load_abc.cpp b/src/load_abc.cpp +index b45f972f..8444bd87 100644 +--- a/src/load_abc.cpp ++++ b/src/load_abc.cpp +@@ -260,13 +260,13 @@ static uint32_t abc_pattracktime(ABCHANDLE *h, uint32_t tracktime); + static int abc_patno(ABCHANDLE *h, uint32_t tracktime); + + +-static int abc_isvalidchar(char c) { ++static int abc_isvalidchar(unsigned char c) { + return(isalpha(c) || isdigit(c) || isspace(c) || c == '%' || c == ':'); + } + #if 0 + static const char *abc_skipspace(const char *p) + { +- while (*p && isspace(*p)) ++ while (*p && isspace(static_cast(*p))) + p++; + return p; + } +@@ -275,7 +275,7 @@ static const char *abc_skipspace(const char *p) + static void abc_extractkeyvalue(char *key, size_t key_max, + char *value, size_t value_max, const char *src) + { +- while (*src && isspace(*src)) ++ while (*src && isspace(static_cast(*src))) + src++; + + size_t key_size; +@@ -286,17 +286,17 @@ static void abc_extractkeyvalue(char *key, size_t key_max, + } + key[key_size++] = *src++; + } +- while (key_size > 0 && isspace(key[key_size - 1])) ++ while (key_size > 0 && isspace(static_cast(key[key_size - 1]))) + key_size--; + key[key_size] = '\0'; + +- while (*src && isspace(*src)) ++ while (*src && isspace(static_cast(*src))) + src++; + + size_t value_size; + for (value_size = 0; value_size < value_max - 1 && *src;) + value[value_size++] = *src++; +- while (value_size > 0 && isspace(value[value_size - 1])) ++ while (value_size > 0 && isspace(static_cast(value[value_size - 1]))) + value_size--; + value[value_size] = '\0'; + +@@ -359,7 +359,7 @@ static void abc_dumptracks(ABCHANDLE *h, const char *p) + nn[0] = "CCCDDEFFGGAABccddeffggaabb"[e->par[chordnote]]; + nn[1] = "b # # # # # # # # # # #"[e->par[chordnote]]; + nn[2] = '\0'; +- if( isspace(nn[1]) ) nn[1] = '\0'; ++ if( isspace(static_cast(nn[1])) ) nn[1] = '\0'; + printf("CMD %c: gchord %s%s", + (char)(e->cmd), nn, chordname[e->par[chordnum]]); + if( e->par[chordbase] != e->par[chordnote] ) { +@@ -557,7 +557,7 @@ static void abc_new_umacro(ABCHANDLE *h, const char *m) + ABCMACRO *retval, *mp; + char key[256], value[256]; + abc_extractkeyvalue(key, sizeof(key), value, sizeof(value), m); +- if( strlen(key) > 1 || strchr("~HIJKLMNOPQRSTUVWXY",toupper(key[0])) == 0 ) return; ++ if( strlen(key) > 1 || strchr("~HIJKLMNOPQRSTUVWXY",toupper(static_cast(key[0]))) == 0 ) return; + while( char *q = strchr(key, '!') ) + *q = '+'; // translate oldstyle to newstyle + if( !strcmp(key,"+nil+") ) { // delete a macro +@@ -823,7 +823,7 @@ static ABCTRACK *abc_locate_track(ABCHANDLE *h, const char *voice, int pos) + char vc[21]; + int i, trans=0, voiceno=0, instrno = 1, channo = 0; + for( ; *voice == ' '; voice++ ) ; // skip leading spaces +- for( i=0; i+1 < (int) sizeof(vc) && *voice && *voice != ']' && *voice != '%' && !isspace(*voice); voice++ ) // can work with inline voice instructions ++ for( i=0; i+1 < (int) sizeof(vc) && *voice && *voice != ']' && *voice != '%' && !isspace(static_cast(*voice)); voice++ ) // can work with inline voice instructions + vc[i++] = *voice; + vc[i] = '\0'; + prev = NULL; +@@ -1250,32 +1250,32 @@ static int abc_add_noteon(ABCHANDLE *h, int ch, const char *p, uint32_t tracktim + switch(ch) { + case '^': + if( p[0] == '^' ) { +- n = p[1]; ++ n = static_cast(p[1]); + i = 2; + ch = 'x'; + } + else { +- n = p[0]; ++ n = static_cast(p[0]); + i = 1; + } + break; + case '_': + if( p[0] == '_' ) { +- n = p[1]; ++ n = static_cast(p[1]); + i = 2; + ch = 'b'; + } + else { +- n = p[0]; ++ n = static_cast(p[0]); + i = 1; + } + break; + case '=': +- n = p[0]; ++ n = static_cast(p[0]); + i = 1; + break; + default: +- n = ch; ++ n = static_cast(ch); + i = 0; + break; + } +@@ -1332,7 +1332,7 @@ static int abc_add_noteon(ABCHANDLE *h, int ch, const char *p, uint32_t tracktim + } + else + d[note] = 0; // someone has doen ^X3 or something like it... +- while( p[i] && strchr(",'",p[i]) ) { ++ while( p[i] && strchr(",'",static_cast(p[i])) ) { + if( p[i]==',' ) oct--; + else oct++; + i++; +@@ -1381,7 +1381,7 @@ static int abc_add_noteon(ABCHANDLE *h, int ch, const char *p, uint32_t tracktim + } + } + tp->tienote->tiednote = 1; // mark him for the pattern writers +- for( j=i; isdigit(p[j]) || p[j]=='/'; j++ ) ; // look ahead to see if this one is tied too ++ for( j=i; isdigit(static_cast(p[j])) || p[j]=='/'; j++ ) ; // look ahead to see if this one is tied too + if( p[j] != '-' ) // is this note tied too? + tp->tienote = NULL; // if not the tie ends here... + return i; +@@ -1603,7 +1603,7 @@ static int abc_getnumber(const char *p, int *number) + int i,h; + i = 0; + h = 0; +- while( isdigit(p[i]) ) { ++ while( isdigit(static_cast(p[i])) ) { + if (i < 9) + h = 10 * h + p[i] - '0'; + i++; +@@ -1619,7 +1619,7 @@ static int abc_getexpr(const char *p, int *number) + { + int i, term, total; + i = 0; +- while( isspace(p[i]) ) ++ while( isspace(static_cast(p[i])) ) + i++; + if( p[i] == '(' ) { + i += abc_getexpr(p+i+1, number); +@@ -1628,12 +1628,12 @@ static int abc_getexpr(const char *p, int *number) + return i; + } + i += abc_getnumber(p+i, &total); +- while( isspace(p[i]) ) ++ while( isspace(static_cast(p[i])) ) + i++; + while( p[i] == '+' ) { + i += 1 + abc_getexpr(p+i+1, &term); + total += term; +- while( isspace(p[i]) ) ++ while( isspace(static_cast(p[i])) ) + i++; + } + *number = total; +@@ -1649,7 +1649,7 @@ static int abc_notelen(const char *p, int *len, int *div) + h *= 2; + i++; + } +- if( isdigit(p[i]) ) { ++ if( isdigit(static_cast(p[i])) ) { + h /= 2; + i += abc_getnumber(p+i,&k); + } +@@ -1738,7 +1738,7 @@ static int abc_extract_tempo(const char *p, int invoice) + case '=': + break; + default: +- if( isdigit(*q) ) { ++ if( isdigit(static_cast(*q)) ) { + if( state ) { + q+=abc_getnumber(q,&nd1)-1; + state = 0; +@@ -1812,10 +1812,10 @@ static void abc_set_parts(char **d, char *p) + j=0; + k=0; + for( i=0; p[i] && p[i] != '%'; i++ ) { +- if( isupper(p[i]) ) { ++ if( isupper(static_cast(p[i])) ) { + j++; + } +- if( isdigit(p[i]) ) { ++ if( isdigit(static_cast(p[i])) ) { + n=abc_getnumber(p+i, &k); + if( k == 0 ) + k = 1; +@@ -1833,7 +1833,7 @@ static void abc_set_parts(char **d, char *p) + // now copy bytes from p to *d, taking parens and digits in account + j = 0; + for( i=0; p[i] && p[i] != '%' && j < size && i < (int)size; i++ ) { +- if( isdigit(p[i]) || isupper(p[i]) || p[i] == '(' || p[i] == ')' ) { ++ if( isdigit(static_cast(p[i])) || isupper(static_cast(p[i])) || p[i] == '(' || p[i] == ')' ) { + if( p[i] == ')' ) { + for( n=j; n > 0 && q[n-1] != '('; n-- ) ; // find open paren in q + // q[n+1] to q[j] contains the substring that must be repeated +@@ -1856,7 +1856,7 @@ static void abc_set_parts(char **d, char *p) + } + continue; + } +- if( isdigit(p[i]) ) { ++ if( isdigit(static_cast(p[i])) ) { + n = abc_getnumber(p+i,&k); + i += n - 1; + // if nothing is ready to 'repeat', skip it. +@@ -2243,7 +2243,7 @@ static void abc_preprocess(ABCHANDLE *h, ABCMACRO *m) + char *p = s; + for( j=0; jsubst[j]; +- if( a > 'g' && islower(a) ) { ++ if( a > 'g' && islower(static_cast(a)) ) { + b = a - 'n'; + a = "CDEFGABCDEFGABcdefgabcdefgabcdefgab"[i+b+7]; + *p++ = a; +@@ -2339,11 +2339,11 @@ BOOL CSoundFile::TestABC(const BYTE *lpStream, DWORD dwMemLength) + } + if(id[0]=='K' + && id[1]==':' +- && (isalpha(id[2]) || isspace(id[2])) ) return 1; ++ && (isalpha(static_cast(id[2])) || isspace(static_cast(id[2]))) ) return 1; + // disable binary error if have any "tag" + if((id[0]>='A' && id[0]<='Z') + && id[1]==':' +- && (isalpha(id[2]) || isspace(id[2])) ) hasText = 1; ++ && (isalpha(static_cast(id[2])) || isspace(static_cast(id[2]))) ) hasText = 1; + } + return 0; + } +@@ -2367,7 +2367,7 @@ static ABCHANDLE *ABC_Init(void) + retval->barticks = 0; + p = getenv(ABC_ENV_NORANDOMPICK); + if( p ) { +- if( isdigit(*p) ) ++ if( isdigit(static_cast(*p)) ) + retval->pickrandom = atoi(p); + if( *p == '-' ) { + retval->pickrandom = atoi(p+1)-1; // xmms preloads the file +@@ -2652,12 +2652,12 @@ static int ABC_Key(const char *p) + int i,j; + char c[8]; + const char *q; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + q = p; + memset(c, 0, 8); + for( i=0; i<8 && *p && *p != ']'; p++ ) { +- if( isspace(*p) ) { +- while( isspace(*p) ) p++; ++ if( isspace(static_cast(*p)) ) { ++ while( isspace(static_cast(*p)) ) p++; + if( strncasecmp(p, "min", 3) && strncasecmp(p, "maj", 3) ) + break; + } +@@ -2687,9 +2687,9 @@ static int ABC_Key(const char *p) + + static char *abc_skip_word(char *p) + { +- while( isspace(*p) ) p++; +- while( *p && !isspace(*p) && *p != ']') p++; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; ++ while( *p && !isspace(static_cast(*p)) && *p != ']') p++; ++ while( isspace(static_cast(*p)) ) p++; + return p; + } + +@@ -2798,7 +2798,7 @@ static void abc_setup_chordnames() + static int abc_MIDI_getnumber(const char *p) + { + int n; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + abc_getnumber(p, &n); + if( n < 0 ) n = 0; + if( n > 127 ) n = 127; +@@ -2808,7 +2808,7 @@ static int abc_MIDI_getnumber(const char *p) + static int abc_MIDI_getprog(const char *p) + { + int n; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + abc_getnumber(p, &n); + if( n < 1 ) n = 1; + if( n > 128 ) n = 128; +@@ -2819,32 +2819,32 @@ static int abc_MIDI_getprog(const char *p) + static void abc_MIDI_drone(const char *p, int *gm, int *ptch, int *vol) + { + int i; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + p += abc_getnumber(p, &i); + i++; // adjust for 1..128 + if( i>0 && i < 129 ) + *gm = i; + else + *gm = 71; // bassoon +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + p += abc_getnumber(p, &i); + if( i>0 && i < 127 ) + ptch[0] = i; + else + ptch[0] = 45; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + p += abc_getnumber(p, &i); + if( i>0 && i < 127 ) + ptch[1] = i; + else + ptch[1] = 33; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + p += abc_getnumber(p, &i); + if( i>0 && i < 127 ) + vol[0] = i; + else + vol[0] = 80; +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + p += abc_getnumber(p, &i); + if( i>0 && i < 127 ) + vol[1] = i; +@@ -2869,8 +2869,8 @@ static void abc_MIDI_channel(const char *p, ABCTRACK *tp, ABCHANDLE *h) + { + int i1, i2; + i1 = tp? tp->vno: 1; +- for( ; *p && isspace(*p); p++ ) ; +- if( isdigit(*p) ) { ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; ++ if( isdigit(static_cast(*p)) ) { + p += abc_getnumber(p, &i2); + if( i2 >= 1 && i2 <= 16 ) + abc_chan_to_tracks(h, i1, i2); // we start at 1 +@@ -2894,11 +2894,11 @@ static void abc_MIDI_program(const char *p, ABCTRACK *tp, ABCHANDLE *h) + { + int i1, i2; + i1 = tp? tp->vno: 1; +- for( ; *p && isspace(*p); p++ ) ; +- if( isdigit(*p) ) { ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; ++ if( isdigit(static_cast(*p)) ) { + p += abc_getnumber(p, &i2); +- for( ; *p && isspace(*p); p++ ) ; +- if( isdigit(*p) ) { ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; ++ if( isdigit(static_cast(*p)) ) { + i1 = i2; + abc_getnumber(p, &i2); + } +@@ -2919,25 +2919,25 @@ static void abc_mute_voice(ABCHANDLE *h, ABCTRACK *tp, int m) + static void abc_MIDI_voice(const char *p, ABCTRACK *tp, ABCHANDLE *h) + { + int i1, i2; +- for( ; *p && isspace(*p); p++ ) ; ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; + if( strncmp(p,"instrument=",11) && strncmp(p,"mute",4) ) { + tp = abc_locate_track(h, p, 0); +- for( ; *p && !isspace(*p); p++ ) ; +- for( ; *p && isspace(*p); p++ ) ; ++ for( ; *p && !isspace(static_cast(*p)); p++ ) ; ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; + } + i1 = tp? tp->vno: 1; + i2 = 0; +- if( !strncmp(p,"instrument=",11) && isdigit(p[11]) ) { ++ if( !strncmp(p,"instrument=",11) && isdigit(static_cast(p[11])) ) { + p += 11; + p += abc_getnumber(p, &i2); +- for( ; *p && isspace(*p); p++ ) ; +- if( !strncmp(p,"bank=",5) && isdigit(p[5]) ) { +- for( ; *p && !isspace(*p); p++ ) ; +- for( ; *p && isspace(*p); p++ ) ; ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; ++ if( !strncmp(p,"bank=",5) && isdigit(static_cast(p[5])) ) { ++ for( ; *p && !isspace(static_cast(*p)); p++ ) ; ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; + } + } + if( tp ) abc_mute_voice(h,tp,0); +- if( !strncmp(p,"mute",4) && (p[4]=='\0' || p[4]=='%' || isspace(p[4])) ) { ++ if( !strncmp(p,"mute",4) && (p[4]=='\0' || p[4]=='%' || isspace(static_cast(p[4]))) ) { + if( tp ) abc_mute_voice(h,tp,1); + } + abc_instr_to_tracks(h, i1, i2); // starts already at 1 (draft 4.0) +@@ -2949,7 +2949,7 @@ static void abc_MIDI_chordname(const char *p) + char name[20]; + int i; + +- for(; *p && isspace(*p); p++) ++ for(; *p && isspace(static_cast(*p)); p++) + ; + i = 0; + while ((i < 19) && (*p != ' ') && (*p != '\0')) { +@@ -2965,8 +2965,8 @@ static void abc_MIDI_chordname(const char *p) + int notes[6]; + i = 0; + memset(notes, 0, sizeof(notes)); +- while ((i < 6) && isspace(*p)) { +- for(; *p && isspace(*p); p++) ++ while ((i < 6) && isspace(static_cast(*p))) { ++ for(; *p && isspace(static_cast(*p)); p++) + ; + p += abc_getnumber(p, ¬es[i]); + i = i + 1; +@@ -2981,21 +2981,21 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + { + char *q; + int i, n, m, len; +- while( isspace(*p) ) p++; +- if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; +- if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; ++ while( isspace(static_cast(*p)) ) p++; ++ if( !strncmp(p,"on",2) && (isspace(static_cast(p[2])) || p[2] == '\0') ) return 2; ++ if( !strncmp(p,"off",3) && (isspace(static_cast(p[3])) || p[3] == '\0') ) return 1; + n = 0; len = 0; +- for( q = h->drum; *p && !isspace(*p); p++ ) { ++ for( q = h->drum; *p && !isspace(static_cast(*p)); p++ ) { + if( !strchr("dz0123456789",*p) ) break; + *q++ = *p; len++; +- if( !isdigit(*p) && len < (int)sizeof(h->drum)-1 ) { +- if( !isdigit(p[1]) ) { *q++ = '1'; len ++; } ++ if( !isdigit(static_cast(*p)) && len < (int)sizeof(h->drum)-1 ) { ++ if( !isdigit(static_cast(p[1])) ) { *q++ = '1'; len ++; } + n++; // count the silences too.... + } + if (len >= (int)sizeof(h->drum)-1) { + // consume the rest of the input + // definitely enough "drum last state" stored. +- while ( *p && !isspace(*p) ) p++; ++ while ( *p && !isspace(static_cast(*p)) ) p++; + break; + } + } +@@ -3003,10 +3003,10 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + q = h->drumins; + for( i = 0; idrum[i*2] == 'd' ) { +- while( *p && isspace(*p) ) p++; +- if( !isdigit(*p) ) { ++ while( *p && isspace(static_cast(*p)) ) p++; ++ if( !isdigit(static_cast(*p)) ) { + m = 0; +- while( *p && !isspace(*p) ) p++; ++ while( *p && !isspace(static_cast(*p)) ) p++; + } + else + p += abc_getnumber(p,&m); +@@ -3017,10 +3017,10 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + q = h->drumvol; + for( i = 0; idrum[i*2] == 'd' ) { +- while( *p && isspace(*p) ) p++; +- if( !isdigit(*p) ) { ++ while( *p && isspace(static_cast(*p)) ) p++; ++ if( !isdigit(static_cast(*p)) ) { + m = 0; +- while( *p && !isspace(*p) ) p++; ++ while( *p && !isspace(static_cast(*p)) ) p++; + } + else + p += abc_getnumber(p,&m); +@@ -3036,17 +3036,17 @@ static int abc_MIDI_gchord(const char *p, ABCHANDLE *h) + { + char *q; + int len = 0; +- while( isspace(*p) ) p++; +- if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; +- if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; +- for( q = h->gchord; *p && !isspace(*p); p++ ) { ++ while( isspace(static_cast(*p)) ) p++; ++ if( !strncmp(p,"on",2) && (isspace(static_cast(p[2])) || p[2] == '\0') ) return 2; ++ if( !strncmp(p,"off",3) && (isspace(static_cast(p[3])) || p[3] == '\0') ) return 1; ++ for( q = h->gchord; *p && !isspace(static_cast(*p)); p++ ) { + if( !strchr("fbcz0123456789ghijGHIJ",*p) ) break; + *q++ = *p; len++; +- if( !isdigit(*p) && len < (int)sizeof(h->gchord)-1 && !isdigit(p[1]) ) { *q++ = '1'; len ++; } ++ if( !isdigit(static_cast(*p)) && len < (int)sizeof(h->gchord)-1 && !isdigit(static_cast(p[1])) ) { *q++ = '1'; len ++; } + if (len >= (int)sizeof(h->gchord)-1) { + // consume the rest of the input + // definitely enough "drum last state" stored. +- while ( *p && !isspace(*p) ) p++; ++ while ( *p && !isspace(static_cast(*p)) ) p++; + break; + } + } +@@ -3099,7 +3099,7 @@ static void abc_metric_gchord(ABCHANDLE *h, int mlen, int mdiv) + + static void abc_MIDI_legato(const char *p, ABCTRACK *tp) + { +- for( ; *p && isspace(*p); p++ ) ; ++ for( ; *p && isspace(static_cast(*p)); p++ ) ; + if( !strncmp(p,"off",3) ) tp->legato = 0; + else tp->legato = 1; + } +@@ -3130,7 +3130,7 @@ static int abc_drum_steps(const char *dch) + const char *p; + int i=0; + for( p=dch; *p; p++ ) { +- if( isdigit(*p) ) i += *p - '0';; ++ if( isdigit(static_cast(*p)) ) i += *p - '0';; + } + return i; + } +@@ -3185,7 +3185,7 @@ static int abc_gchord_steps(const char *gch) + const char *p; + int i=0; + for( p=gch; *p; p++ ) +- if( isdigit(*p) ) i += *p - '0'; ++ if( isdigit(static_cast(*p)) ) i += *p - '0'; + return i; + } + +@@ -3231,7 +3231,7 @@ static void abc_add_gchord(ABCHANDLE *h, uint32_t tracktime, uint32_t bartime) + stime = (tracktime - etime) * steps; + rtime = 0; + while( rtime < stime ) { +- gnote = h->gchord[2*g]; ++ gnote = static_cast(h->gchord[2*g]); + glen = h->gchord[2*g+1] - '0'; + if( ++g == gsteps ) g = 0; + switch(gnote) { +@@ -3313,7 +3313,7 @@ static void abc_MIDI_beat(ABCHANDLE *h, const char *p) + h->beat[2] = 110; + h->beat[3] = 1; + for( j=0; j<4; j++ ) { +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + if( *p ) { + p += abc_getnumber(p, &i); + if( i < 0 ) i = 0; +@@ -3336,7 +3336,7 @@ static void abc_MIDI_beat(ABCHANDLE *h, const char *p) + // %%MIDI beatstring fppmpmp + static void abc_MIDI_beatstring(ABCHANDLE *h, const char *p) + { +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) p++; + if( h->beatstring ) _mm_free(h->allochandle, h->beatstring); + if( strlen(p) ) + h->beatstring = DupStr(h->allochandle,p,strlen(p)+1); +@@ -3483,47 +3483,47 @@ static void abc_recalculate_tracktime(ABCHANDLE *h) { + static void abc_MIDI_command(ABCHANDLE *h, char *p, char delim) { + int t; + // interpret some of the possibilitys +- if( !strncmp(p,"bassprog",8) && isspace(p[8]) ) h->abcbassprog = abc_MIDI_getprog(p+8)+1; +- if( !strncmp(p,"bassvol",7) && isspace(p[7]) ) h->abcbassvol = abc_MIDI_getnumber(p+7); +- if( !strncmp(p,"beat",4) && isspace(p[4]) ) abc_MIDI_beat(h, p+4); +- if( !strncmp(p,"beatstring",10) && isspace(p[10]) ) abc_MIDI_beatstring(h, p+4); +- if( !strncmp(p,"chordname",9) && isspace(p[9]) ) abc_MIDI_chordname(p+9); +- if( !strncmp(p,"chordprog",9) && isspace(p[9]) ) h->abcchordprog = abc_MIDI_getprog(p+9)+1; +- if( !strncmp(p,"chordvol",8) && isspace(p[8]) ) h->abcchordvol = abc_MIDI_getnumber(p+8); +- if( !strncmp(p,"drone",5) && isspace(p[5]) ) abc_MIDI_drone(p+5, &h->dronegm, h->dronepitch, h->dronevol); +- if( !strncmp(p,"droneoff",8) && (p[8]=='\0' || p[8]==delim || isspace(p[8])) ) h->droneon = 0; +- if( !strncmp(p,"droneon",7) && (p[7]=='\0' || p[7]==delim || isspace(p[7])) ) h->droneon = 1; ++ if( !strncmp(p,"bassprog",8) && isspace(static_cast(p[8])) ) h->abcbassprog = abc_MIDI_getprog(p+8)+1; ++ if( !strncmp(p,"bassvol",7) && isspace(static_cast(p[7])) ) h->abcbassvol = abc_MIDI_getnumber(p+7); ++ if( !strncmp(p,"beat",4) && isspace(static_cast(p[4])) ) abc_MIDI_beat(h, p+4); ++ if( !strncmp(p,"beatstring",10) && isspace(static_cast(p[10])) ) abc_MIDI_beatstring(h, p+4); ++ if( !strncmp(p,"chordname",9) && isspace(static_cast(p[9])) ) abc_MIDI_chordname(p+9); ++ if( !strncmp(p,"chordprog",9) && isspace(static_cast(p[9])) ) h->abcchordprog = abc_MIDI_getprog(p+9)+1; ++ if( !strncmp(p,"chordvol",8) && isspace(static_cast(p[8])) ) h->abcchordvol = abc_MIDI_getnumber(p+8); ++ if( !strncmp(p,"drone",5) && isspace(static_cast(p[5])) ) abc_MIDI_drone(p+5, &h->dronegm, h->dronepitch, h->dronevol); ++ if( !strncmp(p,"droneoff",8) && (p[8]=='\0' || p[8]==delim || isspace(static_cast(p[8]))) ) h->droneon = 0; ++ if( !strncmp(p,"droneon",7) && (p[7]=='\0' || p[7]==delim || isspace(static_cast(p[7]))) ) h->droneon = 1; + t = h->drumon; +- if( !strncmp(p,"drum",4) && isspace(p[4]) ) { ++ if( !strncmp(p,"drum",4) && isspace(static_cast(p[4])) ) { + h->drumon = abc_MIDI_drum(p+4, h); + if( h->drumon ) --h->drumon; + else h->drumon = t; + } +- if( !strncmp(p,"drumoff",7) && (p[7]=='\0' || p[7]==delim || isspace(p[7])) ) h->drumon = 0; +- if( !strncmp(p,"drumon",6) && (p[6]=='\0' || p[6]==delim || isspace(p[6])) ) h->drumon = 1; ++ if( !strncmp(p,"drumoff",7) && (p[7]=='\0' || p[7]==delim || isspace(static_cast(p[7]))) ) h->drumon = 0; ++ if( !strncmp(p,"drumon",6) && (p[6]=='\0' || p[6]==delim || isspace(static_cast(p[6]))) ) h->drumon = 1; + if( t != h->drumon ) { + if( h->drumon && !h->tpr ) h->tpr = h->track; + if( h->tpr ) abc_add_drum_sync(h, h->tpr, h->tracktime); // don't start drumming from the beginning of time! + if( h->tpr && !h->drumon ) h->tpr = NULL; + } + t = h->gchordon; +- if( !strncmp(p,"gchord",6) && (p[6]=='\0' || p[6]==delim || isspace(p[6])) ) { ++ if( !strncmp(p,"gchord",6) && (p[6]=='\0' || p[6]==delim || isspace(static_cast(p[6]))) ) { + h->gchordon = abc_MIDI_gchord(p+6, h); + if( h->gchordon ) --h->gchordon; + else h->gchordon = t; + } +- if( !strncmp(p,"gchordoff",9) && (p[9]=='\0' || p[9]==delim || isspace(p[9])) ) h->gchordon = 0; +- if( !strncmp(p,"gchordon",8) && (p[8]=='\0' || p[8]==delim || isspace(p[8])) ) h->gchordon = 1; ++ if( !strncmp(p,"gchordoff",9) && (p[9]=='\0' || p[9]==delim || isspace(static_cast(p[9]))) ) h->gchordon = 0; ++ if( !strncmp(p,"gchordon",8) && (p[8]=='\0' || p[8]==delim || isspace(static_cast(p[8]))) ) h->gchordon = 1; + if( t != h->gchordon ) { + if( h->tpc ) abc_add_gchord_syncs(h, h->tpc, h->tracktime); + } +- if( !strncmp(p,"channel",7) && isspace(p[7]) ) ++ if( !strncmp(p,"channel",7) && isspace(static_cast(p[7])) ) + abc_MIDI_channel(p+8, h->tp = abc_check_track(h, h->tp), h); +- if( !strncmp(p,"program",7) && isspace(p[7]) ) ++ if( !strncmp(p,"program",7) && isspace(static_cast(p[7])) ) + abc_MIDI_program(p+8, h->tp = abc_check_track(h, h->tp), h); +- if( !strncmp(p,"voice",5) && isspace(p[5]) ) ++ if( !strncmp(p,"voice",5) && isspace(static_cast(p[5])) ) + abc_MIDI_voice(p+6, h->tp = abc_check_track(h, h->tp), h); +- if( !strncmp(p,"legato",6) && (p[6]=='\0' || p[6]==delim || isspace(p[6])) ) ++ if( !strncmp(p,"legato",6) && (p[6]=='\0' || p[6]==delim || isspace(static_cast(p[6]))) ) + abc_MIDI_legato(p+6, h->tp = abc_check_track(h, h->tp)); + } + +@@ -3548,13 +3548,13 @@ static char *abc_continuated(ABCHANDLE *h, MMFILE *mmf, char *p) { + abc_message("line not properly continued\n%s", p1); + return p1; + } +- while( *pm && isspace(*pm) ) ++pm; ++ while( *pm && isspace(static_cast(*pm)) ) ++pm; + if( !strncmp(pm,"%%",2) ) { +- for( p2 = pm+2; *p2 && isspace(*p2); p2++ ) ; +- if( !strncmp(p2,"MIDI",4) && (p2[4]=='=' || isspace(p2[4])) ) { +- for( p2+=5; *p2 && isspace(*p2); p2++ ) ; ++ for( p2 = pm+2; *p2 && isspace(static_cast(*p2)); p2++ ) ; ++ if( !strncmp(p2,"MIDI",4) && (p2[4]=='=' || isspace(static_cast(p2[4]))) ) { ++ for( p2+=5; *p2 && isspace(static_cast(*p2)); p2++ ) ; + if( *p2 == '=' ) +- for( p2+=1; *p2 && isspace(*p2); p2++ ) ; ++ for( p2+=1; *p2 && isspace(static_cast(*p2)); p2++ ) ; + abc_MIDI_command(h,p2,'%'); + } + continued = 1; +@@ -3685,7 +3685,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + abcxcount = 0; + mmfseek(mmfile,0,SEEK_SET); + while ((line=abc_gets(h, mmfile)) != NULL) { +- for( p=line; isspace(*p); p++ ) ; ++ for( p=line; isspace(static_cast(*p)); p++ ) ; + if( !strncmp(p,"X:",2) ) abcxcount++; + } + if( abcxcount == 0 ) +@@ -3699,7 +3699,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + mmsp--; + while ((line=abc_gets(h, mmstack[mmsp])) != NULL) { + char blankline[3] = "% "; +- for( p=line; isspace(*p); p++ ) ; ++ for( p=line; isspace(static_cast(*p)); p++ ) ; + switch(abcstate) { + case INSKIPFORX: + if( !strncmp(p,"X:",2) ) { +@@ -3711,7 +3711,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + if( !strncmp(p,"X:",2) ) { + abcstate = INHEAD; + memset(m_szNames[0], 0, 32); +- for( p+=2; isspace(*p); p++ ) ; ++ for( p+=2; isspace(static_cast(*p)); p++ ) ; + abcxnumber = atoi(p); + abchornpipe = 0; + h->droneon = 0; +@@ -3792,8 +3792,8 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + break; + } + if( !strncmp(p,"R:",2) ) { +- for( p+=2; isspace(*p); p++ ) ; +- if( !strncmp(p,"hornpipe",8) && (isspace(p[8]) || p[8]=='\0') ) abchornpipe = 1; ++ for( p+=2; isspace(static_cast(*p)); p++ ) ; ++ if( !strncmp(p,"hornpipe",8) && (isspace(static_cast(p[8])) || p[8]=='\0') ) abchornpipe = 1; + else abchornpipe = 0; + break; + } +@@ -3980,8 +3980,8 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + p[1]= '%'; + } + if( !strncmp(p,"%%",2) ) { +- for( p+=2; *p && isspace(*p); p++ ) ; +- if( !strncmp(p,"abc-include",11) && isspace(p[11]) ) { ++ for( p+=2; *p && isspace(static_cast(*p)); p++ ) ; ++ if( !strncmp(p,"abc-include",11) && isspace(static_cast(p[11])) ) { + for( t=12; isspace(p[t]); t++ ) ; + if( p[t] ) { + mmsp++; +@@ -3998,10 +3998,10 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + } + else abc_message("failure: abc-include missing file name, %s", p); + } +- if( !strncmp(p,"MIDI",4) && (p[4]=='=' || isspace(p[4])) && abcstate != INSKIPFORX ) { +- for( p+=5; *p && isspace(*p); p++ ) ; ++ if( !strncmp(p,"MIDI",4) && (p[4]=='=' || isspace(static_cast(p[4]))) && abcstate != INSKIPFORX ) { ++ for( p+=5; *p && isspace(static_cast(*p)); p++ ) ; + if( *p == '=' ) +- for( p+=1; *p && isspace(*p); p++ ) ; ++ for( p+=1; *p && isspace(static_cast(*p)); p++ ) ; + abc_MIDI_command(h,p,'%'); + if( h->tp ) abcnolegato = !h->tp->legato; + if( !abcnolegato ) abcnoslurs = 0; +@@ -4034,7 +4034,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + partpat[global_part - 'A'][1] = t; + // give every new coming abcevent the desired part indication + while( p[2]==' ' || p[2]=='.' ) p++; // skip blancs and dots +- if( isupper(p[2]) ) ++ if( isupper(static_cast(p[2])) ) + global_part = p[2]; + else + global_part = ' '; +@@ -4073,7 +4073,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + ch0 = ' '; + pp = 0; + while (*p && (ch = *p++) != '\0') { +- if( !pp && isalpha(ch) && *p != ':' ) { // maybe a macro ++ if( !pp && isalpha(static_cast(ch)) && *p != ':' ) { // maybe a macro + for( mp=h->umacro; mp; mp=mp->next ) { + if( ch == mp->name[0] ) { + pp = p; +@@ -4131,8 +4131,8 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + else + partpat[global_part - 'A'][1] = t; + // give every new coming abcevent the desired part indication +- while( isspace(p[2]) || p[2]=='.' ) p++; // skip blancs and dots +- if( isupper(p[2]) ) ++ while( isspace(static_cast(p[2])) || p[2]=='.' ) p++; // skip blancs and dots ++ if( isupper(static_cast(p[2])) ) + global_part = p[2]; + else + global_part = ' '; +@@ -4152,11 +4152,11 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + break; + } + if( !strncmp(p,"I:",2) ) { // interpret some of the possibilitys +- for( p += 2; isspace(*p); p++ ) ; +- if( !strncmp(p,"MIDI",4) && (p[4]=='=' || isspace(p[4])) ) { // interpret some of the possibilitys +- for( p += 4; isspace(*p); p++ ) ; ++ for( p += 2; isspace(static_cast(*p)); p++ ) ; ++ if( !strncmp(p,"MIDI",4) && (p[4]=='=' || isspace(static_cast(p[4]))) ) { // interpret some of the possibilitys ++ for( p += 4; isspace(static_cast(*p)); p++ ) ; + if( *p == '=' ) +- for( p += 1; isspace(*p); p++ ) ; ++ for( p += 1; isspace(static_cast(*p)); p++ ) ; + abc_MIDI_command(h, p, ']'); + if( h->tp ) abcnolegato = !h->tp->legato; + if( !abcnolegato ) abcnoslurs = 0; +@@ -4235,7 +4235,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + notelen *= cnotelen; + notediv *= cnotediv; + tupletr = abc_tuplet(¬elen, ¬ediv, tupletp, tupletq, tupletr); +- while( isspace(*p) ) p++; // allow spacing in broken rithm notation ++ while( isspace(static_cast(*p)) ) p++; // allow spacing in broken rithm notation + p += abc_brokenrithm(p, ¬elen, ¬ediv, &brokenrithm, abchornpipe); + thistime = notelen_notediv_to_ticks(h->speed, notelen*snotelen, notediv*snotediv); + if( abcfermata ) { +@@ -4278,7 +4278,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + if( abceffoper != 255 ) abceffect = none; + break; + } +- if( isdigit(*p) ) { // different endings in repeats [i,j,n-r,s,... ++ if( isdigit(static_cast(*p)) ) { // different endings in repeats [i,j,n-r,s,... + h->tp = abc_check_track(h, h->tp); + abc_add_partbreak(h, h->tp, h->tracktime); + p += abc_getnumber(p, ¬elen); +@@ -4304,7 +4304,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + break; + case '(': // slurs follow or some tuplet (duplet, triplet etc.) + abcto = 0; +- if( isdigit(*p) ) { ++ if( isdigit(static_cast(*p)) ) { + p += abc_getnumber(p,&tupletp); + tupletr = tupletp; // ABC draft 2.0 (4.13): if r is not given it defaults to p + switch( tupletp ) { // ABC draft 2.0 (4.13): q defaults depending on p and time signature +@@ -4323,10 +4323,10 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + } + if( *p==':' ) { + p++; +- if( isdigit(*p) ) p += abc_getnumber(p,&tupletq); ++ if( isdigit(static_cast(*p)) ) p += abc_getnumber(p,&tupletq); + if( *p==':' ) { + p++; +- if( isdigit(*p) ) p += abc_getnumber(p,&tupletr); ++ if( isdigit(static_cast(*p)) ) p += abc_getnumber(p,&tupletr); + } + } + } +@@ -4375,7 +4375,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + sprintf(barsig, "%s%s", sig[abckey], sig[abckey]); // reset the key signature + bartime = h->tracktime; + if( h->tp && h->tp->vpos ) h->tp = abc_locate_track(h, h->tp->v, 0); // reset from voice overlay +- if( isdigit(*p) ) { // different endings in repeats |i,j,n-r,s,... ++ if( isdigit(static_cast(*p)) ) { // different endings in repeats |i,j,n-r,s,... + h->tp = abc_check_track(h, h->tp); + abc_add_partbreak(h, h->tp, h->tracktime); + p += abc_getnumber(p, ¬elen); +@@ -4426,7 +4426,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + } + break; + case '"': // chord notation +- if( !strchr("_^<>@", *p) && !isdigit(*p) ) { // if it's not a annotation string ++ if( !strchr("_^<>@", *p) && !isdigit(static_cast(*p)) ) { // if it's not a annotation string + h->tp = abc_check_track(h, h->tp); + if( !h->tpc ) h->tpc = abc_locate_track(h, h->tp->v, 0); + if( h->tp == h->tpc ) abc_add_chord(p, h, h->tpc, h->tracktime); // only do chords for one voice +@@ -4443,8 +4443,8 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + abcto = -1; + } + else +- if( !isspace(*p) ) abcto = 0; +- if( !strncasecmp(p,"to",2) && (isspace(p[2]) || p[2] == '"') ) abcto = 1; ++ if( !isspace(static_cast(*p)) ) abcto = 0; ++ if( !strncasecmp(p,"to",2) && (isspace(static_cast(p[2])) || p[2] == '"') ) abcto = 1; + } + if( !ch ) abcstate = INSKIPFORQUOTE; + break; +@@ -4665,7 +4665,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + h->tp->tienote = h->tp->tail; + } + tupletr = abc_tuplet(¬elen, ¬ediv, tupletp, tupletq, tupletr); +- while( isspace(*p) ) p++; // allow spacing in broken rithm notation ++ while( isspace(static_cast(*p)) ) p++; // allow spacing in broken rithm notation + p += abc_brokenrithm(p, ¬elen, ¬ediv, &brokenrithm, abchornpipe); + thistime = notelen_notediv_to_ticks(h->speed, notelen*snotelen, notediv*snotediv); + if( abcfermata ) { +@@ -4699,7 +4699,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + abc_track_clear_tiednote(h); + p += abc_notelen(p, ¬elen, ¬ediv); + tupletr = abc_tuplet(¬elen, ¬ediv, tupletp, tupletq, tupletr); +- while( isspace(*p) ) p++; // allow spacing in broken rithm notation ++ while( isspace(static_cast(*p)) ) p++; // allow spacing in broken rithm notation + p += abc_brokenrithm(p, ¬elen, ¬ediv, &brokenrithm, abchornpipe); + thistime = notelen_notediv_to_ticks(h->speed, notelen*snotelen, notediv*snotediv); + if( abcfermata ) { +@@ -4752,7 +4752,7 @@ BOOL CSoundFile::ReadABC(const uint8_t *lpStream, DWORD dwMemLength) + abcarpeggio = 0; + break; + } +- if( isalpha(ch) && *p==':' ) { ++ if( isalpha(static_cast(ch)) && *p==':' ) { + // some unprocessed field line? + while( *p ) p++; // skip it + break; +diff --git a/src/load_mid.cpp b/src/load_mid.cpp +index fe02f5e4..749b5d0c 100644 +--- a/src/load_mid.cpp ++++ b/src/load_mid.cpp +@@ -1198,7 +1198,7 @@ BOOL CSoundFile::ReadMID(const BYTE *lpStream, DWORD dwMemLength) + if (h->miditracks == 0) goto ErrorCleanup; + + p = (BYTE *)getenv(ENV_MMMID_SPEED); +- if( p && isdigit(*p) && p[0] != '0' && p[1] == '\0' ) { ++ if( p && isdigit(static_cast(*p)) && p[0] != '0' && p[1] == '\0' ) { + // transform speed + t = *p - '0'; + h->speed *= t; +diff --git a/src/load_pat.cpp b/src/load_pat.cpp +index fe787311..dfa640e5 100644 +--- a/src/load_pat.cpp ++++ b/src/load_pat.cpp +@@ -392,31 +392,31 @@ void pat_init_patnames(void) + _mm_fgets(mmcfg, line, PATH_MAX); + while( !_mm_feof(mmcfg) ) { + p = line; +- while ( isspace(*p) ) p ++; +- if( isdigit(p[0]) ) { ++ while ( isspace(static_cast(*p)) ) p ++; ++ if( isdigit(static_cast(p[0])) ) { + // get pat number + i = atoi(p); +- while ( isdigit(*p) ) p ++; +- while ( isspace(*p) ) p ++; ++ while ( isdigit(static_cast(*p)) ) p ++; ++ while ( isspace(static_cast(*p)) ) p ++; + // get pat file name + if( *p && i < MAXSMP && i >= 0 && *p != '#' ) { + q = isdrumset ? midipat[pat_gm_drumnr(i)-1] : midipat[i]; + pfnlen = 0; +- while( *p && !isspace(*p) && *p != '#' && pfnlen < 128 ) { ++ while( *p && !isspace(static_cast(*p)) && *p != '#' && pfnlen < 128 ) { + pfnlen ++; + *q++ = *p++; + } +- if( isblank(*p) && *(p+1) != '#' && pfnlen < 128 ) { ++ if( isblank(static_cast(*p)) && *(p+1) != '#' && pfnlen < 128 ) { + *q++ = ':'; pfnlen ++; +- while( isspace(*p) ) { +- while( isspace(*p) ) p++; ++ while( isspace(static_cast(*p)) ) { ++ while( isspace(static_cast(*p)) ) p++; + if ( *p == '#' ) { // comment + +- } else while( *p && !isspace(*p) && pfnlen < 128 ) { ++ } else while( *p && !isspace(static_cast(*p)) && pfnlen < 128 ) { + pfnlen ++; + *q++ = *p++; + } +- if( isspace(*p) ) { *q++ = ' '; pfnlen++; } ++ if( isspace(static_cast(*p)) ) { *q++ = ' '; pfnlen++; } + } + } + *q++ = '\0'; +@@ -429,11 +429,11 @@ void pat_init_patnames(void) + } + else if( !strncmp(p,"dir",3) ) { + p += 3; +- while ( isspace(*p) ) p ++; ++ while ( isspace(static_cast(*p)) ) p ++; + q = p + strlen(p); + if(q > p) { + --q; +- while ( q > p && isspace(*q) ) *(q--) = 0; ++ while ( q > p && isspace(static_cast(*q)) ) *(q--) = 0; + strncpy(pathforpat, p, PATH_MAX - 1); + pathforpat[PATH_MAX - 1] = 0; + } +@@ -441,9 +441,9 @@ void pat_init_patnames(void) + else if( !strncmp(p,"source",6) && nsources < 5 ) { + q = cfgsources[nsources]; + p += 6; +- while ( isspace(*p) ) p ++; ++ while ( isspace(static_cast(*p)) ) p ++; + pfnlen = 0; +- while ( *p && *p != '#' && !isspace(*p) && pfnlen < 128 ) { ++ while ( *p && *p != '#' && !isspace(static_cast(*p)) && pfnlen < 128 ) { + pfnlen ++; + *q++ = *p++; + } +@@ -857,7 +857,7 @@ static void PAT_ReadPatterns(MODCOMMAND *pattern[], WORD psize[], PATHANDLE *h, + i = tt2 - 16 * ((h->samples - 1 - ch) & 3); + if( tt1 < i ) { + t = t % 64; +- if( isalpha(tune[t]) ) { ++ if( isalpha(static_cast(tune[t])) ) { + n = pat_modnote(pat_note(tune[t])); + ins = ch + 1; + vol = 40; diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index 01ff71014c9f..8aaf500a3a7b 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed.tar.gz +sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed0020bc620a059d3675d1854b40bd2608d.tar.gz sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 735d0e704dba..c5d2463fdb31 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODPLUG_VERSION = d1b97ed +LIBMODPLUG_VERSION = d1b97ed0020bc620a059d3675d1854b40bd2608d LIBMODPLUG_SITE = $(call github,Konstanty,libmodplug,$(LIBMODPLUG_VERSION)) LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain diff --git a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch index 14767fb28eae..6853b19ccdb4 100644 --- a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch +++ b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch @@ -1,4 +1,4 @@ -From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001 +From d242b011a8f0d84781bbf7667a44a12646903ca4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Aug 2021 23:21:35 +0200 Subject: [PATCH] configure.ac: drop usage of git at configure time @@ -8,12 +8,13 @@ which is not very useful, and causes a significant number of warning when regenerating the configure script. Signed-off-by: Thomas Petazzoni +Signed-off-by: Frank Vanbever --- configure.ac | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/configure.ac b/configure.ac -index 20163e1e..14e5892a 100644 +index 66d6f4f2..746b1fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ @@ -46,7 +47,7 @@ index 20163e1e..14e5892a 100644 # Check for yajl -@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) +@@ -224,10 +215,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) MSC_VERSION=msc_version AC_SUBST([MSC_VERSION]) @@ -55,9 +56,9 @@ index 20163e1e..14e5892a 100644 - - AC_ARG_ENABLE(debug-logs, - [AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], + [AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], -@@ -412,16 +399,6 @@ AC_OUTPUT +@@ -419,16 +406,6 @@ AC_OUTPUT # Print a fancy summary @@ -66,14 +67,14 @@ index 20163e1e..14e5892a 100644 -echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM" -echo " " -echo " Mandatory dependencies" --echo -n " + libInjection ...." +-AS_ECHO_N(" + libInjection ....") -echo LIBINJECTION_VERSION --echo -n " + SecLang tests ...." +-AS_ECHO_N(" + SecLang tests ....") -echo SECLANG_TEST_VERSION - echo " " echo " Optional dependencies" -- -2.31.1 +2.39.2 diff --git a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch index 6511e6f1e0b5..9e0b672c8dfe 100644 --- a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch +++ b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch @@ -1,4 +1,4 @@ -From 1a84881b280eb08852d5495c57e44351a40d3f91 Mon Sep 17 00:00:00 2001 +From 4129643d657b5d0cce83f9ec4ca27289fd69ec43 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Jul 2021 00:24:57 +0200 Subject: [PATCH] modsecurity.pc.in: add -lstdc++ @@ -13,6 +13,7 @@ Fixes: - http://autobuild.buildroot.org/results/e5a9eb8448980f1c5cafe97180b7d1f48ddf02ca Signed-off-by: Fabrice Fontaine +Signed-off-by: Frank Vanbever --- modsecurity.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -28,5 +29,5 @@ index 96cdf5ca..7c895ddc 100644 -Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ +Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ -lstdc++ -- -2.30.2 +2.39.2 diff --git a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch b/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch deleted file mode 100644 index 9608e3d9350c..000000000000 --- a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6737dc133cb4811a000c02b4e0a92b72f0b220ee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Jul 2021 19:12:51 +0200 -Subject: [PATCH] Revert "Fix maxminddb link on FreeBSD" - -This reverts commit 785958f9b5089b918c7d054cbcc2fe4a3c7b3788. - -Signed-off-by: Fabrice Fontaine ---- - build/libmaxmind.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4 -index 656fc250..02820b5a 100644 ---- a/build/libmaxmind.m4 -+++ b/build/libmaxmind.m4 -@@ -10,7 +10,7 @@ dnl MAXMIND_VERSION - AC_DEFUN([PROG_MAXMIND], [ - - # Possible names for the maxmind library/package (pkg-config) --MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind" -+MAXMIND_POSSIBLE_LIB_NAMES="libmaxminddb maxminddb maxmind" - - # Possible extensions for the library - MAXMIND_POSSIBLE_EXTENSIONS="so la sl dll dylib" --- -2.30.2 - diff --git a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch b/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch deleted file mode 100644 index 5a5baeacee9c..000000000000 --- a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af96f4fe916adc7dc6d649a07c10b45c978d31a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 27 Jul 2022 14:17:20 +0200 -Subject: [PATCH] build/pcre.m4: fix build without pcre - -Don't raise an error if pcre is disabled now that pcre2 is supported - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (no feedback on -https://github.com/SpiderLabs/ModSecurity/pull/2596)] ---- - build/pcre.m4 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build/pcre.m4 b/build/pcre.m4 -index f6c9ae18..3e40f5c9 100644 ---- a/build/pcre.m4 -+++ b/build/pcre.m4 -@@ -99,7 +99,6 @@ AC_SUBST(PCRE_LD_PATH) - - if test -z "${PCRE_VERSION}"; then - AC_MSG_NOTICE([*** pcre library not found.]) -- ifelse([$2], , AC_MSG_ERROR([pcre library is required]), $2) - else - AC_MSG_NOTICE([using pcre v${PCRE_VERSION}]) - ifelse([$1], , , $1) --- -2.35.1 - diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494ccce..da14b216690b 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 7ba0ef7f1813..2221a8a37d77 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256 -sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index e83fda895f1c..d8c10b98b288 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,15 +4,15 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.8 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching build/libmaxmind.m4 and build/pcre.m4 +# We're patching configure.ac LIBMODSECURITY_AUTORECONF = YES LIBMODSECURITY_DEPENDENCIES = pcre2 diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 113110fc1b2f..0cb3917f2d35 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255 libnftnl-1.2.3.tar.bz2 +sha256 966de0a8120c8a53db859889749368bfb2cba0c4f0b4c1a30d264eccc45f1226 libnftnl-1.2.5.tar.xz sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index fd87f7009195..a7045337d0d9 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.3 +LIBNFTNL_VERSION = 1.2.5 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files -LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 +LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ LIBNFTNL_LICENSE_FILES = COPYING LIBNFTNL_INSTALL_STAGING = YES diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch index c51a3cd684e4..ef40b0353a35 100644 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9e0f670..32c7282 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c -@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) +@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize) if (mlock(sh.arena, sh.arena_size) < 0) ret = 2; #endif diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index b5070ad74ccb..9f34e1f5fb74 100644 --- a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -21,7 +21,7 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX} +@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) : (); diff --git a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch index 4313eecd6d10..7b003e483634 100644 --- a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch +++ b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch @@ -23,7 +23,7 @@ diff --git a/engines/e_afalg.c b/engines/e_afalg.c index 9480d7c24b..4e9d67db2d 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c -@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) +@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) return syscall(__NR_io_submit, ctx, n, iocb); } diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index ebc56b11dd95..cf28d4e05b83 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 -sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1w.tar.gz.sha256 +sha256 cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8 openssl-1.1.1w.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 6e84f0617568..651283a828b6 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1t +LIBOPENSSL_VERSION = 1.1.1w LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 3a4c64e9d22a..825e2b7e338a 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBOSMIUM https://osmcode.org/libosmium/ -comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index 2725130e7294..b96c084b69e2 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -31,4 +31,8 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) LIBOSMIUM_DEPENDENCIES += zlib endif +ifeq ($(BR2_PACKAGE_GDAL),y) +LIBOSMIUM_DEPENDENCIES += gdal +endif + $(eval $(cmake-package)) diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch deleted file mode 100644 index 01e18781897e..000000000000 --- a/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d8440f4d711a654b511f50f79c0445b26f9dd1e1 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Tue, 20 Dec 2022 11:39:12 +0700 -Subject: [PATCH] Merge pull request from GHSA-9pfh-r8x4-w26w - -* Fix buffer overread in STUN message decoder - -* Updates based on comments - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1] -Signed-off-by: Fabrice Fontaine ---- - pjnath/include/pjnath/stun_msg.h | 4 ++++ - pjnath/src/pjnath/stun_msg.c | 14 +++++++++++--- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h -index b52f95c586..e49f096f3a 100644 ---- a/pjnath/include/pjnath/stun_msg.h -+++ b/pjnath/include/pjnath/stun_msg.h -@@ -442,6 +442,7 @@ typedef enum pj_stun_status - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_msg_hdr - { - /** -@@ -473,6 +474,7 @@ typedef struct pj_stun_msg_hdr - pj_uint8_t tsx_id[12]; - - } pj_stun_msg_hdr; -+#pragma pack() - - - /** -@@ -490,6 +492,7 @@ typedef struct pj_stun_msg_hdr - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_attr_hdr - { - /** -@@ -506,6 +509,7 @@ typedef struct pj_stun_attr_hdr - pj_uint16_t length; - - } pj_stun_attr_hdr; -+#pragma pack() - - - /** -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index 3def6b3eac..e904a0ba47 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -746,7 +746,7 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) - - #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ - (a)->hdr.length=(pj_uint16_t)(l) --#define ATTR_HDR_LEN 4 -+#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) - - static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) - { -@@ -2327,6 +2327,14 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - status = pj_stun_msg_check(pdu, pdu_len, options); - if (status != PJ_SUCCESS) - return status; -+ } else { -+ /* For safety, verify packet length at least */ -+ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; -+ if (msg_len > pdu_len || -+ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) -+ { -+ return PJNATH_EINSTUNMSGLEN; -+ } - } - - /* Create the message, copy the header, and convert to host byte order */ -@@ -2345,7 +2353,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - p_response = NULL; - - /* Parse attributes */ -- while (pdu_len >= 4) { -+ while (pdu_len >= ATTR_HDR_LEN) { - unsigned attr_type, attr_val_len; - const struct attr_desc *adesc; - -@@ -2357,7 +2365,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - attr_val_len = (attr_val_len + 3) & (~3); - - /* Check length */ -- if (pdu_len < attr_val_len) { -+ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { - pj_str_t err_msg; - char err_msg_buf[80]; - diff --git a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch deleted file mode 100644 index 82249a2076b0..000000000000 --- a/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc4812d31a67d5e2f973fbfaf950d6118226cf36 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Fri, 23 Dec 2022 15:05:28 +0800 -Subject: [PATCH] Merge pull request from GHSA-cxwq-5g9x-x7fr - -* Fixed heap buffer overflow when parsing STUN errcode attribute - -* Also fixed uint parsing - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36] -Signed-off-by: Fabrice Fontaine ---- - pjnath/src/pjnath/stun_msg.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index c6b0bdd284..b55d29849a 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -1438,12 +1438,12 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); - GETATTRHDR(buf, &attr->hdr); - -- attr->value = GETVAL32H(buf, 4); -- - /* Check that the attribute length is valid */ - if (attr->hdr.length != 4) - return PJNATH_ESTUNINATTRLEN; - -+ attr->value = GETVAL32H(buf, 4); -+ - /* Done */ - *p_attr = attr; - -@@ -1757,14 +1757,15 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); - GETATTRHDR(buf, &attr->hdr); - -+ /* Check that the attribute length is valid */ -+ if (attr->hdr.length < 4) -+ return PJNATH_ESTUNINATTRLEN; -+ - attr->err_code = buf[6] * 100 + buf[7]; - - /* Get pointer to the string in the message */ - value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); - value.slen = attr->hdr.length - 4; -- /* Make sure the length is never negative */ -- if (value.slen < 0) -- value.slen = 0; - - /* Copy the string to the attribute */ - pj_strdup(pool, &attr->reason, &value); diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 993557556716..d72e1090e3a2 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9 pjproject-2.13.tar.gz +sha256 5805c1171acab4af9684d7ad096dcb92f71fc42809852144e97e1413468c9981 pjproject-2.14.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 24db64144672..8169e0dceec4 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.13 +LIBPJSIP_VERSION = 2.14 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) @@ -15,12 +15,6 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -# 0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-23537 - -# 0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-23547 - LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O diff --git a/package/libqb/0001-Add-disable-tests-option.patch b/package/libqb/0001-Add-disable-tests-option.patch deleted file mode 100644 index 1afb05520d15..000000000000 --- a/package/libqb/0001-Add-disable-tests-option.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 051d9cfe8f365e30affc6476ed79b9e04a6b15ad Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 4 Nov 2022 00:27:50 +0100 -Subject: [PATCH] Add --disable-tests option - -Add --disable-tests to allow the user to disable tests. As a -side-effect, this will avoid the following build failure when check is -found: - -libstat_wrapper.c:11:10: fatal error: gnu/lib-names.h: No such file or directory - 11 | #include - | ^~~~~~~~~~~~~~~~~ - -This build failure is raised since version 2.0.5 and -https://github.com/ClusterLabs/libqb/commit/78df90b180740712d0c90b6d982b78241cc99d72 - -Fixes: - - http://autobuild.buildroot.org/results/450cfc36d4fd6dc71c138bec45f05b5a2d92a08d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/ClusterLabs/libqb/pull/475] ---- - Makefile.am | 6 +++++- - configure.ac | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index a08b1d2..6a710a0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,7 +39,11 @@ ACLOCAL_AMFLAGS = -I m4 - - dist_doc_DATA = COPYING INSTALL README.markdown - --SUBDIRS = include lib doxygen2man docs tools tests examples -+SUBDIRS = include lib doxygen2man docs tools examples -+ -+if ENABLE_TESTS -+SUBDIRS += tests -+endif - - dist-clean-local: - rm -f .snapshot-version autoconf automake autoheader -diff --git a/configure.ac b/configure.ac -index ac44b7e..4946008 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -562,6 +562,11 @@ AC_ARG_WITH([force-sockets-config-file], - [ FORCESOCKETSFILE="$withval" ], - [ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ]) - -+AC_ARG_ENABLE([tests], -+ [AS_HELP_STRING([--disable-tests],[disable tests])],, -+ [ enable_tests="yes" ]) -+AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) -+ - AC_ARG_ENABLE([install-tests], - [AS_HELP_STRING([--enable-install-tests],[install tests])],, - [ enable_install_tests="no" ]) --- -2.35.1 - diff --git a/package/libqb/libqb.hash b/package/libqb/libqb.hash index de247c266053..f7006ff10e68 100644 --- a/package/libqb/libqb.hash +++ b/package/libqb/libqb.hash @@ -1,5 +1,5 @@ -# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.6/libqb-2.0.6.sha256 -sha256 f1e744208e8f69934804c14e05d9707668f99d4867de9cccf2f7a6bf4d48331c libqb-2.0.6.tar.xz +# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.8/libqb-2.0.8.sha256 +sha256 b42531fc20b8ac02f4c6d0a4dc49f7c4a1eef09bdb13af5f6927b7fc49522ee6 libqb-2.0.8.tar.xz # Locally calculated sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index 65d68181ee8d..11b5788b455c 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQB_VERSION = 2.0.6 +LIBQB_VERSION = 2.0.8 LIBQB_SOURCE = libqb-$(LIBQB_VERSION).tar.xz LIBQB_SITE = \ https://github.com/ClusterLabs/libqb/releases/download/v$(LIBQB_VERSION) @@ -12,8 +12,6 @@ LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES -# We're patching configure.ac -LIBQB_AUTORECONF = YES LIBQB_CONF_OPTS = --disable-tests LIBQB_DEPENDENCIES = libxml2 diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 58bb1b47536c..838c598d7899 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz +sha256 fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03 LibRaw-0.21.2.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index b6616f0c1005..211b67f93503 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.1 +LIBRAW_VERSION = 0.21.2 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk index ff0950c43ddd..129eb90d5f8e 100644 --- a/package/libreplaygain/libreplaygain.mk +++ b/package/libreplaygain/libreplaygain.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBREPLAYGAIN_VERSION = r475 +LIBREPLAYGAIN_VERSION = 475 LIBREPLAYGAIN_SITE = http://files.musepack.net/source -LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz +LIBREPLAYGAIN_SOURCE = libreplaygain_r$(LIBREPLAYGAIN_VERSION).tar.gz # upstream doesn't ship configure LIBREPLAYGAIN_AUTORECONF = YES LIBREPLAYGAIN_INSTALL_STAGING = YES diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 907b9cdd068d..e2d4decb7c1a 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz +sha256 87b1bbe36e9eec8d0ae5f04c83d36b2c5b0e581784c7eb0817025ed29eadea37 libressl-3.6.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index b5fae7e26e00..58c8398e79fe 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.2 +LIBRESSL_VERSION = 3.6.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index c8da3354f596..4eab8cdfbacf 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/librsvg/2.50/librsvg-2.50.7.sha256sum -sha256 fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc librsvg-2.50.7.tar.xz +# From https://download.gnome.org/sources/librsvg/2.50/librsvg-2.50.9.sha256sum +sha256 518905fffa879b6c7f3db1aae961cf31333e0eadc7b4cdd4f531707868c54b53 librsvg-2.50.9.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index df6559a858f0..81a666781714 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -5,7 +5,7 @@ ################################################################################ LIBRSVG_VERSION_MAJOR = 2.50 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).7 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).9 LIBRSVG_SITE = https://download.gnome.org/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES diff --git a/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch b/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch new file mode 100644 index 000000000000..dcc2f7c9cb32 --- /dev/null +++ b/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch @@ -0,0 +1,114 @@ +From a6ff69873110c0a8ba6f7fd90532dbc11224828c Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 13 Mar 2022 15:04:06 +0100 +Subject: [PATCH] Add support for Linux/PowerPC (32-bit) with musl libc. + +Reported by Khem Raj in +. + +* autogen.sh: Copy also musl.m4. +* configure.ac: Invoke gl_MUSL_LIBC. +* src/fault-linux-powerpc.h (SIGSEGV_FAULT_STACKPOINTER): In the 32-bit +case, handle musl libc differently. +* NEWS: Mention it. + +Upstream: https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commit;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 +++++++++++ + NEWS | 4 ++++ + autogen.sh | 3 ++- + configure.ac | 2 ++ + src/fault-linux-powerpc.h | 27 ++++++++++++++++++++++----- + 5 files changed, 41 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index c52b227..7c0a8fa 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2022-03-13 Bruno Haible ++ ++ Add support for Linux/PowerPC (32-bit) with musl libc. ++ Reported by Khem Raj in ++ . ++ * autogen.sh: Copy also musl.m4. ++ * configure.ac: Invoke gl_MUSL_LIBC. ++ * src/fault-linux-powerpc.h (SIGSEGV_FAULT_STACKPOINTER): In the 32-bit ++ case, handle musl libc differently. ++ * NEWS: Mention it. ++ + 2022-01-07 Bruno Haible + + Prepare for version 2.14. +diff --git a/NEWS b/NEWS +index 4d012f8..82cc0f4 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,7 @@ ++New in 2.15: ++ ++* Added support for Linux/PowerPC (32-bit) with musl libc. ++ + New in 2.14: + + * Added support for 64-bit Cygwin. +diff --git a/configure.ac b/configure.ac +index e87f13b..164786f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,8 @@ AC_MSG_RESULT([$sv_cv_host]) + PLATFORM="$sv_cv_host" + AC_SUBST([PLATFORM]) + ++gl_MUSL_LIBC ++ + dnl ========================== Done with PLATFORM ========================== + + +diff --git a/src/fault-linux-powerpc.h b/src/fault-linux-powerpc.h +index cba6ea7..b3f922a 100644 +--- a/src/fault-linux-powerpc.h ++++ b/src/fault-linux-powerpc.h +@@ -1,5 +1,5 @@ + /* Fault handler information. Linux/PowerPC version when it supports POSIX. +- Copyright (C) 2002, 2009, 2017 Bruno Haible ++ Copyright (C) 2002, 2009, 2017, 2022 Bruno Haible + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -28,10 +28,27 @@ + #if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */ + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] + #else /* 32-bit */ +-/* both should be equivalent */ +-# if 0 +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# if MUSL_LIBC ++/* musl libc has a different structure of ucontext_t in ++ musl/arch/powerpc/bits/signal.h. */ ++/* The glibc comments say: ++ "Different versions of the kernel have stored the registers on signal ++ delivery at different offsets from the ucontext struct. Programs should ++ thus use the uc_mcontext.uc_regs pointer to find where the registers are ++ actually stored." */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] ++# endif + # else +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++/* Assume the structure of ucontext_t in ++ glibc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h. */ ++/* Because of the union, both definitions should be equivalent. */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++# endif + # endif + #endif +-- +2.17.1 + diff --git a/package/libsigsegv/0002-add-musl.m4.patch b/package/libsigsegv/0002-add-musl.m4.patch new file mode 100644 index 000000000000..d6f06d8400be --- /dev/null +++ b/package/libsigsegv/0002-add-musl.m4.patch @@ -0,0 +1,47 @@ +From a9b07220b986500cfee7777a543494d360964306 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Jan 2024 21:39:24 +0100 +Subject: [PATCH] add musl.m4 + +Add musl.m4 (retrieved from +https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=m4/musl.m4;h=34d2c1ff22a148eeb76936410ac497d68b228f59;hb=HEAD) + +musl.m4 is needed for gl_MUSL_LIBC since +https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commit;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c + +Signed-off-by: Fabrice Fontaine +Upstream: sent to Bruno Haible +--- + m4/musl.m4 | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + create mode 100644 m4/musl.m4 + +diff --git a/m4/musl.m4 b/m4/musl.m4 +new file mode 100644 +index 0000000..34d2c1f +--- /dev/null ++++ b/m4/musl.m4 +@@ -0,0 +1,20 @@ ++# musl.m4 serial 4 ++dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# Test for musl libc, despite the musl libc authors don't like it ++# ++# . ++# From Bruno Haible. ++ ++AC_DEFUN_ONCE([gl_MUSL_LIBC], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ case "$host_os" in ++ *-musl* | midipix*) ++ AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ++ ;; ++ esac ++]) +-- +2.43.0 + diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index 98bcd55c8cb2..0d5875aa95b8 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -10,5 +10,7 @@ LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPL-2.0+ LIBSIGSEGV_LICENSE_FILES = COPYING +# We're patching configure.ac +LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 90bc4c82d86e..e5eba219b547 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz.asc +# https://www.libssh.org/files/0.10/libssh-0.10.6.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d libssh-0.10.4.tar.xz +sha256 1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1 libssh-0.10.6.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 5deb64b82e41..8b995c3555d9 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.10 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 @@ -17,6 +17,14 @@ LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF +# Not part of any release +# https://www.libssh.org/2023/07/14/cve-2023-3603-potential-null-dereference-in-libsshs-sftp-server/ +LIBSSH_IGNORE_CVES += CVE-2023-3603 + +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else diff --git a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch b/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch deleted file mode 100644 index 2e1fd8871c8d..000000000000 --- a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7f55a033e5054529e5e69f06725dd02a573329b6 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Wed, 2 Mar 2022 19:50:56 -0500 -Subject: [PATCH] Opaque structs in LibreSSL 3.5 - -[Retrieved (and backported) from: -https://github.com/libssh2/libssh2/pull/682/commits/7f55a033e5054529e5e69f06725dd02a573329b6] -Signed-off-by: Fabrice Fontaine ---- - src/openssl.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/openssl.h b/src/openssl.h -index 3eef02368..c13542481 100644 ---- a/src/openssl.h -+++ b/src/openssl.h -@@ -94,8 +94,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -- !defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) - # define HAVE_OPAQUE_STRUCTS 1 - #endif - diff --git a/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch b/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch new file mode 100644 index 000000000000..3cac13386436 --- /dev/null +++ b/package/libssh2/0001-mbedtls-use-more-size_t-to-sync-up-with-crypto-h.patch @@ -0,0 +1,106 @@ +From 1153ebdeba563ac657b525edd6bf6da68b1fe5e2 Mon Sep 17 00:00:00 2001 +From: Viktor Szakats +Date: Tue, 30 May 2023 17:28:03 +0000 +Subject: [PATCH] mbedtls: use more `size_t` to sync up with `crypto.h` + +Ref: 5a96f494ee0b00282afb2db2e091246fc5e1774a #846 #879 + +Fixes #1053 +Closes #1054 + +Upstream: https://github.com/libssh2/libssh2/commit/1153ebdeba563ac657b525edd6bf6da68b1fe5e2 + +Signed-off-by: Bernd Kuhls +--- + src/mbedtls.c | 14 ++++++++------ + src/mbedtls.h | 13 ++++++------- + 2 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/src/mbedtls.c b/src/mbedtls.c +index e387cdb19..cd14a4bd8 100644 +--- a/src/mbedtls.c ++++ b/src/mbedtls.c +@@ -186,7 +186,7 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx) + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen) ++ const unsigned char *key, size_t keylen) + { + const mbedtls_md_info_t *md_info; + int ret, hmac; +@@ -221,7 +221,7 @@ _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash) + } + + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash) + { + const mbedtls_md_info_t *md_info; +@@ -497,8 +497,9 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + int ret; + int md_type; +@@ -548,8 +549,9 @@ _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx * rsactx, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len) ++ size_t sig_len, ++ const unsigned char *m, ++ size_t m_len) + { + return _libssh2_mbedtls_rsa_sha2_verify(rsactx, SHA_DIGEST_LENGTH, + sig, sig_len, m, m_len); +diff --git a/src/mbedtls.h b/src/mbedtls.h +index d9592f721..03484da17 100644 +--- a/src/mbedtls.h ++++ b/src/mbedtls.h +@@ -478,12 +478,12 @@ _libssh2_mbedtls_cipher_dtor(_libssh2_cipher_ctx *ctx); + int + _libssh2_mbedtls_hash_init(mbedtls_md_context_t *ctx, + mbedtls_md_type_t mdtype, +- const unsigned char *key, unsigned long keylen); ++ const unsigned char *key, size_t keylen); + + int + _libssh2_mbedtls_hash_final(mbedtls_md_context_t *ctx, unsigned char *hash); + int +-_libssh2_mbedtls_hash(const unsigned char *data, unsigned long datalen, ++_libssh2_mbedtls_hash(const unsigned char *data, size_t datalen, + mbedtls_md_type_t mdtype, unsigned char *hash); + + _libssh2_bn * +@@ -526,9 +526,8 @@ _libssh2_mbedtls_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa, + int + _libssh2_mbedtls_rsa_sha1_verify(libssh2_rsa_ctx *rsa, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, +- unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha1_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, +@@ -540,8 +539,8 @@ int + _libssh2_mbedtls_rsa_sha2_verify(libssh2_rsa_ctx * rsactx, + size_t hash_len, + const unsigned char *sig, +- unsigned long sig_len, +- const unsigned char *m, unsigned long m_len); ++ size_t sig_len, ++ const unsigned char *m, size_t m_len); + int + _libssh2_mbedtls_rsa_sha2_sign(LIBSSH2_SESSION *session, + libssh2_rsa_ctx *rsa, diff --git a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch new file mode 100644 index 000000000000..2ccedee19e93 --- /dev/null +++ b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch @@ -0,0 +1,462 @@ +From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 +From: Michael Buckley +Date: Thu, 30 Nov 2023 15:08:02 -0800 +Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" + +Refs: +https://terrapin-attack.com/ +https://seclists.org/oss-sec/2023/q4/292 +https://osv.dev/list?ecosystem=&q=CVE-2023-48795 +https://github.com/advisories/GHSA-45x7-px36-x8w8 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 + +Fixes #1290 +Closes #1291 + +Upstream: https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a +Signed-off-by: Fabrice Fontaine +--- + src/kex.c | 63 +++++++++++++++++++++++------------ + src/libssh2_priv.h | 18 +++++++--- + src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- + src/packet.h | 2 +- + src/session.c | 3 ++ + src/transport.c | 12 ++++++- + 6 files changed, 149 insertions(+), 32 deletions(-) + +diff --git a/src/kex.c b/src/kex.c +index 8e7b7f0af3..a7b301e157 100644 +--- a/src/kex.c ++++ b/src/kex.c +@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { + 0, + }; + ++static const LIBSSH2_KEX_METHOD ++kex_method_strict_client_extension = { ++ "kex-strict-c-v00@openssh.com", ++ NULL, ++ 0, ++}; ++ + static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + #if LIBSSH2_ED25519 + &kex_method_ssh_curve25519_sha256, +@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + &kex_method_diffie_helman_group1_sha1, + &kex_method_diffie_helman_group_exchange_sha1, + &kex_method_extension_negotiation, ++ &kex_method_strict_client_extension, + NULL + }; + +@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) + return 0; + } + +-/* kex_agree_instr ++/* _libssh2_kex_agree_instr + * Kex specific variant of strstr() + * Needle must be preceded by BOL or ',', and followed by ',' or EOL + */ +-static unsigned char * +-kex_agree_instr(unsigned char *haystack, size_t haystack_len, +- const unsigned char *needle, size_t needle_len) ++unsigned char * ++_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) + { + unsigned char *s; + unsigned char *end_haystack; +@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + while(s && *s) { + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { + const LIBSSH2_HOSTKEY_METHOD *method = + (const LIBSSH2_HOSTKEY_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + } + + while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { +- s = kex_agree_instr(hostkey, hostkey_len, +- (unsigned char *) (*hostkeyp)->name, +- strlen((*hostkeyp)->name)); ++ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, ++ (unsigned char *) (*hostkeyp)->name, ++ strlen((*hostkeyp)->name)); + if(s) { + /* So far so good, but does it suit our purposes? (Encrypting vs + Signing) */ +@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + { + const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; + unsigned char *s; ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ ++ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { ++ session->kex_strict = 1; ++ } + + if(session->kex_prefs) { + s = (unsigned char *) session->kex_prefs; +@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + while(s && *s) { + unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- q = kex_agree_instr(kex, kex_len, s, method_len); ++ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); + if(q) { + const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + } + + while(*kexp && (*kexp)->name) { +- s = kex_agree_instr(kex, kex_len, +- (unsigned char *) (*kexp)->name, +- strlen((*kexp)->name)); ++ s = _libssh2_kex_agree_instr(kex, kex_len, ++ (unsigned char *) (*kexp)->name, ++ strlen((*kexp)->name)); + if(s) { + /* We've agreed on a key exchange method, + * Can we agree on a hostkey that works with this kex? +@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { + const LIBSSH2_CRYPT_METHOD *method = + (const LIBSSH2_CRYPT_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + } + + while(*cryptp && (*cryptp)->name) { +- s = kex_agree_instr(crypt, crypt_len, +- (unsigned char *) (*cryptp)->name, +- strlen((*cryptp)->name)); ++ s = _libssh2_kex_agree_instr(crypt, crypt_len, ++ (unsigned char *) (*cryptp)->name, ++ strlen((*cryptp)->name)); + if(s) { + endpoint->crypt = *cryptp; + return 0; +@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(mac, mac_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { + const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) + kex_get_method_by_name((char *) s, method_len, + (const LIBSSH2_COMMON_METHOD **) +@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + } + + while(*macp && (*macp)->name) { +- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, +- strlen((*macp)->name)); ++ s = _libssh2_kex_agree_instr(mac, mac_len, ++ (unsigned char *) (*macp)->name, ++ strlen((*macp)->name)); + if(s) { + endpoint->mac = *macp; + return 0; +@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(comp, comp_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { + const LIBSSH2_COMP_METHOD *method = + (const LIBSSH2_COMP_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + } + + while(*compp && (*compp)->name) { +- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, +- strlen((*compp)->name)); ++ s = _libssh2_kex_agree_instr(comp, comp_len, ++ (unsigned char *) (*compp)->name, ++ strlen((*compp)->name)); + if(s) { + endpoint->comp = *compp; + return 0; +@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->remote.kexinit = NULL; + } + ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + +diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h +index 7660366954..18d9ab2130 100644 +--- a/src/libssh2_priv.h ++++ b/src/libssh2_priv.h +@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION + /* key signing algorithm preferences -- NULL yields server order */ + char *sign_algo_prefs; + ++ /* Whether to use the OpenSSH Strict KEX extension */ ++ int kex_strict; ++ + /* (remote as source of data -- packet_read ) */ + libssh2_endpoint_data remote; + +@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION + int fullpacket_macstate; + size_t fullpacket_payload_len; + int fullpacket_packet_type; ++ uint32_t fullpacket_required_type; + + /* State variables used in libssh2_sftp_init() */ + libssh2_nonblocking_states sftpInit_state; +@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION + }; + + /* session.state bits */ +-#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 +-#define LIBSSH2_STATE_NEWKEYS 0x00000002 +-#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 +-#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 ++#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 ++#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 ++#define LIBSSH2_STATE_NEWKEYS 0x00000004 ++#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 ++#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 + + /* session.flag helpers */ + #ifdef MSG_NOSIGNAL +@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, + int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + key_exchange_state_t * state); + ++unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, ++ size_t haystack_len, ++ const unsigned char *needle, ++ size_t needle_len); ++ + /* Let crypt.c/hostkey.c expose their method structs */ + const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); + const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); +diff --git a/src/packet.c b/src/packet.c +index eccb8c56a8..6da14e9fa1 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, + * layer when it has received a packet. + * + * The input pointer 'data' is pointing to allocated data that this function +- * is asked to deal with so on failure OR success, it must be freed fine. +- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. ++ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. + * + * This function will always be called with 'datalen' greater than zero. + */ + int + _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate) ++ size_t datalen, int macstate, uint32_t seq) + { + int rc = 0; + unsigned char *message = NULL; +@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + break; + } + ++ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { ++ if(msg == SSH_MSG_KEXINIT) { ++ if(!session->kex_strict) { ++ if(datalen < 17) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Data too short extracting kex"); ++ } ++ else { ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ struct string_buf buf; ++ unsigned char *algs = NULL; ++ size_t algs_len = 0; ++ ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 17; /* advance past type and cookie */ ++ ++ if(_libssh2_get_string(&buf, &algs, &algs_len)) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Algs too short"); ++ } ++ ++ if(algs_len == 0 || ++ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { ++ session->kex_strict = 1; ++ } ++ } ++ } ++ ++ if(session->kex_strict && seq) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ } ++ } ++ ++ if(session->kex_strict && session->fullpacket_required_type && ++ session->fullpacket_required_type != msg) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } ++ } ++ + if(session->packAdd_state == libssh2_NB_state_allocated) { + /* A couple exceptions to the packet adding rule: */ + switch(msg) { +@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, + + return 0; + } ++ else if(session->kex_strict && ++ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } + packet = _libssh2_list_next(&packet->node); + } + return -1; +@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, + } + + while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { +- int ret = _libssh2_transport_read(session); ++ int ret; ++ session->fullpacket_required_type = packet_type; ++ ret = _libssh2_transport_read(session); ++ session->fullpacket_required_type = 0; + if(ret == LIBSSH2_ERROR_EAGAIN) + return ret; + else if(ret < 0) { +diff --git a/src/packet.h b/src/packet.h +index 1d90b8af12..955351e5f6 100644 +--- a/src/packet.h ++++ b/src/packet.h +@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, + int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, + unsigned long data_len); + int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate); ++ size_t datalen, int macstate, uint32_t seq); + + #endif /* LIBSSH2_PACKET_H */ +diff --git a/src/session.c b/src/session.c +index 35e7929fe7..9d89ade8ec 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), + session->abstract = abstract; + session->api_timeout = 0; /* timeout-free API by default */ + session->api_block_mode = 1; /* blocking API by default */ ++ session->state = LIBSSH2_STATE_INITIAL_KEX; ++ session->fullpacket_required_type = 0; + session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; + session->flag.quote_paths = 1; /* default behavior is to quote paths + for the scp subsystem */ +@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, + const char *desc, const char *lang) + { + int rc; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + BLOCK_ADJUST(rc, session, + session_disconnect(session, reason, desc, lang)); +diff --git a/src/transport.c b/src/transport.c +index 21be9d2b80..a8bb588a4b 100644 +--- a/src/transport.c ++++ b/src/transport.c +@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + struct transportpacket *p = &session->packet; + int rc; + int compressed; ++ uint32_t seq = session->remote.seqno; + + if(session->fullpacket_state == libssh2_NB_state_idle) { + session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; +@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + if(session->fullpacket_state == libssh2_NB_state_created) { + rc = _libssh2_packet_add(session, p->payload, + session->fullpacket_payload_len, +- session->fullpacket_macstate); ++ session->fullpacket_macstate, seq); + if(rc == LIBSSH2_ERROR_EAGAIN) + return rc; + if(rc) { +@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + + session->fullpacket_state = libssh2_NB_state_idle; + ++ if(session->kex_strict && ++ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { ++ session->remote.seqno = 0; ++ } ++ + return session->fullpacket_packet_type; + } + +@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, + + session->local.seqno++; + ++ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { ++ session->local.seqno = 0; ++ } ++ + ret = LIBSSH2_SEND(session, p->outbuf, total_length, + LIBSSH2_SOCKET_SEND_FLAGS(session)); + if(ret < 0) diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index 7267e8598761..b5bc571f86d9 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51 libssh2-1.10.0.tar.gz -sha256 859e60d760a3446ecaf777339f1eef98c527aea40714384d24b882a83ffdd23a COPYING +sha256 a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2 libssh2-1.11.0.tar.xz +sha256 fda5e2522c58ba1f31c9f2044747616457466f4aebec16ade4af86e3a16a8e02 COPYING diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index cd74784d829d..b2c07cbf30fa 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,13 +4,17 @@ # ################################################################################ -LIBSSH2_VERSION = 1.10.0 +LIBSSH2_VERSION = 1.11.0 +LIBSSH2_SOURCE= libssh2-$(LIBSSH2_VERSION).tar.xz LIBSSH2_SITE = https://www.libssh2.org/download LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES -LIBSSH2_CONF_OPTS = --disable-examples-build +LIBSSH2_CONF_OPTS = --disable-examples-build --disable-rpath + +# 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch +LIBSSH2_IGNORE_CVES += CVE-2023-48795 ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) LIBSSH2_DEPENDENCIES += mbedtls diff --git a/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch index c25002ba7042..1cf411b3913c 100644 --- a/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch +++ b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch @@ -20,7 +20,7 @@ diff --git a/demo/test.c b/demo/test.c index 998f14b3..f719709d 100644 --- a/demo/test.c +++ b/demo/test.c -@@ -522,7 +522,7 @@ static int test_mp_invmod(void) +@@ -625,7 +625,7 @@ static int test_mp_invmod(void) } diff --git a/package/libtommath/libtommath.hash b/package/libtommath/libtommath.hash index 9af489ef1a37..4f5dd40231a6 100644 --- a/package/libtommath/libtommath.hash +++ b/package/libtommath/libtommath.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1 ltm-1.2.0.tar.xz +sha256 986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f ltm-1.2.1.tar.xz # Hashes for license files: sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE diff --git a/package/libtommath/libtommath.mk b/package/libtommath/libtommath.mk index bd3957d6c25e..7b5305faf627 100644 --- a/package/libtommath/libtommath.mk +++ b/package/libtommath/libtommath.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBTOMMATH_VERSION = 1.2.0 +LIBTOMMATH_VERSION = 1.2.1 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_LICENSE = Unlicense LIBTOMMATH_LICENSE_FILES = LICENSE +LIBTOMMATH_CPE_ID_VENDOR = libtom LIBTOMMATH_INSTALL_STAGING = YES LIBTOMMATH_INSTALL_TARGET = NO # only static library diff --git a/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch new file mode 100644 index 000000000000..414cb3d2056e --- /dev/null +++ b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch @@ -0,0 +1,71 @@ +From 35bbc4d8155ed86ca7200e060dad98bdfbce684d Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Thu, 15 Jun 2023 16:54:46 +0200 +Subject: [PATCH] Revert "fw_setenv: fix bug when SPI flash write size != + sector size" + +This reverts commit 44ecc1c216007272a6f99a104a71c9d410969d9e. + +mtd writesize was errouneously interpreted as maximum allowed size, but +it is the minimum size. The patch raises performance issues because on +NOR flashes single bytes are written. + +Signed-off-by: Stefano Babic +Upstream: https://github.com/sbabic/libubootenv/commit/9f17a00ee56dc5cfb1d9b51e6639d67b64cb3309 +Signed-off-by: Brandon Maier +--- + src/uboot_env.c | 29 +++++++++-------------------- + 1 file changed, 9 insertions(+), 20 deletions(-) + +diff --git a/src/uboot_env.c b/src/uboot_env.c +index c5eefe7..76e2619 100644 +--- a/src/uboot_env.c ++++ b/src/uboot_env.c +@@ -712,8 +712,6 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + sectors = dev->envsectors ? dev->envsectors : 1; + buf = data; + while (count > 0) { +- int blockcount; +- + erase.start = start; + + skip = is_nand_badblock(dev, start); +@@ -744,26 +742,17 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + ret =-EIO; + goto devwrite_out; + } +- +- blockcount = blocksize; +- +- /* writesize can be different than the sector size. */ +- +- while (blockcount > 0) { +- if (lseek(dev->fd, start, SEEK_SET) < 0) { +- ret =-EIO; +- goto devwrite_out; +- } +- if (write(dev->fd, buf, dev->mtdinfo.writesize) != dev->mtdinfo.writesize) { +- ret =-EIO; +- goto devwrite_out; +- } +- +- blockcount -= dev->mtdinfo.writesize; +- start += dev->mtdinfo.writesize; +- buf += dev->mtdinfo.writesize; ++ if (lseek(dev->fd, start, SEEK_SET) < 0) { ++ ret =-EIO; ++ goto devwrite_out; ++ } ++ if (write(dev->fd, buf, blocksize) != blocksize) { ++ ret =-EIO; ++ goto devwrite_out; + } + MTDLOCK(dev, &erase); ++ start += dev->sectorsize; ++ buf += blocksize; + count -= blocksize; + ret += blocksize; + } +-- +2.41.0 + diff --git a/package/libuev/libuev.hash b/package/libuev/libuev.hash index e5c9660a0292..1b5a9fa72181 100644 --- a/package/libuev/libuev.hash +++ b/package/libuev/libuev.hash @@ -1,4 +1,4 @@ -# From https://github.com/troglobit/libuev/releases/download/v2.4.0/libuev-2.4.0.tar.xz.sha256 -sha256 31f1aa4f492ba4f6a5dd6b19968ae6a732968dc05cae6575930560b6cee1f5ef libuev-2.4.0.tar.xz +# From https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz.sha256 +sha256 1d171c572ca48ddd6763f76c54e77d021d4ca7beb007610f7c1fec903511977b libuev-2.4.1.tar.xz # License files -sha256 694a734d9c1b46ae203314ed1c744a1acebd4fe5fc964b761703772546f0d3ab LICENSE +sha256 387d0d8e2aabf187751c8f1ebb9a4abaecaa7e0e05fead27f408193a0f0f17dd LICENSE diff --git a/package/libuev/libuev.mk b/package/libuev/libuev.mk index a32381dcc5e4..432c3624011c 100644 --- a/package/libuev/libuev.mk +++ b/package/libuev/libuev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUEV_VERSION = 2.4.0 +LIBUEV_VERSION = 2.4.1 LIBUEV_SOURCE = libuev-$(LIBUEV_VERSION).tar.xz LIBUEV_SITE = https://github.com/troglobit/libuev/releases/download/v$(LIBUEV_VERSION) LIBUEV_LICENSE = MIT diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index a552a88f0c20..d89f4541b6a0 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBUHTTPD comment "libuhttpd needs a toolchain w/ gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index 9cd587d0a3e8..14a7a1fcda35 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -10,7 +10,6 @@ LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT LIBUNWIND_CPE_ID_VENDOR = libunwind_project -LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ --disable-tests \ diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index fcb231cff668..6fd4678c0d78 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 025d7aee1ac5ca8f0bd99cb58b83fcfca0efab0c5c9c1d48f72667fe40788a4e libupnp-1.14.13.tar.bz2 +sha256 16a7cee93ce2868ae63ab1a8164dc7de43577c59983b9f61293a310d6888dceb libupnp-1.14.18.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 8c6ae005a00a..f8551a2a0d1d 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.13 +LIBUPNP_VERSION = 1.14.18 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) diff --git a/package/libuv/Config.in b/package/libuv/Config.in index cdd73a672f1d..e23b2c5fe0dc 100644 --- a/package/libuv/Config.in +++ b/package/libuv/Config.in @@ -4,13 +4,15 @@ config BR2_PACKAGE_LIBUV depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help libuv is a multi-platform support library with a focus on asynchronous I/O. https://github.com/libuv/libuv -comment "libuv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "libuv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index b0fa0ff5be27..2ca8f64a8089 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da libuv-1.44.2.tar.gz -sha256 95b8b163c60d17cfce3cef61a2d8a9cf70137502c8fb5f3d93cd2fc529fa98c8 LICENSE +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz +sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE +sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index c169b76a6a26..5f96e98a98df 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,25 +6,13 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.44.2 -LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) +LIBUV_VERSION = 1.48.0 +LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz +LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES -LIBUV_AUTORECONF = YES LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT -LIBUV_LICENSE_FILES = LICENSE +LIBUV_LICENSE_FILES = LICENSE LICENSE-extra 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 -# sequentiality in 1.12 and later, the automake option 'serial-tests' -# must be used, Unfortunately, it is not recognised by 1.11 and -# before. So upstream only adds it conditionally. We use automake -# 1.14, so we need it. -define LIBUV_FIXUP_AUTOGEN - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - >$(@D)/m4/libuv-extra-automake-flags.m4 -endef -LIBUV_POST_PATCH_HOOKS += LIBUV_FIXUP_AUTOGEN - $(eval $(autotools-package)) diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0fe2..87f343a9d9b2 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06dc..77cae92cf25a 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 000000000000..4c652a63c257 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index f7b15e8e06e0..328f1cfc7628 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported diff --git a/package/libvpx/0002-VP8-disallow-thread-count-changes.patch b/package/libvpx/0002-VP8-disallow-thread-count-changes.patch new file mode 100644 index 000000000000..d625255a9f0d --- /dev/null +++ b/package/libvpx/0002-VP8-disallow-thread-count-changes.patch @@ -0,0 +1,38 @@ +From 3fbd1dca6a4d2dad332a2110d646e4ffef36d590 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Mon, 25 Sep 2023 18:55:59 -0700 +Subject: [PATCH] VP8: disallow thread count changes + +Currently allocations are done at encoder creation time. Going from +threaded to non-threaded would cause a crash. + +Bug: chromium:1486441 +Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4 + +Fixes CVE-2023-5217: https://www.cve.org/CVERecord?id=CVE-2023-5217 + +Upstream: https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590 +Upstream: https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d646e4ffef36d590 + +[Bernd: Removed patch for test/encode_api_test.cc] +Signed-off-by: Bernd Kuhls +--- + vp8/encoder/onyx_if.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c +index c65afc643bf..c5e9970c3cc 100644 +--- a/vp8/encoder/onyx_if.c ++++ b/vp8/encoder/onyx_if.c +@@ -1447,6 +1447,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { + last_h = cpi->oxcf.Height; + prev_number_of_layers = cpi->oxcf.number_of_layers; + ++ if (cpi->initial_width) { ++ // TODO(https://crbug.com/1486441): Allow changing thread counts; the ++ // allocation is done once in vp8_create_compressor(). ++ oxcf->multi_threaded = cpi->oxcf.multi_threaded; ++ } + cpi->oxcf = *oxcf; + + switch (cpi->oxcf.Mode) { diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index 828718e71346..c88e6840cf1f 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb libvpx-1.12.0.tar.gz +sha256 cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066 libvpx-1.13.0.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index c8a22b9ab2c0..b558c4198160 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,13 +4,16 @@ # ################################################################################ -LIBVPX_VERSION = 1.12.0 +LIBVPX_VERSION = 1.13.0 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS LIBVPX_CPE_ID_VENDOR = webmproject LIBVPX_INSTALL_STAGING = YES +# 0002-VP8-disallow-thread-count-changes.patch +LIBVPX_IGNORE_CVES += CVE-2023-5217 + # ld is being used with cc options. therefore, pretend ld is cc. LIBVPX_CONF_ENV = \ LD="$(TARGET_CC)" \ diff --git a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch b/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch new file mode 100644 index 000000000000..94d643e13229 --- /dev/null +++ b/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch @@ -0,0 +1,47 @@ +From 786ec9231e402cd4e7621483be6f1837de724e3c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 26 Dec 2023 22:38:18 +0100 +Subject: [PATCH] lib/tls/CMakeLists.txt: fix build with pkg-config + +Fix the following wolfssl build failure raised since +https://github.com/warmcat/libwebsockets/commit/079726c4b252e795b208209752077c1ae4504b5b: + +-- Checking for one of the modules 'wolfssl' +CMake Error at lib/tls/CMakeLists.txt:79 (message): + You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when + LWS_WITH_WOLFSSL is turned on. + +Fixes: + - http://autobuild.buildroot.org/results/fe062b9f0b330e71309334d7605d64ea73761b59 + +Upstream: https://github.com/warmcat/libwebsockets/commit/f18fc2316f9743624ced9ba934595f7b9ba8cd05 +Signed-off-by: Fabrice Fontaine +--- + lib/tls/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +index 80b46203..230b0d29 100644 +--- a/lib/tls/CMakeLists.txt ++++ b/lib/tls/CMakeLists.txt +@@ -72,12 +72,16 @@ if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL) + include (FindPkgConfig) + PKG_SEARCH_MODULE(LWS_WOLFSSL wolfssl) + +- if (NOT WOLFSSL_FOUND) ++ if (NOT LWS_WOLFSSL_FOUND) + if (LWS_WITH_CYASSL) + message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_WITH_CYASSL is turned on.") + else() + message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on.") + endif() ++ else() ++ set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) ++ set(WOLFSSL_INCLUDE_DIRS ${LWS_WOLFSSL_INCLUDE_DIRS}) ++ set(WOLFSSL_FOUND 1) + endif() + else() + set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) +-- +2.43.0 + diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 79624948a573..2f0e6b436382 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -42,7 +42,7 @@ LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_SSL=ON \ -DLWS_WITH_MBEDTLS=ON \ -DLWS_WITH_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBWEBSOCKETS_DEPENDENCIES += host-pkgconf wolfssl LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_SSL=ON \ diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 6957e2ed872a..33bf512f60bf 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum -sha256 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c libxml2-2.10.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.7.sha256sum +sha256 fb27720e25eaf457f94fd3d7189bcf2626c6dccf4201553bc8874d50e3560162 libxml2-2.11.7.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 7a01dc4259ca..6de984d9b8d2 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.10 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION_MAJOR = 2.11 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).7 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index c771e1fd7ef0..458c1388d32e 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum -sha256 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 libxslt-1.1.37.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum +sha256 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 libxslt-1.1.38.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 95b0325c94f8..ec066fbfa226 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.37 +LIBXSLT_VERSION = 1.1.38 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 26a28d6eedfd..3658b20e4e55 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz +sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index f160035c098b..5533c7c68eff 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.30 +LIBYANG_VERSION = 2.1.111 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index e344cc7ad9c1..b6193a6767a6 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -6,7 +6,7 @@ LIBZLIB_VERSION = 1.2.13 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz -LIBZLIB_SITE = http://www.zlib.net +LIBZLIB_SITE = https://www.zlib.net LIBZLIB_LICENSE = Zlib LIBZLIB_LICENSE_FILES = LICENSE LIBZLIB_INSTALL_STAGING = YES diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f91..fa4804dd2efe 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ae40520c51f4..2383f45a71aa 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.307" if BR2_KERNEL_HEADERS_4_14 - default "4.19.274" if BR2_KERNEL_HEADERS_4_19 - default "5.4.233" if BR2_KERNEL_HEADERS_5_4 - default "5.10.170" if BR2_KERNEL_HEADERS_5_10 - default "5.15.96" if BR2_KERNEL_HEADERS_5_15 - default "6.1.14" if BR2_KERNEL_HEADERS_6_1 + default "4.14.336" if BR2_KERNEL_HEADERS_4_14 + default "4.19.310" if BR2_KERNEL_HEADERS_4_19 + default "5.4.272" if BR2_KERNEL_HEADERS_5_4 + default "5.10.213" if BR2_KERNEL_HEADERS_5_10 + default "5.15.152" if BR2_KERNEL_HEADERS_5_15 + default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/linux-tools/S10hyperv b/package/linux-tools/S10hyperv index 32887d1b6c3a..be9ed2c5df87 100644 --- a/package/linux-tools/S10hyperv +++ b/package/linux-tools/S10hyperv @@ -2,14 +2,18 @@ PROGS="@PROGS@" PIDDIR="/var/run" +DAEMON="hyperv" # shellcheck source=/dev/null -[ -r "/etc/default/hyperv" ] && . "/etc/default/hyperv" +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +# only continue if we are in a HyperV platform +[ -e "/sys/bus/vmbus" ] || exit 0 start_one() { printf 'Starting %s: ' "$1" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -b -m -S -q -p "$PIDDIR/$1.pid" -x "/sbin/$1" -- -n + start-stop-daemon -b -m -S -q -p "$PIDDIR/$1.pid" -x "/usr/sbin/$1" -- -n status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index dda63cccecb4..ee308a85dfd1 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -27,7 +27,8 @@ PERF_MAKE_FLAGS = \ NO_GTK2=1 \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ - NO_LIBBIONIC=1 + NO_LIBBIONIC=1 \ + NO_LIBTRACEEVENT=1 # We need to pass an argument to ld for setting the emulation when # building for MIPS architecture, otherwise the default one will always @@ -166,9 +167,13 @@ endef # target unless BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS is enabled ifeq ($(BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS),) define PERF_INSTALL_REMOVE_SCRIPTS - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ + /usr/libexec/perf-core/tests/pe-file.exe \ + /usr/libexec/perf-core/tests/pe-file.exe.debug endif define PERF_INSTALL_TARGET_CMDS diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index fcdf5725321e..b8ae5836724d 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -37,7 +37,18 @@ endif # disable altivec, it has build issues ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) +LIQUID_DSP_SIMDOVERRIDE = y +endif + +# Upstream expects NEON on all ARM CPUs by default +ifeq ($(BR2_arm):$(BR2_ARM_FPU_NEON),y:) +LIQUID_DSP_SIMDOVERRIDE = y +endif + +ifeq ($(LIQUID_DSP_SIMDOVERRIDE),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride +# Do not add an else-clause to pass --disable-simdoverride, as it is +# non-functional, and behaves as --enable-simdoverride endif LIQUID_DSP_CONF_OPTS += \ diff --git a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch new file mode 100644 index 000000000000..05d882a07a16 --- /dev/null +++ b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch @@ -0,0 +1,24 @@ +From a9aeabdf879c25c584852a0bb5523837632f099b Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Wed, 12 Apr 2023 07:38:31 +0200 +Subject: [PATCH] daemon: fix read overflow when parsing CDP addresses + +Upstream: https://github.com/lldpd/lldpd/commit/a9aeabdf879c25c584852a0bb5523837632f099b +Signed-off-by: Fabrice Fontaine +--- + NEWS | 4 ++++ + src/daemon/protocols/cdp.c | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c +index 8a1be863..42861c0e 100644 +--- a/src/daemon/protocols/cdp.c ++++ b/src/daemon/protocols/cdp.c +@@ -466,6 +466,7 @@ cdp_decode(struct lldpd *cfg, char *frame, int s, struct lldpd_hardware *hardwar + goto malformed; + } + PEEK_DISCARD(address_len); ++ addresses_len -= address_len; + (void)PEEK_SAVE(pos_next_address); + /* Next, we go back and try to extract + IPv4 address */ diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index dd6f8dcf5d5d..d4abfade8184 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -16,6 +16,9 @@ LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE LLDPD_CPE_ID_VENDOR = lldpd_project +# 0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch +LLDPD_IGNORE_CVES += CVE-2023-41910 + # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable # WCHAR in toolchain. But actually we do not need WCHAR at lldpd diff --git a/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 000000000000..c798f585d685 --- /dev/null +++ b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,34 @@ +From c6c71ab47d658ab8f84e6a6066d476fd9632bbca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream: https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch +Signed-off-by: Peter Seiderer +--- + include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h +index e0a18e72..148216b8 100644 +--- a/include/llvm/Support/Signals.h ++++ b/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { +-- +2.40.1 + diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 66998408542f..c755f59b34a3 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c +LOCALEDEF_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch new file mode 100644 index 000000000000..a116fcc4915b --- /dev/null +++ b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch @@ -0,0 +1,73 @@ +From 4900c27cc284ba2f671ae92e6ffb4ab391f9507a Mon Sep 17 00:00:00 2001 +From: Robert Middleton +Date: Mon, 6 Feb 2023 20:39:02 -0500 +Subject: [PATCH] Make ODBC and SMTP opt-in (#191) + +See #189 + +Upstream: afeaab6d0f0107c77dfadcbe3708f170c48d5ed9 +Signed-off-by: Thomas Petazzoni +--- + src/main/include/CMakeLists.txt | 40 ++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt +index e31443fb..d6835293 100644 +--- a/src/main/include/CMakeLists.txt ++++ b/src/main/include/CMakeLists.txt +@@ -85,22 +85,42 @@ include(CheckIncludeFiles) + include(CheckIncludeFileCXX) + include(CheckLibraryExists) + +-if(WIN32) +- CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++option(LOG4CXX_ENABLE_ODBC "Support logging via ODBC" OFF) ++if(LOG4CXX_ENABLE_ODBC) ++ if(WIN32) ++ CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++ else() ++ include(FindPkgConfig) ++ ++ pkg_check_modules( odbc odbc ) ++ if(${odbc_FOUND}) ++ set(HAS_ODBC 1) ++ else() ++ set(HAS_ODBC 0) ++ endif(${odbc_FOUND}) ++ endif(WIN32) ++ ++ if(NOT ${HAS_ODBC}) ++ message(SEND_ERROR "ODBC not found but requested") ++ endif() + else() +- include(FindPkgConfig) +- +- pkg_check_modules( odbc QUIET odbc ) +- if(${odbc_FOUND}) +- set(HAS_ODBC 1) +- endif(${odbc_FOUND}) +-endif(WIN32) ++ set(HAS_ODBC 0) ++endif(LOG4CXX_ENABLE_ODBC) ++ ++option(LOG4CXX_ENABLE_ESMTP "Support logging via libesmtp" OFF) ++if(LOG4CXX_ENABLE_ESMTP) ++ CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) ++ if(NOT HAS_LIBESMTP) ++ message(SEND_ERROR "SMTP support with libesmtp not found but requested") ++ endif() ++else() ++ set(HAS_LIBESMTP 0) ++endif(LOG4CXX_ENABLE_ESMTP) + + CHECK_INCLUDE_FILE_CXX(locale HAS_STD_LOCALE) + CHECK_FUNCTION_EXISTS(mbsrtowcs HAS_MBSRTOWCS) + CHECK_FUNCTION_EXISTS(wcstombs HAS_WCSTOMBS) + CHECK_FUNCTION_EXISTS(fwide HAS_FWIDE) +-CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) + CHECK_FUNCTION_EXISTS(syslog HAS_SYSLOG) + if(UNIX) + set(CMAKE_REQUIRED_LIBRARIES "pthread") +-- +2.41.0 + diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index f50267d737af..aee682529c89 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -10,10 +10,15 @@ LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE +LOG4CXX_CPE_ID_VENDOR = apache +# We do not support ODBC functionality +LOG4CXX_IGNORE_CVES = CVE-2023-31038 +# Note: if you want to support odbc, make sure CVE-2023-31038 is fixed LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ - -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config + -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config \ + -DLOG4CXX_ENABLE_ODBC=OFF LOG4CXX_DEPENDENCIES = apr apr-util @@ -22,7 +27,10 @@ LOG4CXX_DEPENDENCIES += boost endif ifeq ($(BR2_PACKAGE_LIBESMTP),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=ON LOG4CXX_DEPENDENCIES += libesmtp +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=OFF endif ifeq ($(BR2_USE_WCHAR),y) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index fd5887141b1a..f318950ded01 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -10,6 +10,7 @@ LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h +LSOF_CPE_ID_VENDOR = lsof_project ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 000000000000..fdbf5243f55f --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,71 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. + +Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6 +Signed-off-by: Francois Perrad +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038ed1..34387c12e5bd 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,10 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator + +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 $(eval $(luarocks-package)) diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash deleted file mode 100644 index b55b17f2586c..000000000000 --- a/package/lua/5.4.4/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz -sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz - -# Locally computed -sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/5.4.4/0001-root-path.patch b/package/lua/5.4.6/0001-root-path.patch similarity index 95% rename from package/lua/5.4.4/0001-root-path.patch rename to package/lua/5.4.6/0001-root-path.patch index c4f6e312eb0c..5e3037b78653 100644 --- a/package/lua/5.4.4/0001-root-path.patch +++ b/package/lua/5.4.6/0001-root-path.patch @@ -6,7 +6,7 @@ Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #else /* }{ */ diff --git a/package/lua/5.4.4/0002-shared-libs-for-lua.patch b/package/lua/5.4.6/0002-shared-libs-for-lua.patch similarity index 96% rename from package/lua/5.4.4/0002-shared-libs-for-lua.patch rename to package/lua/5.4.6/0002-shared-libs-for-lua.patch index 4ff204429827..388aa9966a8e 100644 --- a/package/lua/5.4.4/0002-shared-libs-for-lua.patch +++ b/package/lua/5.4.6/0002-shared-libs-for-lua.patch @@ -31,7 +31,7 @@ Index: b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -33,6 +33,7 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so diff --git a/package/lua/5.4.4/0011-linenoise.patch b/package/lua/5.4.6/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.4/0011-linenoise.patch rename to package/lua/5.4.6/0011-linenoise.patch index 68316e108f5f..5054ae19e245 100644 --- a/package/lua/5.4.4/0011-linenoise.patch +++ b/package/lua/5.4.6/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -428,6 +428,14 @@ +@@ -438,6 +438,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash new file mode 100644 index 000000000000..0b03fd563c6b --- /dev/null +++ b/package/lua/5.4.6/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz + +# Locally computed +sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 16086e7bf4cf..93d4803812a8 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.4 +LUA_VERSION = 5.4.6 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else diff --git a/package/luv/Config.in b/package/luv/Config.in index 434cb3b459a3..d6aff8b6f7c8 100644 --- a/package/luv/Config.in +++ b/package/luv/Config.in @@ -4,13 +4,15 @@ config BR2_PACKAGE_LUV depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV help libuv bindings for LuaJIT and Lua. https://github.com/luvit/luv -comment "luv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luv needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luvi/Config.in b/package/luvi/Config.in index 6e96f85f32cd..3a724acebb75 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LUVI depends on !BR2_STATIC_LIBS # libuv depends on BR2_PACKAGE_LUAJIT depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LUV select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -25,8 +26,9 @@ config BR2_PACKAGE_LUVI https://github.com/luvit/luvi -comment "luvi needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luvi needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5266281ffc8e..f77961fb00bd 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -22,6 +22,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) LUVI_TARGET_ARCH = arm else ifeq ($(BR2_aarch64),y) LUVI_TARGET_ARCH = arm64 +else ifeq ($(BR2_aarch64_be),y) +LUVI_TARGET_ARCH = arm64be else ifeq ($(BR2_mips),y) LUVI_TARGET_ARCH = mips else ifeq ($(BR2_mipsel),y) diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index cc740dd40c62..5d19f78b8adb 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LVM2 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # needs fork() depends on !BR2_STATIC_LIBS # It fails to build statically - select BR2_PACKAGE_LIBAIO help This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM supports enterprise level volume management of disk and @@ -29,6 +28,7 @@ config BR2_PACKAGE_LVM2_STANDARD_INSTALL default y # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBAIO help Install the standard suite of lvm2 programs. When this option is not set, only dmsetup is installed. diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 9caf99eb9b9a..810d668ec206 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) @@ -25,7 +25,7 @@ LVM2_CONF_OPTS += \ --disable-nls \ --with-symvers=no -LVM2_DEPENDENCIES += host-pkgconf libaio +LVM2_DEPENDENCIES += host-pkgconf # LVM2 uses autoconf, but not automake, and the build system does not # take into account the toolchain passed at configure time. @@ -49,6 +49,7 @@ LVM2_CONF_OPTS += --disable-selinux endif ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y) +LVM2_DEPENDENCIES += libaio LVM2_INSTALL_STAGING_OPTS += install LVM2_INSTALL_TARGET_OPTS += install ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2dd983a3611c..8b3365ddfc81 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz +sha256 2693a4c654dcfdafb3aa95c262051d8122afa1b6f5cef1920221ebbdee934d07 lxc-5.0.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 4a4d3a621231..b2afb978e673 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.2 +LXC_VERSION = 5.0.3 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 3f62f4f5b76e..b441eacef783 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -53,6 +53,8 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" +LYNX_CONF_ENV = \ + LDFLAGS="$(TARGET_LDFLAGS) $(LYNX_LIBS)" \ + CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index e1a78bd7d7af..91ee44ab5f4a 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -15,6 +15,14 @@ MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES) # Also 0003-configure-ac-use-pkg-config-to-find-id3tag.patch MADPLAY_AUTORECONF = YES +# madplay uses libmad which has some assembly function that is not present in +# Thumb mode: +# Error: selected processor does not support `smull r8,r9,r2,r4' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MADPLAY_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index 5d32c1af8a5e..de3b6e69f05b 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 761e3f000b4c546cbd35baf34f5a0d1090f048dd44ee543773674192fd95f6b3 mali-driver-87c13e6994b20b5068e3a5e4f4c1b64db666a4c8.tar.gz +sha256 763d3cf76eb03584df6a13986a2877dc0ae5f310fc3d91e8a498fc5f89271dcc mali-driver-c90627f78d58567a2acb7cbf77d565e03a131294.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index bdc9fedeb4e4..8e059fe8bdab 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = 87c13e6994b20b5068e3a5e4f4c1b64db666a4c8 +MALI_DRIVER_VERSION = c90627f78d58567a2acb7cbf77d565e03a131294 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index fd3e6e66079b..000000000000 --- a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 Jan 2023 19:12:05 +0100 -Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: -/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': -/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} - 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MariaDB/server/pull/2435] ---- - include/ssl_compat.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/ssl_compat.h b/include/ssl_compat.h -index 664f3aac87c..3678e5fa084 100644 ---- a/include/ssl_compat.h -+++ b/include/ssl_compat.h -@@ -19,7 +19,8 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() --- -2.39.0 - diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index c4064cff66f4..fd73cca4f3bb 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.3.36 -sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.6 +sha512 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a mariadb-10.11.6.tar.gz # Hash for license files -sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md +sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 5fb88762787f..7f3755892aaa 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.36 +MARIADB_VERSION = 10.11.6 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text @@ -18,12 +18,18 @@ MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ + fmt \ ncurses \ openssl \ + pcre2 \ zlib \ libaio \ libxml2 +MARIADB_CONF_OPTS += \ + -DWITH_FMT=system \ + -DWITH_PCRE=system + # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ MARIADB_CONF_OPTS += -DWITH_READLINE=ON @@ -66,6 +72,13 @@ MARIADB_CONF_OPTS += \ -DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)" endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MARIADB_DEPENDENCIES += systemd +MARIADB_CONF_OPTS += -DWITH_SYSTEMD=yes +else +MARIADB_CONF_OPTS += -DWITH_SYSTEMD=no +endif + ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y) MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service index 537430e9a21e..9433e14630f7 100644 --- a/package/mariadb/mysqld.service +++ b/package/mariadb/mysqld.service @@ -9,6 +9,8 @@ Restart=always User=mysql RuntimeDirectory=mysql RuntimeDirectoryMode=0755 +Type=notify +NotifyAccess=all [Install] WantedBy=multi-user.target diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 5e09f4e6ceeb..2ba9c8f5689b 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -15,6 +15,14 @@ MATIO_INSTALL_STAGING = YES # va_copy() MATIO_CONF_ENV = ac_cv_va_copy=yes +MATIO_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) +MATIO_CFLAGS += -O0 +endif + +MATIO_CONF_ENV += CFLAGS="$(MATIO_CFLAGS)" + # mat73 require hdf5 (not available), extented-sparse take 2KB MATIO_CONF_OPTS = --disable-mat73 --enable-extended-sparse diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 876cd7b77e4f..3ec151a85990 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.2: -sha256 bc55232bf71fd66045122ba9050a29ea7cb2e8f99b064a9e6334a82f715881a0 mbedtls-2.28.2.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: +sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 7a605ac5b1c5..cdb4aef4f4c6 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.2 +MBEDTLS_VERSION = 2.28.7 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -12,7 +12,7 @@ MBEDTLS_CONF_OPTS = \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 +MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0+ MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 0a2eb4e5bd3e..ef518cd23876 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -9,6 +9,7 @@ MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING +MDADM_CPE_ID_VENDOR = mdadm_project MDADM_CXFLAGS = $(TARGET_CFLAGS) @@ -21,12 +22,15 @@ MDADM_BUILD_OPTS = \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 +MDADM_INSTALL_TARGET_OPTS = install-bin + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) MDADM_DEPENDENCIES += udev +MDADM_INSTALL_TARGET_OPTS += install-udev else MDADM_CXFLAGS += -DNO_LIBUDEV endif @@ -36,7 +40,7 @@ define MDADM_BUILD_CMDS endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) $(MDADM_INSTALL_TARGET_OPTS) endef $(eval $(generic-package)) diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in index 237f4454cc19..790c9c534a82 100644 --- a/package/mdio-tools/Config.in +++ b/package/mdio-tools/Config.in @@ -14,4 +14,6 @@ config BR2_PACKAGE_MDIO_TOOLS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 select BR2_PACKAGE_LIBMNL help - Low-level debug tools for MDIO devices + Low-level debug tools for MDIO devices. + + https://github.com/wkz/mdio-tools diff --git a/package/memcached/0001-logger.c-initialize-rport.patch b/package/memcached/0001-logger.c-initialize-rport.patch index 5fb13d5eee45..002a6896018e 100644 --- a/package/memcached/0001-logger.c-initialize-rport.patch +++ b/package/memcached/0001-logger.c-initialize-rport.patch @@ -23,7 +23,7 @@ Fixes: - http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2 Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +Upstream: https://github.com/memcached/memcached/pull/1077 --- logger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch deleted file mode 100644 index a7d0dfdd0016..000000000000 --- a/package/memcached/0002-check-for-sys-auxv.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 58b6de2135c10b64918f25c48f69f144d08a9c0d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 3 Jun 2022 19:10:15 +0200 -Subject: [PATCH] check for sys/auxv.h - -Check for sys/auxv.h to avoid the following uclibc build failure on -aarch64: - -crc32c.c:277:10: fatal error: sys/auxv.h: No such file or directory - 277 | #include - | ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/08591fbf9677ff126492c50c15170c641bcab56a - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - configure.ac | 1 + - crc32c.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0985f07..3337fe7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -516,6 +516,7 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H - #include - #endif - ]) -+AC_CHECK_HEADERS([sys/auxv.h]) - - dnl ********************************************************************** - dnl Figure out if this system has the stupid sasl_callback_ft -diff --git a/crc32c.c b/crc32c.c -index 26df879..05e61ff 100644 ---- a/crc32c.c -+++ b/crc32c.c -@@ -273,7 +273,7 @@ void crc32c_init(void) { - } - - #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) --#if defined(__linux__) -+#if defined(__linux__) && defined(HAVE_SYS_AUX_H) - #include - #elif defined(__APPLE__) - #include --- -2.35.1 - diff --git a/package/memcached/0002-fix-build-on-uclibc-ng.patch b/package/memcached/0002-fix-build-on-uclibc-ng.patch new file mode 100644 index 000000000000..a5af7a2adbdc --- /dev/null +++ b/package/memcached/0002-fix-build-on-uclibc-ng.patch @@ -0,0 +1,64 @@ +From c84e5e55e0e9e793849f721d30979242ed6a6ee3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 1 Oct 2023 14:12:38 +0200 +Subject: [PATCH] fix build on uclibc-ng + +Fix the following build failure with uclibc-ng raised since version +1.6.18 and +https://github.com/memcached/memcached/commit/875371a75cbf1f92350de2d1fa0fae4a35ed572b: + +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: memcached-thread.o: in function `thread_setname': +thread.c:(.text+0xea2): undefined reference to `pthread_setname_np' + +Fixes: + - http://autobuild.buildroot.org/results/e856d381f5ec7d2727f21c8bd46dacb456984416 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent yet (waiting feedback on first patch) +--- + configure.ac | 1 + + extstore.c | 2 +- + thread.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d94f6fb..5ec5088 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -686,6 +686,7 @@ AC_CHECK_FUNCS(clock_gettime) + AC_CHECK_FUNCS(preadv) + AC_CHECK_FUNCS(pread) + AC_CHECK_FUNCS(eventfd) ++AC_CHECK_FUNCS([pthread_setname_np],[AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Define to 1 if support pthread_setname_np])]) + AC_CHECK_FUNCS([accept4], [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if support accept4])]) + AC_CHECK_FUNCS([getopt_long], [AC_DEFINE(HAVE_GETOPT_LONG, 1, [Define to 1 if support getopt_long])]) + +diff --git a/extstore.c b/extstore.c +index b079465..f6a6180 100644 +--- a/extstore.c ++++ b/extstore.c +@@ -119,7 +119,7 @@ struct store_engine { + #define THR_NAME_MAXLEN 16 + static void thread_setname(pthread_t thread, const char *name) { + assert(strlen(name) < THR_NAME_MAXLEN); +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP) + pthread_setname_np(thread, name); + #endif + } +diff --git a/thread.c b/thread.c +index ee120fa..76651c2 100644 +--- a/thread.c ++++ b/thread.c +@@ -635,7 +635,7 @@ static void thread_libevent_process(evutil_socket_t fd, short which, void *arg) + #define THR_NAME_MAXLEN 16 + void thread_setname(pthread_t thread, const char *name) { + assert(strlen(name) < THR_NAME_MAXLEN); +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP) + pthread_setname_np(thread, name); + #endif + } +-- +2.40.1 + diff --git a/package/memcached/0003-configure.ac-add-disable-werror.patch b/package/memcached/0003-configure.ac-add-disable-werror.patch deleted file mode 100644 index dab9b8835dcf..000000000000 --- a/package/memcached/0003-configure.ac-add-disable-werror.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8497f7ed38146378a988bc22800b3a5eba38b0fd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 13 Jun 2022 16:29:38 +0200 -Subject: [PATCH] configure.ac: add --disable-werror - -Allow the user to disable -Werror to avoid the following build failure: - -In file included from hash.c:7: -xxhash.h:2667:5: error: #warning is a GCC extension [-Werror] - 2667 | # warning "XXH3 is highly inefficient without ARM or Thumb-2." - | ^~~~~~~ -xxhash.h:2667:5: error: #warning "XXH3 is highly inefficient without ARM or Thumb-2." [-Werror=cpp] - -Fixes: - - http://autobuild.buildroot.org/results/3124bae73c207f1a118e57e41e222ef464ccb297 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/memcached/memcached/pull/926] ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3337fe7..7683b8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,6 +114,9 @@ AC_ARG_ENABLE(static, - AC_ARG_ENABLE(unix_socket, - [AS_HELP_STRING([--disable-unix-socket], [Disable unix domain socket])]) - -+AC_ARG_ENABLE(werror, -+ [AS_HELP_STRING([--disable-werror], [Disable -Werror])]) -+ - dnl ********************************************************************** - dnl DETECT_SASL_CB_GETCONF - dnl -@@ -783,6 +786,10 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS], - [test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"]) - - -+if test "x$enable_werror" != "xno"; then -+ CFLAGS="$CFLAGS -Werror" -+fi -+ - dnl Let the compiler be a bit more picky. Please note that you cannot - dnl specify these flags to the compiler before AC_CHECK_FUNCS, because - dnl the test program will generate a compilation warning and hence fail -@@ -790,12 +797,12 @@ dnl to detect the function ;-) - if test "$ICC" = "yes" - then - dnl ICC trying to be gcc. -- CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror" -+ CFLAGS="$CFLAGS -diag-disable 187 -Wall" - AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined]) - elif test "$GCC" = "yes" - then - GCC_VERSION=`$CC -dumpversion` -- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" -+ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" - if test "x$enable_asan" = "xyes"; then - CFLAGS="$CFLAGS -fsanitize=address" - fi --- -2.35.1 - diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 78875dde662b..bd2072df0b87 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 -sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz +# From http://www.memcached.org/files/memcached-1.6.22.tar.gz.sha1 +sha1 7a691f390d59616dbebfc9e2e4942d499c39a338 memcached-1.6.22.tar.gz # Locally computed -sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz +sha256 34783a90a4ccf74c4107085fd92b688749d23b276cfdad9f04e4f725a05d1ca7 memcached-1.6.22.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 7183da6c14e6..05ae69eb3294 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.17 +MEMCACHED_VERSION = 1.6.22 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 724295f78481..ee1398244b9c 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -7,6 +7,7 @@ MENDER_VERSION = 3.4.0 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 +MENDER_CPE_ID_VENDOR = northern.tech # Vendor license paths generated with: # awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index b716cf579918..7848bb6faf6f 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL @@ -10,3 +11,8 @@ config BR2_PACKAGE_MESA3D_DEMOS OpenGL demos from the Mesa 3D project. http://mesa3d.org + +comment "mesa3d-demos needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ + || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch new file mode 100644 index 000000000000..c011580f6b32 --- /dev/null +++ b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch @@ -0,0 +1,68 @@ +From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Tue, 17 Aug 2021 11:54:49 +0200 +Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 + syscall SYS_kcmp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://man7.org/linux/man-pages/man2/kcmp.2.html + +The kcmp() system call first appeared in Linux 3.5. + +But was probably also not supported by all major platforms +at that time. So fallback to the check that is done for windows. + +Signed-off-by: Thomas Devoogdt +Acked-by: Yonggang Luo +Acked-by: Michel Dänzer +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 +Signed-off-by: Thomas Devoogdt +--- + src/util/os_file.c | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/src/util/os_file.c b/src/util/os_file.c +index 5fb30f2d908..464425a9b87 100644 +--- a/src/util/os_file.c ++++ b/src/util/os_file.c +@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) + /* copied from */ + #define KCMP_FILE 0 + ++#endif ++ + int + os_same_file_description(int fd1, int fd2) + { ++#ifdef SYS_kcmp + pid_t pid = getpid(); ++#endif + + /* Same file descriptor trivially implies same file description */ + if (fd1 == fd2) + return 0; + ++#ifdef SYS_kcmp + return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); +-} +- + #else +- +-int +-os_same_file_description(int fd1, int fd2) +-{ +- /* Same file descriptor trivially implies same file description */ +- if (fd1 == fd2) +- return 0; +- + /* Otherwise we can't tell */ + return -1; +-} +- + #endif ++} +-- +2.34.1 + diff --git a/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch new file mode 100644 index 000000000000..6831bdafd363 --- /dev/null +++ b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch @@ -0,0 +1,46 @@ +From cd861b7f38e448822ce765aee61304d1e0a3a8b5 Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 13 Apr 2023 16:38:51 -0400 +Subject: meson: ensure i915 Gallium driver includes Intel sources + +Ensure builds flag the use of Intel sources when the i915 Gallium driver +is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if +other Intel-based configuration options are not enabled: + + ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common". + +Signed-off-by: James Knight +Part-of: + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cd861b7f38e448822ce765aee61304d1e0a3a8b5 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +(limited to 'meson.build') + +diff --git a/meson.build b/meson.build +index 23d2d965b37..a3e3c5478a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') + with_any_vk = _vulkan_drivers.length() != 0 + + with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk +-with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools ++with_any_intel = [ ++ with_gallium_crocus, ++ with_gallium_i915, ++ with_gallium_iris, ++ with_intel_hasvk, ++ with_intel_tools, ++ with_intel_vk, ++].contains(true) + + if with_swrast_vk and not with_gallium_softpipe + error('swrast vulkan requires gallium swrast') +-- +cgit v1.2.1 + diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index cae2161aa342..e21bbbe3e4a3 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND @@ -24,7 +24,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -33,10 +32,9 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_HOST_GCC_AT_LEAST_5 @@ -393,11 +391,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL endif # BR2_PACKAGE_MESA3D -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" +comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "mesa3d needs a toolchain w/ gcc >= 7" - depends on BR2_m68k - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b5dc47279d99..30161c8b7014 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_MICROPYTHON bool "micropython" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI help Micro Python is a lean and fast implementation of the Python 3 programming language that is optimised to run on a diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index 7bff7de4e254..43551866b9ef 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c980ad7e742491df0dc10db2958137dbbf9aa7a8009e102fc75f4c0cac2d6b5e micropython-1.19.1.tar.gz -sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE +sha256 a042764f0b6f6d92b267454c5bd5afcb83fc3900119f2583672aac571e661924 micropython-1.22.0.tar.xz +sha256 d9e0e0395867c899090e150213bc2b417e970c17355a8d48300089875b3c8037 LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 51b45e5e99d7..37c148da9413 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,19 +4,16 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.19.1 -MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) +MICROPYTHON_VERSION = 1.22.0 +MICROPYTHON_SITE = https://micropython.org/resources/source +MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, # and most of the copied code is not used in the unix build. MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 - -# Set GIT_DIR so package won't use buildroot's version number -MICROPYTHON_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - GIT_DIR=. +MICROPYTHON_DEPENDENCIES = host-python3 +MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't # have explicit support. @@ -36,16 +33,24 @@ MICROPYTHON_MAKE_OPTS += \ MICROPY_PY_USSL=0 \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MICROPYTHON_DEPENDENCIES += host-pkgconf libffi +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1 +else +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 +endif + define MICROPYTHON_BUILD_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=/usr \ diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index e55e5473d3d0..b78dd5b4ddab 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.2/ -sha1 71750adadc34490d52f0b9a930c2731a47f9772d minidlna-1.3.2.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.3/ +sha1 2d42028d2ca5ae04affdb96cb414314867e179ea minidlna-1.3.3.tar.gz # Locally computed -sha256 222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0 minidlna-1.3.2.tar.gz +sha256 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 minidlna-1.3.3.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 6ca72d924083..1609695ebff5 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.3.2 +MINIDLNA_VERSION = 1.3.3 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 diff --git a/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch b/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch new file mode 100644 index 000000000000..f4eacc7fdc71 --- /dev/null +++ b/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch @@ -0,0 +1,39 @@ +From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001 +From: Hans Wennborg +Date: Fri, 18 Aug 2023 11:05:33 +0200 +Subject: [PATCH] Reject overflows of zip header fields in minizip. + +This checks the lengths of the file name, extra field, and comment +that would be put in the zip headers, and rejects them if they are +too long. They are each limited to 65535 bytes in length by the zip +format. This also avoids possible buffer overflows if the provided +fields are too long. + +Upstream: https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c +Signed-off-by: Fabrice Fontaine +--- + contrib/minizip/zip.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c +index 3d3d4cadd..0446109b2 100644 +--- a/contrib/minizip/zip.c ++++ b/contrib/minizip/zip.c +@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c + return ZIP_PARAMERROR; + #endif + ++ // The filename and comment length must fit in 16 bits. ++ if ((filename!=NULL) && (strlen(filename)>0xffff)) ++ return ZIP_PARAMERROR; ++ if ((comment!=NULL) && (strlen(comment)>0xffff)) ++ return ZIP_PARAMERROR; ++ // The extra field length must fit in 16 bits. If the member also requires ++ // a Zip64 extra block, that will also need to fit within that 16-bit ++ // length, but that will be checked for later. ++ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff)) ++ return ZIP_PARAMERROR; ++ + zi = (zip64_internal*)file; + + if (zi->in_opened_file_inzip == 1) diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash index df5e8d723a12..23bfda84749f 100644 --- a/package/minizip-zlib/minizip-zlib.hash +++ b/package/minizip-zlib/minizip-zlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz +sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk index 4367a2420f65..81fee3c687a6 100644 --- a/package/minizip-zlib/minizip-zlib.mk +++ b/package/minizip-zlib/minizip-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_ZLIB_VERSION = 1.2.13 +MINIZIP_ZLIB_VERSION = 1.3 MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz MINIZIP_ZLIB_SITE = http://www.zlib.net MINIZIP_ZLIB_LICENSE = Zlib @@ -16,5 +16,7 @@ MINIZIP_ZLIB_AUTORECONF = YES MINIZIP_ZLIB_DEPENDENCIES = zlib # demos must be disabled to avoid a conflict with BR2_PACKAGE_MINIZIP_DEMOS MINIZIP_ZLIB_CONF_OPTS = --disable-demos +# 0001-Reject-overflows-of-zip-header-fields-in-minizip.patch +MINIZIP_ZLIB_IGNORE_CVES += CVE-2023-45853 $(eval $(autotools-package)) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index c74c0df8d1c6..858750875289 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 11d8ac7ebc19..6972a5f8a649 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_MOARVM depends on BR2_USE_MMU # libuv depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBTOMMATH select BR2_PACKAGE_LIBATOMIC_OPS @@ -18,8 +19,9 @@ config BR2_PACKAGE_MOARVM http://moarvm.com -comment "moarvm needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "moarvm needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index ef927636d992..f7922d7e8f13 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz +sha256 1efa1c54b299c463c1b039d3df8ba1c68e70fe4de608fd14653fcebf9f27837b moby-buildkit-0.11.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index a25f676710eb..91560c1ed1db 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.11.2 +MOBY_BUILDKIT_VERSION = 0.11.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 2cfd0d94224e..453c1934dd1f 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.15.tar.gz.asc -sha256 4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6 mosquitto-2.0.15.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.18.tar.gz.asc +sha256 d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a mosquitto-2.0.18.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index a95a2cac4dc3..b847e56fec53 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.15 +MOSQUITTO_VERSION = 2.0.18 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 diff --git a/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch b/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch new file mode 100644 index 000000000000..a1536a7d2f93 --- /dev/null +++ b/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch @@ -0,0 +1,26 @@ +From 40ecd71ff361442f1579089481619dd7cae90ffd Mon Sep 17 00:00:00 2001 +From: Piotr Mionskowski +Date: Sun, 9 Jul 2023 01:44:49 +0200 +Subject: [PATCH] Include libwebp when WEBP is enabled + +Upstream: https://github.com/Motion-Project/motion/commit/40ecd71ff361442f1579089481619dd7cae90ffd +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ce588f65..ee45ac37 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,8 +191,8 @@ AS_IF([test "${WEBP}" = "yes" ], [ + AS_IF([pkg-config libwebpmux ], [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around]) +- TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux` +- TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux` ++ TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp` ++ TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp` + ],[ + AC_MSG_RESULT(no) + ] diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index d3f024365043..4605ee6b0d73 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 033185c17bf3c5fdd94020c95f8325be2e5356558e3913c3d6547a85dd61f7f1 mp4v2-2.1.3.tar.bz2 sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 7de837c170ed..ae777cdc75a7 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 2.1.1 +MP4V2_VERSION = 2.1.3 MP4V2_SITE = \ https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8f0af7b2d36b..902a3da77951 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. @@ -407,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL help diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 2521238f64df..4ee496755668 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz +sha256 85b9a67426d528ae9fb849eb3b10faf52d4b18d22b1fd71088e6d9a388b509d2 mpd-0.23.14.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6c25c9b46f93..4dbd7a6d1dc3 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).12 +MPD_VERSION = $(MPD_VERSION_MAJOR).14 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt @@ -29,6 +29,13 @@ else MPD_CONF_OPTS += -Dzeroconf=disabled endif +ifeq ($(BR2_PACKAGE_EXPAT),y) +MPD_DEPENDENCIES += expat +MPD_CONF_OPTS += -Dexpat=enabled +else +MPD_CONF_OPTS += -Dexpat=disabled +endif + # MPD prefers libicu for utf8 collation instead of libglib2. ifeq ($(BR2_PACKAGE_ICU),y) MPD_DEPENDENCIES += icu @@ -37,6 +44,13 @@ else MPD_CONF_OPTS += -Dicu=disabled endif +ifeq ($(BR2_PACKAGE_YAJL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dyajl=enabled +else +MPD_CONF_OPTS += -Dyajl=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib MPD_CONF_OPTS += -Dalsa=enabled @@ -190,7 +204,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -204,7 +218,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled @@ -251,7 +265,7 @@ MPD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) -MPD_DEPENDENCIES += libgcrypt yajl +MPD_DEPENDENCIES += libgcrypt MPD_CONF_OPTS += -Dqobuz=enabled else MPD_CONF_OPTS += -Dqobuz=disabled @@ -272,7 +286,6 @@ MPD_CONF_OPTS += -Dsidplay=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled else MPD_CONF_OPTS += -Dsoundcloud=disabled @@ -285,8 +298,10 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif -ifneq ($(BR2_PACKAGE_MPD_TCP),y) +ifeq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true +else +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) @@ -305,7 +320,6 @@ endif ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) MPD_DEPENDENCIES += \ - expat \ libupnp MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502be9..c0c8c046469f 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 91f704d30cd9..5dbd760aa1f8 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -36,4 +36,8 @@ ifeq ($(BR2_powerpc64le),y) MPIR_CONF_ENV += MPN_PATH="generic" endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MPIR_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(autotools-package)) diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch new file mode 100644 index 000000000000..95f2f86666d0 --- /dev/null +++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch @@ -0,0 +1,70 @@ +From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Mon, 24 Apr 2023 17:27:35 +0200 +Subject: [PATCH] Add missing limits.h include for UINT_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' +header. + +In some configurations that build with zlib from [1], by chance +limits.h gets indirectly included when including 'z-imp.h' (the +includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so +the build succeeds. + +When using other zlib implementations however (for example from [2]), +limits.h is not necessarily included indirectly, which leads to the +build failing in the following way: + +source/fitz/encode-basic.c: In function 'deflate_write': +source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) + 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); + | ^~~~~~~~ +source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? + +Add the missing include, so that the build succeeds no matter if zlib +indirectly includes 'limit.h' or not. + +Similarly, also add it in output-ps.c where it's also missing. + +[1]: https://zlib.net/ +[2]: https://github.com/zlib-ng/zlib-ng + +Signed-off-by: Raphaël Mélotte +Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 +--- + source/fitz/encode-basic.c | 2 ++ + source/fitz/output-ps.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c +index 03a4ff76b..84f0c35e6 100644 +--- a/source/fitz/encode-basic.c ++++ b/source/fitz/encode-basic.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + struct ahx + { + fz_output *chain; +diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c +index ef22c3cd6..3dc8ea17d 100644 +--- a/source/fitz/output-ps.c ++++ b/source/fitz/output-ps.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + typedef struct ps_band_writer_s + { + fz_band_writer super; +-- +2.39.1 + diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index d6cc407c49fe..4c35ba500eff 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -22,12 +22,6 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -# 0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch -MUPDF_IGNORE_CVES += CVE-2021-3407 - -# 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch -MUPDF_IGNORE_CVES += CVE-2021-37220 - # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index fc66c684a522..e25ac6df1dc9 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -4,9 +4,9 @@ # ################################################################################ -MUSEPACK_VERSION = r475 +MUSEPACK_VERSION = 475 MUSEPACK_SITE = http://files.musepack.net/source -MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz +MUSEPACK_SOURCE = musepack_src_r$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES MUSEPACK_MAKE = $(MAKE1) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index c475641ab528..8c4aae3c1c9e 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fa531b231d58fe1f30ceda0ed626683ea9ebdfb76ce47ef8bb27c2f77422cffb mutt-2.2.9.tar.gz +sha256 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 mutt-2.2.12.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 5cf1b6bad22d..2fe7b92b38bc 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.9 +MUTT_VERSION = 2.2.12 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -40,7 +40,11 @@ MUTT_CONF_OPTS += \ # Force the path to "gpgrt-config" (from the libgpg-error package) to # avoid using the one on host, if present. -MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config +MUTT_GPGRT_CONFIG = $(STAGING_DIR)/usr/bin/gpgrt-config +ifeq ($(BR2_STATIC_LIBS),y) +MUTT_GPGRT_CONFIG += --static +endif +MUTT_CONF_ENV += GPGRT_CONFIG="$(MUTT_GPGRT_CONFIG)" else MUTT_CONF_OPTS += --disable-gpgme endif diff --git a/package/mxsldr/mxsldr.hash b/package/mxsldr/mxsldr.hash new file mode 100644 index 000000000000..c2a7b4ad6485 --- /dev/null +++ b/package/mxsldr/mxsldr.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8ef7b7abb8d17c879e70b2c3911df8c5ce97f38779fa65d40be7f34febba55e1 mxsldr-2793a657ab7a22487d21c1b020957806f8ae8383-br1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mysql/Config.in b/package/mysql/Config.in index ef4a9531a775..8942e55a455e 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -16,12 +16,16 @@ choice config BR2_PACKAGE_MARIADB bool "mariadb" + depends on BR2_INSTALL_LIBSTDCPP # fmt depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_HAS_MYSQL help MariaDB is one of the most popular database servers in the @@ -30,8 +34,9 @@ config BR2_PACKAGE_MARIADB http://www.mariadb.org/ -comment "mariadb needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_PACKAGE_ORACLE_MYSQL diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 8a2003b92a66..8b93527becc5 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -34,7 +34,7 @@ ifeq ($(BR2_PACKAGE_FILE),y) NANO_DEPENDENCIES += file NANO_CONF_OPTS += --enable-libmagic --enable-color --enable-nanorc else -NANO_CONF_OPTS += --disable-libmagic --disable-libmagic --disable-color +NANO_CONF_OPTS += --disable-libmagic --disable-color --disable-nanorc endif # BR2_PACKAGE_FILE endif # BR2_PACKAGE_NANO_TINY diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c96bf77bce58..a5f83c8725d2 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz +sha256 004603a9b3ec51599ef0a0089482004ee3d33b0240d87ce17b6f77525b51fb4e ncurses-6.4-20230429.tar.gz # Locally computed -sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING +sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 73e3c3feb855..4753da299c34 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -5,8 +5,8 @@ ################################################################################ # When there is no snapshost yet for a new version, set it to the empty string -NCURSES_VERSION_MAJOR = 6.3 -NCURSES_SNAPSHOT_DATE = 20221224 +NCURSES_VERSION_MAJOR = 6.4 +NCURSES_SNAPSHOT_DATE = 20230429 NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) @@ -15,12 +15,9 @@ NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR) +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),.$(NCURSES_SNAPSHOT_DATE)) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# Fixed since snapshot 20220416 -NCURSES_IGNORE_CVES += CVE-2022-29458 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk index 39466055568f..ce0f7e7b7750 100644 --- a/package/ne10/ne10.mk +++ b/package/ne10/ne10.mk @@ -42,8 +42,10 @@ define NE10_INSTALL_STAGING_CMDS $(NE10_INSTALL_STAGING_SHARED_LIB) endef +ifeq ($(BR2_STATIC_LIBS),) define NE10_INSTALL_TARGET_CMDS cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/ endef +endif $(eval $(cmake-package)) diff --git a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch b/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 02088bfe023c..000000000000 --- a/package/neon/0001-Revert-Advertise-TS_SSL-feature-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 31 Jan 2022 23:42:13 +0100 -Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0." - -This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d. - -Indeed openssl can be built on toolchains without threads support which -will result in the following build failure: - -ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory - 43 | #include - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/notroj/neon/pull/71] ---- - macros/neon.m4 | 15 ++++----------- - src/ne_openssl.c | 4 ++-- - 2 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/macros/neon.m4 b/macros/neon.m4 -index 129d4ac..5a5fb1b 100644 ---- a/macros/neon.m4 -+++ b/macros/neon.m4 -@@ -960,13 +960,9 @@ yes|openssl) - AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, - [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) - -+ # Enable EGD support if using 0.9.7 or newer - NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L) -- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L) -- if test "$ne_cv_lib_ssl110" = "yes"; then -- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) -- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support]) -- elif test "$ne_cv_lib_ssl097" = "yes"; then -- # Enable EGD support if using 0.9.7 or newer -+ if test "$ne_cv_lib_ssl097" = "yes"; then - AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon]) - NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION]) - NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp) -@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces - available]),, - enable_threadsafe_ssl=no) - --case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in --*Xyes) -- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe]) -- ;; --posixX*|yesX*) -+case $enable_threadsafe_ssl in -+posix|yes) - ne_pthr_ok=yes - AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no]) - if test "${ne_pthr_ok}" = "no"; then -diff --git a/src/ne_openssl.c b/src/ne_openssl.c -index 41a5c05..96c768e 100644 ---- a/src/ne_openssl.c -+++ b/src/ne_openssl.c -@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap) - return ne__strhash2hex(v, vlen, flags); - } - --#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L --/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */ -+#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L -+/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */ - #define WITH_OPENSSL_LOCKING (1) - - /* Implementation of locking callbacks to make OpenSSL thread-safe. --- -2.34.1 - diff --git a/package/neon/0002-configure.ac-fix-autoreconf.patch b/package/neon/0002-configure.ac-fix-autoreconf.patch deleted file mode 100644 index cd63d1ed412c..000000000000 --- a/package/neon/0002-configure.ac-fix-autoreconf.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 8 Feb 2022 18:34:25 +0100 -Subject: [PATCH] configure.ac: fix autoreconf - -Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 37b14ec..122151d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,7 @@ - AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING - -+AC_CONFIG_MACRO_DIR(macros) -+ - dnl Extract the version (sans LF) from .version, created at release-time. - m4_define(ne_version, [m4_translit(m4_include(.version), [ - ])]) --- -2.34.1 - diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 1ce8f1ff16f9..96ee6087808c 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,8 +10,6 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES -# We're patching configure.ac -NEON_AUTORECONF = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) diff --git a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch deleted file mode 100644 index 01d577659631..000000000000 --- a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 22:32:44 +0100 -Subject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var). - -LD_LIBRARY_PATH should not be set when cross-compiling, because it -adds the cross-libraries to the build's LD-path. - -Also the restoring of LD_LIBRARY_PATH was done incorrectly: it would -set LD_LIBRARY_PATH=LD_LIBRARY_PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - macros/db3-check.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 902220b..d5a5446 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then - savedldflags="$LDFLAGS" - savedcppflags="$CPPFLAGS" - savedlibs="$LIBS" -- saved_shlibpath_var=$shlibpath_var -+ eval saved_shlibpath_var=\$$shlibpath_var - - dnl required BDB version: 4.6, because of cursor API change - DB_MAJOR_REQ=4 -@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - -@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then - CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" - LDFLAGS="-L$bdblibdir $LDFLAGS" - -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - --- diff --git a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch deleted file mode 100644 index 05913862f663..000000000000 --- a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch +++ /dev/null @@ -1,43 +0,0 @@ -From 58ddc137021a938f37c3794305a839f8df449d3f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 5 Apr 2022 23:59:15 +0200 -Subject: [PATCH] etc/uams/openssl_compat.h: fix build with libressl >= 2.7.0 - -Fix the following build failure with libressl >= 2.7.0 which added -DH_set0_pqg with -https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf: - -In file included from uams_dhx_passwd.c:35: -openssl_compat.h:15:19: error: static declaration of 'DH_set0_pqg' follows non-static declaration - 15 | inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) - | ^~~~~~~~~~~ -In file included from uams_dhx_passwd.c:33: -/home/autobuild/autobuild/instance-2/output-1/host/mips64-buildroot-linux-uclibc/sysroot/usr/include/openssl/dh.h:195:5: note: previous declaration of 'DH_set0_pqg' was here - 195 | int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/fc6e308f346570f8198542602bc8c1bdd0a4869e - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - etc/uams/openssl_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/uams/openssl_compat.h b/etc/uams/openssl_compat.h -index ded377bc..5cc8de34 100644 ---- a/etc/uams/openssl_compat.h -+++ b/etc/uams/openssl_compat.h -@@ -11,7 +11,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - #ifndef OPENSSL_COMPAT_H - #define OPENSSL_COMPAT_H - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) - { - /* If the fields p and g in d are NULL, the corresponding input --- -2.35.1 - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6dead5457c27..9ab5d604a845 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/ -md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2 -sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 7cc950beb66d..53cd53876ada 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,17 +4,15 @@ # ################################################################################ -NETATALK_VERSION = 3.1.13 -NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) -NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 -# For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -NETATALK_AUTORECONF = YES +NETATALK_VERSION = 3.1.18 +NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) +NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ diff --git a/package/netdata/Config.in b/package/netdata/Config.in index 34d139125d7a..d17b5e89aae8 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_NETDATA depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID @@ -35,7 +36,8 @@ comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" endif -comment "netdata needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "netdata needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch b/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch new file mode 100644 index 000000000000..3a6321d7a7b3 --- /dev/null +++ b/package/netsnmp/0001-snmp_agent-disallow-SET-with-NULL-varbind.patch @@ -0,0 +1,72 @@ +From b07627fa67c686b07d1eab123cf3e4887a2a93aa Mon Sep 17 00:00:00 2001 +From: Bill Fenner +Date: Fri, 25 Nov 2022 08:41:24 -0800 +Subject: [PATCH] snmp_agent: disallow SET with NULL varbind + +Upstream: https://github.com/net-snmp/net-snmp/commit/4589352dac3ae111c7621298cf231742209efd9b + +[Thomas: this commit was merged as part of +https://github.com/net-snmp/net-snmp/pull/490/commits, which fixes +https://github.com/net-snmp/net-snmp/issues/474 (CVE-2022-44792) and +https://github.com/net-snmp/net-snmp/issues/475 (CVE-2022-44793). The +other two commits merged as part of this pull request are related to +adding a non-regression test for this, which is not relevant for the +security fix itself.] + +Signed-off-by: Thomas Petazzoni +--- + agent/snmp_agent.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c +index 867d0c166f..3f678fe2df 100644 +--- a/agent/snmp_agent.c ++++ b/agent/snmp_agent.c +@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status) + return 1; + } + ++static int ++check_set_pdu_for_null_varbind(netsnmp_agent_session *asp) ++{ ++ int i; ++ netsnmp_variable_list *v = NULL; ++ ++ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) { ++ if (v->type == ASN_NULL) { ++ /* ++ * Protect SET implementations that do not protect themselves ++ * against wrong type. ++ */ ++ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i)); ++ asp->index = i; ++ return SNMP_ERR_WRONGTYPE; ++ } ++ } ++ return SNMP_ERR_NOERROR; ++} ++ + int + handle_pdu(netsnmp_agent_session *asp) + { + int status, inclusives = 0; + netsnmp_variable_list *v = NULL; + ++#ifndef NETSNMP_NO_WRITE_SUPPORT ++ /* ++ * Check for ASN_NULL in SET request ++ */ ++ if (asp->pdu->command == SNMP_MSG_SET) { ++ status = check_set_pdu_for_null_varbind(asp); ++ if (status != SNMP_ERR_NOERROR) { ++ return status; ++ } ++ } ++#endif /* NETSNMP_NO_WRITE_SUPPORT */ ++ + /* + * for illegal requests, mark all nodes as ASN_NULL + */ +-- +2.41.0 + diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 15bc318e36bf..fafd60487905 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -11,6 +11,10 @@ NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING NETSNMP_CPE_ID_VENDOR = net-snmp NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) +# 0001-snmp_agent-disallow-SET-with-NULL-varbind.patch +NETSNMP_IGNORE_CVES = \ + CVE-2022-44792 \ + CVE-2022-44793 NETSNMP_SELINUX_MODULES = snmp NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = \ @@ -40,6 +44,8 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config +# We're patching configure.d/config_project_types +NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index dd4dfbbe386b..01d5672e2336 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -6,7 +6,7 @@ NETTLE_VERSION = 3.8.1 NETTLE_SITE = https://ftp.gnu.org/gnu/nettle -NETTLE_DEPENDENCIES = gmp +NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 @@ -15,6 +15,8 @@ NETTLE_CPE_ID_VENDOR = nettle_project # with static linking NETTLE_CONF_OPTS = --disable-openssl +HOST_NETTLE_DEPENDENCIES = host-m4 host-gmp + # ARM assembly requires v6+ ISA ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) NETTLE_CONF_OPTS += --disable-assembler diff --git a/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch b/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch new file mode 100644 index 000000000000..8e25805d0c97 --- /dev/null +++ b/package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch @@ -0,0 +1,44 @@ +From abc6e1cf258ab332bed161036a358bbe9c2d1e90 Mon Sep 17 00:00:00 2001 +From: Tatsuyuki Ishi +Date: Fri, 13 Oct 2023 16:46:09 +0000 +Subject: [PATCH] connectivity: Make curl timeout callback non-repeating. + +This reverts commit 05c31da4d9. + +In the linked commit the callback was made repeating on the assumption +that forward progress would result in the callback getting canceled in +cb_data_complete. However, this assumption does not hold since a timeout +callback does not guarantee completion (or error out) of a request. + +curl tweaked some internals in v8.4.0 and started giving 0 timeouts, and +a repeating callback is firing back-to-back without making any progress +in doing so. + +Revert the change and make the callback non-repeating again. + +Fixes: 05c31da4d9cb ('connectivity: don't cancel curl timerfunction from timeout') +Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/abc6e1cf258ab332bed161036a358bbe9c2d1e90 +Signed-off-by: Christian Hitz +--- + src/core/nm-connectivity.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c +index 92de44f17d..d8b0004c38 100644 +--- a/src/core/nm-connectivity.c ++++ b/src/core/nm-connectivity.c +@@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data) + { + NMConnectivityCheckHandle *cb_data = user_data; + ++ cb_data->concheck.curl_timer = 0; + _con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0); + _complete_queued(cb_data->self); +- return G_SOURCE_CONTINUE; ++ return G_SOURCE_REMOVE; + } + + static int +-- +GitLab + diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 37c4a79d1610..57d7543131a5 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_USE_MMU # dbus depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - # Tested with 3.2, but may even work with earlier versions depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 8d172b72569a..833a3a38a2c2 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -13,5 +13,10 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html +# Legacy: this used to be handled in nftables.mk +if BR2_PACKAGE_NFTABLES +source "package/nftables/nftables-python/Config.in" +endif + comment "nftables needs a toolchain w/ wchar, headers >= 3.12" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package/nftables/nftables-python/Config.in b/package/nftables/nftables-python/Config.in new file mode 100644 index 000000000000..b16e2d0ad114 --- /dev/null +++ b/package/nftables/nftables-python/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_NFTABLES_PYTHON + bool "python bindings" + default y # legacy + depends on BR2_PACKAGE_PYTHON3 diff --git a/package/nftables/nftables-python/nftables-python.hash b/package/nftables/nftables-python/nftables-python.hash new file mode 120000 index 000000000000..9ac74580e7cc --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.hash @@ -0,0 +1 @@ +../nftables.hash \ No newline at end of file diff --git a/package/nftables/nftables-python/nftables-python.mk b/package/nftables/nftables-python/nftables-python.mk new file mode 100644 index 000000000000..908bacd99a26 --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# nftables-python +# +################################################################################ + +# The following assignments work only because nftables.mk is included before +# this file is. +NFTABLES_PYTHON_VERSION = $(NFTABLES_VERSION) +NFTABLES_PYTHON_SOURCE = $(NFTABLES_SOURCE) +NFTABLES_PYTHON_SITE = $(NFTABLES_SITE) +NFTABLES_PYTHON_LICENSE = $(NFTABLES_LICENSE) +NFTABLES_PYTHON_LICENSE_FILES = $(NFTABLES_LICENSE_FILES) + +# We share the same source code as nftables +NFTABLES_PYTHON_DL_SUBDIR = nftables + +NFTABLES_PYTHON_SUBDIR = py + +NFTABLES_PYTHON_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 5e5134b61d1b..7e1e856229f5 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 8d1b4b18393af43698d10baa25d2b9b6397969beecac7816c35dd0714e4de50a nftables-1.0.5.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 nftables-1.0.7.tar.xz +sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 9d60736d7f73..d31df8afa469 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,15 +4,21 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.5 -NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 +NFTABLES_VERSION = 1.0.7 +NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.xz NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING -NFTABLES_CONF_OPTS = --disable-debug --disable-man-doc --disable-pdf-doc NFTABLES_SELINUX_MODULES = iptables +# Python bindings are handled by package nftables-python +NFTABLES_CONF_OPTS = \ + --disable-debug \ + --disable-man-doc \ + --disable-pdf-doc \ + --disable-python + ifeq ($(BR2_PACKAGE_GMP),y) NFTABLES_DEPENDENCIES += gmp NFTABLES_CONF_OPTS += --without-mini-gmp @@ -42,13 +48,6 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) -NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += python3 -else -NFTABLES_CONF_OPTS += --disable-python -endif - NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" define NFTABLES_LINUX_CONFIG_FIXUPS @@ -58,3 +57,6 @@ define NFTABLES_LINUX_CONFIG_FIXUPS endef $(eval $(autotools-package)) + +# Legacy: we used to handle it in this .mk +include package/nftables/nftables-python/nftables-python.mk diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index 3702a91b5e36..18774d01d43f 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eacc6f0f8543583ecd659faf0a3f906ed03826f1d4157b536b4b385fe47c5bb8 nghttp2-1.41.0.tar.gz +sha256 9210b0113109f43be526ac5835d58a701411821a4d39e155c40d67c40f47a958 nghttp2-1.57.0.tar.xz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 9190fa30d60c..70a25d409cc2 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,8 @@ # ################################################################################ -NGHTTP2_VERSION = 1.41.0 +NGHTTP2_VERSION = 1.57.0 +NGHTTP2_SOURCE = nghttp2-$(NGHTTP2_VERSION).tar.xz NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT NGHTTP2_LICENSE_FILES = COPYING diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index fc2ba9bfe35c..d30d653df34c 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" depends on BR2_PACKAGE_NGINX_HTTP - # uses pcre, so nginx needs to be built with pcre support - select BR2_PACKAGE_PCRE + # uses pcre2, so nginx needs to be built with pcre2 support + select BR2_PACKAGE_PCRE2 help NAXSI means Nginx Anti XSS & SQL Injection. diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 406a1c861a61..8e888baa1c6b 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_NGINX nginx is an HTTP and reverse proxy server, as well as a mail proxy server. - http://nginx.org/ + https://nginx.org/ if BR2_PACKAGE_NGINX diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 10cc95d90ec1..185bcd576f2e 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -5,7 +5,7 @@ ################################################################################ NGINX_VERSION = 1.22.1 -NGINX_SITE = http://nginx.org/download +NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE NGINX_CPE_ID_VENDOR = f5 diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8a1..c7f0dec3602b 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee23..7fa2e2f3bc6c 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b68..894cd95b0faa 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 000000000000..71550da943bf --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f750413..dc69a342351c 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet diff --git a/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch b/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 000000000000..f2bdf5904dd3 --- /dev/null +++ b/package/nmap/0002-nping-Crypto.cc-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 4ebea5c1d1a10be0d0165da3b9c0e1fa82c3db3c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 21 May 2022 17:51:37 +0200 +Subject: [PATCH] nping/Crypto.cc: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +Crypto.cc: In static member function 'static int Crypto::aes128_cbc_encrypt(u8*, size_t, u8*, u8*, size_t, u8*)': +Crypto.cc:139:26: error: aggregate 'EVP_CIPHER_CTX ctx' has incomplete type and cannot be defined + 139 | EVP_CIPHER_CTX ctx; + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/2e6eebbe2ed8305b88047bc92c19350c1ecada16 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/nmap/nmap/pull/2480 +--- + nping/Crypto.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/nping/Crypto.cc b/nping/Crypto.cc +index 850438352..9f7c88686 100644 +--- a/nping/Crypto.cc ++++ b/nping/Crypto.cc +@@ -70,7 +70,9 @@ + #include + #include + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + #define HAVE_OPAQUE_EVP_PKEY 1 + #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset + #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset +-- +2.35.1 + diff --git a/package/nmap/Config.in b/package/nmap/Config.in index fc6312d0fc76..6e097a9884cb 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_NMAP_NCAT written for the Nmap Project as a much-improved reimplementation of the venerable Netcat. - If symlink to "nc" is installed if neither netcat or + A symlink to "nc" is installed if neither netcat or netcat-openbsd is selected. comment "a symlink from ncat to 'nc' will be installed" diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 4408782248ec..e24d86db31a5 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.18.1/SHASUMS256.txt -sha256 1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238 node-v16.18.1.tar.xz +# From https://nodejs.org/dist/v16.20.2/SHASUMS256.txt +sha256 576f1a03c455e491a8d132b587eb6b3b84651fc8974bb3638433dd44d22c8f49 node-v16.20.2.tar.xz # Hash for license file -sha256 0bec08634ba79b5404f6b7f92ea850f3c2a06e27e6f83f2267e4f5e55ae33334 LICENSE +sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 367d5d20587b..b0b782f219ef 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.18.1 +NODEJS_VERSION = 16.20.2 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \ @@ -46,14 +46,16 @@ HOST_NODEJS_MAKE_OPTS = \ CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + PATH=$(@D)/bin:$(BR_PATH) \ + JOBS=$(PARALLEL_JOBS) NODEJS_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + LD="$(TARGET_CXX)" \ + JOBS=$(PARALLEL_JOBS) # nodejs's build system uses python which can be a symlink to an unsupported # python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by @@ -246,6 +248,9 @@ define NODEJS_INSTALL_MODULES # help in diagnosing the problem. $(NPM) install -g $(NODEJS_MODULES_LIST) endef + +# Exclude prebuilt binaries with different architectures and OS from check +NODEJS_BIN_ARCH_EXCLUDE = /usr/lib/node_modules/ endif define NODEJS_INSTALL_STAGING_CMDS diff --git a/package/nodejs/v8-qemu-wrapper.in b/package/nodejs/v8-qemu-wrapper.in index e1083f47f704..48222d089b15 100644 --- a/package/nodejs/v8-qemu-wrapper.in +++ b/package/nodejs/v8-qemu-wrapper.in @@ -5,5 +5,6 @@ exec @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ @QEMU_USERMODE_ARGS@ \ -L "${STAGING_DIR}/" \ + -E LD_LIBRARY_PATH="${STAGING_DIR}/lib:${STAGING_DIR}/usr/lib/" \ "$@" diff --git a/package/ntp/Config.in b/package/ntp/Config.in index 97d933b5a856..78f008a4b817 100644 --- a/package/ntp/Config.in +++ b/package/ntp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NTP bool "ntp" + depends on BR2_USE_MMU || BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEVENT help Network Time Protocol suite/programs. diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index 44e04b240351..8d98b5c4115f 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ad45f5b88d08a159bc9f44ecb79e08358d26d3d22bb6c96ab7aaa3734de130e6 ntpsec-NTPsec_1_2_2.tar.bz2 +sha256 ef901df5a05d486563db22f4d0dad3840a3bf5d0a9aceb8c3ecaeb396c67a805 ntpsec-NTPsec_1_2_2a.tar.bz2 sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index e612e982ecb4..f6262cdaca92 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTPSEC_VERSION = 1.2.2 +NTPSEC_VERSION = 1.2.2a NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) diff --git a/package/nut/nut.mk b/package/nut/nut.mk index fb98ba04f032..4c322aeb8506 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -24,7 +24,9 @@ NUT_POST_PATCH_HOOKS += NUT_FIX_CONFIGURE NUT_CONF_OPTS = \ --with-altpidpath=/var/run/upsd \ --with-dev \ - --without-doc + --without-doc \ + --with-user=nut \ + --with-group=nut NUT_CONF_ENV = \ ax_cv_check_cflags__Werror__Wno_unknown_warning_option=no \ @@ -34,6 +36,10 @@ NUT_CONF_ENV = \ ac_cv_func_strncasecmp=yes \ ax_cv__printf_string_null=yes +define NUT_USERS + nut -1 nut -1 * - - - NUT user +endef + ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),) NUT_CONF_OPTS += --with-drivers=auto else diff --git a/package/olsr/0006-build-patch-for-gpsd-3-25.patch b/package/olsr/0006-build-patch-for-gpsd-3-25.patch new file mode 100644 index 000000000000..c82bc1bb2896 --- /dev/null +++ b/package/olsr/0006-build-patch-for-gpsd-3-25.patch @@ -0,0 +1,31 @@ +From 17d583258969c1d182361e0e168b3cad79ef64e6 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 16 Jan 2023 18:35:32 -0500 +Subject: [PATCH] build: patch for gpsd 3.25 + +Signed-off-by: Rui Chen +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] +Signed-off-by: Fabrice Fontaine +--- + lib/pud/src/gpsdclient.h | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h +index 061056b12..a51dd2211 100644 +--- a/lib/pud/src/gpsdclient.h ++++ b/lib/pud/src/gpsdclient.h +@@ -60,14 +60,6 @@ struct GpsdConnectionState { + struct devconfig_t dev[MAXUSERDEVS]; + }; + +-/* describe a data source */ +-struct fixsource_t { +- char spec[PATH_MAX]; /* working space, will be modified */ +- char *server; /* pointer into spec field */ +- char *port; /* pointer into spec field */ +- char *device; /* pointer into spec field */ +-}; +- + /** + * The gpsd daemon spec + */ diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 0144e93a3faf..4a5f08783ca8 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -1,55 +1,56 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET string - default "P2" if BR2_x86_pentium2 - default "KATMAI" if BR2_x86_pentium3 - default "NORTHWOOD" if BR2_x86_pentium4 - default "PRESCOTT" if BR2_x86_prescott || BR2_x86_nocona - default "BANIAS" if BR2_x86_pentium_m - default "CORE2" if BR2_x86_core2 - default "NEHALEM" if BR2_x86_corei7 || BR2_x86_silvermont || BR2_x86_westmere - default "SANDYBRIDGE" if BR2_x86_corei7_avx - default "HASWELL" if BR2_x86_core_avx2 - default "ATOM" if BR2_x86_atom - default "ATHLON" if BR2_x86_athlon || BR2_x86_athlon_4 - default "OPTERON" if BR2_x86_opteron - default "OPTERON_SSE3" if BR2_x86_opteron_sse3 - default "BARCELONA" if BR2_x86_barcelona - default "BOBCAT" if BR2_x86_jaguar - default "STEAMROLLER" if BR2_x86_steamroller - default "VIAC3" if BR2_x86_c3 || BR2_x86_c32 - default "POWER4" if BR2_powerpc_power4 - default "POWER5" if BR2_powerpc_power5 - default "POWER6" if BR2_powerpc_power6 - default "POWER7" if BR2_powerpc_power7 - default "POWER8" if BR2_powerpc_power8 - default "PPCG4" if BR2_powerpc_7400 || BR2_powerpc_7450 - default "PPC970" if BR2_powerpc_970 - default "PPC440" if BR2_powerpc_440 - default "PPC440FP2" if BR2_powerpc_440fp + default "P2" if BR2_x86_pentium2 + default "KATMAI" if BR2_x86_pentium3 + default "NORTHWOOD" if BR2_x86_pentium4 + default "PRESCOTT" if BR2_x86_prescott || BR2_x86_nocona + default "BANIAS" if BR2_x86_pentium_m + default "CORE2" if BR2_x86_core2 + default "NEHALEM" if BR2_x86_corei7 || BR2_x86_silvermont || BR2_x86_westmere + default "SANDYBRIDGE" if BR2_x86_corei7_avx + default "HASWELL" if BR2_x86_core_avx2 + default "ATOM" if BR2_x86_atom + default "ATHLON" if BR2_x86_athlon || BR2_x86_athlon_4 + default "OPTERON" if BR2_x86_opteron + default "OPTERON_SSE3" if BR2_x86_opteron_sse3 + default "BARCELONA" if BR2_x86_barcelona + default "BOBCAT" if BR2_x86_jaguar + default "STEAMROLLER" if BR2_x86_steamroller + default "VIAC3" if BR2_x86_c3 || BR2_x86_c32 + default "POWER4" if BR2_powerpc_power4 + default "POWER5" if BR2_powerpc_power5 + default "POWER6" if BR2_powerpc_power6 + default "POWER7" if BR2_powerpc_power7 + default "POWER8" if BR2_powerpc_power8 + default "PPCG4" if BR2_powerpc_7400 || BR2_powerpc_7450 + default "PPC970" if BR2_powerpc_970 + default "PPC440" if BR2_powerpc_440 + default "PPC440FP2" if BR2_powerpc_440fp # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - default "SICORTEX" if BR2_MIPS_CPU_MIPS64 + default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + default "SICORTEX" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 - default "SPARC" if BR2_sparc_v9 + default "SPARC" if BR2_sparc_v9 # Cortex-A15 always have a VFPv4 - default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) + default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) # Cortex-A9 have an optional VFPv3, so we need to make sure it # is available - default "CORTEXA9" if (BR2_cortex_a9 && BR2_ARM_EABIHF && \ + default "CORTEXA9" if (BR2_cortex_a9 && BR2_ARM_EABIHF && \ BR2_ARM_CPU_HAS_VFPV3) - default "ARMV5" if BR2_ARM_CPU_ARMV5 + default "ARMV5" if BR2_ARM_CPU_ARMV5 # On ARMv6, OpenBLAS assumes that a VFP is available, and # EABIhf is used - default "ARMV6" if (BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && \ + default "ARMV6" if (BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && \ BR2_ARM_CPU_HAS_VFPV2) # On ARMv7, OpenBLAS assumes that a full VFPv3+ is available # (and not the more limited D16 variant), and that EABIhf is # used. - default "ARMV7" if (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && \ + default "ARMV7" if (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && \ BR2_ARM_CPU_HAS_VFPV3) - default "ARMV8" if BR2_aarch64 || BR2_aarch64_be + default "ARMV8" if BR2_aarch64 || BR2_aarch64_be + default "RISCV64_GENERIC" if BR2_RISCV_64 help OpenBLAS target CPU. See TargetList.txt in the source tree for the possible target strings. A possible value is set diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index ac40c57afb31..e05687bb8f9a 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -49,6 +49,12 @@ ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 endif +ifeq ($(BR2_ARCH_IS_64),y) +OPENBLAS_MAKE_OPTS += BINARY=64 +else +OPENBLAS_MAKE_OPTS += BINARY=32 +endif + # binutils version <= 2.23.2 has a bug # (https://sourceware.org/bugzilla/show_bug.cgi?id=14887) where # whitespaces in ARM register specifications such as [ r1, #12 ] or [ diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 98003330352c..261d41486984 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ALPHAMAT config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO bool "aruco" + select BR2_PACKAGE_OPENCV4_LIB_CALIB3D help ArUco and ChArUco Markers -- Augmented reality ArUco marker and "ChARUco" markers where ArUco markers embedded inside the @@ -29,6 +30,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BGSEGM bool "bgsegm" + select BR2_PACKAGE_OPENCV4_LIB_VIDEO help Background segmentation algorithm combining statistical background image estimation and per-pixel Bayesian @@ -43,6 +45,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BIOINSPIRED config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CCALIB bool "ccalib" + select BR2_PACKAGE_OPENCV4_LIB_HIGHGUI help Custom Calibration -- Patterns for 3D reconstruction, omnidirectional camera calibration, random pattern calibration @@ -71,17 +74,31 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT bool "dnn_objdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn + select BR2_PACKAGE_OPENCV4_LIB_DNN help Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn module. +comment "dnn_objdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES bool "dnn_superres" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn + select BR2_PACKAGE_OPENCV4_LIB_DNN help Superresolution using CNNs -- Contains four trained convolutional neural networks to upscale images. +comment "dnn_superres needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED bool "dnns_easily_fooled" help @@ -90,16 +107,30 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM bool "dpm" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code. +comment "dpm needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE bool "face" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Face Recognition -- Face recognition techniques: Eigen, Fisher and Local Binary Pattern Histograms LBPH methods. +comment "face needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE bool "freetype" help @@ -165,6 +196,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MCC config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OPTFLOW bool "optflow" + select BR2_PACKAGE_OPENCV4_LIB_VIDEO help Optical Flow -- Algorithms for running and evaluating deepflow, simpleflow, sparsetodenseflow and motion @@ -219,6 +251,11 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM bool "sfm" + select BR2_PACKAGE_OPENCV4_LIB_IMGPROC + select BR2_PACKAGE_OPENCV4_LIB_IMGCODECS + select BR2_PACKAGE_EIGEN + select BR2_PACKAGE_GLOG + select BR2_PACKAGE_GFLAGS help Structure from Motion -- This module contains algorithms to perform 3d reconstruction from 2d images. The core of @@ -231,6 +268,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO bool "stereo" + select BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING help Stereo Correspondence -- Stereo matching done with different descriptors: Census / CS-Census / MCT / BRIEF / MV and dense @@ -244,6 +282,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STRUCTURED_LIGHT config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SUPERRES bool "superres" + select BR2_PACKAGE_OPENCV4_LIB_VIDEO help Super Resolution @@ -262,12 +301,15 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TEXT config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING bool "tracking" + select BR2_PACKAGE_OPENCV4_LIB_VIDEO help Vision Based Object Tracking -- Use and/or evaluate different visual object tracking techniques. config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIDEOSTAB bool "videostab" + select BR2_PACKAGE_OPENCV4_LIB_VIDEO + select BR2_PACKAGE_OPENCV4_LIB_PHOTO help Video Stabilization @@ -299,13 +341,21 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT bool "xobjdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Boosted 2D Object Detection -- Uses a Waldboost cascade and local binary patterns computed as integral features for 2D object detection. +comment "xobjdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO bool "xphoto" + select BR2_PACKAGE_OPENCV4_LIB_PHOTO help Extra Computational Photography -- Additional photo processing algorithms: Color balance / Denoising / Inpainting. diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash index 4f15162e5075..954a0c2beb97 100644 --- a/package/opencv4-contrib/opencv4-contrib.hash +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7 opencv4-contrib-4.6.0.tar.gz +sha256 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e opencv4-contrib-4.8.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index 81c45c6e02c8..f8c8cfd94ce6 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENCV4_CONTRIB_VERSION = 4.6.0 +OPENCV4_CONTRIB_VERSION = 4.8.1 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) -OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 OPENCV4_CONTRIB_LICENSE_FILES = LICENSE diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index 286a7ebf9d97..2294556c24bb 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -201,6 +201,8 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D select BR2_PACKAGE_OPENCV4_LIB_IMGPROC @@ -209,6 +211,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING Include opencv_stitching (images stitching) module into the OpenCV build. +comment "stitching needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_LIB_SUPERRES bool "superres" select BR2_PACKAGE_OPENCV4_LIB_IMGPROC diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index 419b420917f3..273675263353 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 opencv4-4.6.0.tar.gz +sha256 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5 opencv4-4.8.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index a665793ad9b1..74cec511a91d 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.6.0 +OPENCV4_VERSION = 4.8.1 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 @@ -203,12 +203,10 @@ OPENCV4_CONF_OPTS += \ -DINSTALL_PYTHON_EXAMPLES=OFF \ -DINSTALL_TO_MANGLED_PATHS=OFF -# Disabled features (mostly because they are not available in Buildroot), but -# - eigen: OpenCV does not use it, not take any benefit from it. +# Disabled features (mostly because they are not available in Buildroot) OPENCV4_CONF_OPTS += \ -DWITH_1394=OFF \ -DWITH_CLP=OFF \ - -DWITH_EIGEN=OFF \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ -DWITH_GSTREAMER_0_10=OFF \ @@ -284,6 +282,11 @@ OPENCV4_CONF_OPTS += \ -DBUILD_opencv_xphoto=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO),ON,OFF) endif +ifeq ($(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM),y) +OPENCV4_DEPENDENCIES += eigen glog gflags +OPENCV4_CONF_OPTS += -DWITH_EIGEN=ON +endif + ifeq ($(BR2_PACKAGE_OPENCV4_JPEG2000_WITH_JASPER),y) OPENCV4_CONF_OPTS += -DWITH_JASPER=ON OPENCV4_DEPENDENCIES += jasper diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f61..98f12cb2b805 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 c25dfbc334068a48c19c44ce39ad4b8427e309ae1cfa83f23c102e78b8a6dcc0 OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz +sha256 eefd3cf3b3dd47ff269fa5b5c10b5e096b163f4e9c1810023abdbc00dc6cc304 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9 OpenJDK11U-jdk_x64_linux_hotspot_11.0.20_8.tar.gz +sha256 eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20_8.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac1f..785ca8733733 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.8.1_1 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.20_8 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.8.1+1/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.8.1+1/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a41962..a8ea5aff65be 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.8.1+1/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1676,6 +1676,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1700,6 +1703,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1728,6 +1732,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1750,7 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d73..fcb914374891 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 e57251d8306911282b6f0a2f721431dab5f87c99cce0930fc062e690f7c77f04 openjdk-17.0.8.1+1.tar.gz +sha256 b2a37ef209ae7eaf8f34182b7c9aa3252af20a214d02970f96ce62242c805479 openjdk-11.0.20+8.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c479..068d16b770fc 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.8.1+1 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.20+8 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted file mode 100644 index ecb716b6fa0f..000000000000 --- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 6 Oct 2021 17:43:16 +0200 -Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70 - -Fix the following build failure raised with openocd and autoconf >= 2.70 -due to -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf: - ->>> openocd 0.11.0 Autoreconfiguring -autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script? - -Fixes: - - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/msteveb/jimtcl/pull/209] ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac -index b70b5d8..8c45114 100644 ---- a/jimtcl/configure.ac -+++ b/jimtcl/configure.ac -@@ -1 +1,3 @@ - # Dummy configure.ac to make automake happy -+AC_INIT([jimtcl], [0.80]) -+AC_OUTPUT --- -2.33.0 - diff --git a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch b/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted file mode 100644 index 776816892b30..000000000000 --- a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch +++ /dev/null @@ -1,89 +0,0 @@ -From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001 -From: Antonio Borneo -Date: Wed, 23 Jun 2021 16:52:16 +0200 -Subject: [PATCH] stlink: fix SIGSEGV with libusb v1.0.24-33-g32a2206 (11618) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The stlink driver incorrectly uses a NULL pointer for libusb's -struct libusb_context. -The correct value to be used is local in libusb_helper.c. - -Move in the helper file, in a wrapper function, the only call that -requires the above value, and let stlink driver to use this -wrapper. - -This issue has not triggered any visible problem until a code -refactoring [1] in libusb has made OpenOCD crashing on Windows and -on MacOS. - -Change-Id: Id1818c8af7cf0d4d17dfa1d22aad079da01ef740 -Signed-off-by: Antonio Borneo -Fixes: https://sourceforge.net/p/openocd/tickets/308/ -Fixes: https://github.com/libusb/libusb/issues/928/ -Fixes: 42d8fa899c6a ("stlink_usb: Submit multiple USB URBs at once to improve performance") -Link: [1] https://github.com/libusb/libusb/commit/32a22069428c -Reported-by: Andrzej Sierżęga -Co-developed-by: Andrzej Sierżęga -Co-developed-by: Xiaofan Chen -Reviewed-on: http://openocd.zylin.com/6331 -Tested-by: jenkins -Reviewed-by: Marc Schink -Reviewed-by: Xiaofan -Reviewed-by: Andrzej Sierżęga -Reviewed-by: Oleksij Rempel -Reviewed-by: Andreas Fritiofson -Signed-off-by: Yannick Brosseau ---- - src/jtag/drivers/libusb_helper.c | 5 +++++ - src/jtag/drivers/libusb_helper.h | 1 + - src/jtag/drivers/stlink_usb.c | 7 +------ - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c -index f0122d534..18fe4bad4 100644 ---- a/src/jtag/drivers/libusb_helper.c -+++ b/src/jtag/drivers/libusb_helper.c -@@ -363,3 +363,8 @@ int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid) - - return ERROR_FAIL; - } -+ -+int jtag_libusb_handle_events_completed(int *completed) -+{ -+ return libusb_handle_events_completed(jtag_libusb_context, completed); -+} -diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h -index fa7d06e28..3e77865d6 100644 ---- a/src/jtag/drivers/libusb_helper.h -+++ b/src/jtag/drivers/libusb_helper.h -@@ -60,5 +60,6 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh, - unsigned int *usb_write_ep, - int bclass, int subclass, int protocol, int trans_type); - int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid); -+int jtag_libusb_handle_events_completed(int *completed); - - #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */ -diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c -index c68bbb3ca..7b1932b9f 100644 ---- a/src/jtag/drivers/stlink_usb.c -+++ b/src/jtag/drivers/stlink_usb.c -@@ -497,13 +497,8 @@ static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer) - { - int r, *completed = transfer->user_data; - -- /* Assuming a single libusb context exists. There no existing interface into this -- * module to pass a libusb context. -- */ -- struct libusb_context *ctx = NULL; -- - while (!*completed) { -- r = libusb_handle_events_completed(ctx, completed); -+ r = jtag_libusb_handle_events_completed(completed); - if (r < 0) { - if (r == LIBUSB_ERROR_INTERRUPTED) - continue; --- -2.35.1 - diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 91eb56d930ea..938711d86c0f 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,3 +1,15 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/ +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2 +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0 +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2 +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 37a06ca848b7..78c6e10c58e4 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,12 +4,36 @@ # ################################################################################ -OPENOCD_VERSION = 0.11.0 +OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) -OPENOCD_LICENSE = GPL-2.0+ -OPENOCD_LICENSE_FILES = COPYING -# 0002-configure-enable-build-on-uclinux.patch patches configure.ac +OPENOCD_LICENSE = \ + BSD-1-clause, \ + BSD-2-clause, \ + BSD-2-Clause-Views, \ + BSD-3-clause, \ + BSD-Source-Code, \ + GFDL-1.2-no-invariants-or-later (docs), \ + GPL-2.0+ with eCos-exception-2.0 (code), \ + GPL-3.0+ (stand-alone code), \ + MIT + +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/exceptions/eCos-exception-2.0 \ + LICENSES/preferred/BSD-1-Clause \ + LICENSES/preferred/BSD-2-Clause \ + LICENSES/preferred/BSD-2-Clause-Views \ + LICENSES/preferred/BSD-3-Clause \ + LICENSES/preferred/BSD-Source-Code \ + LICENSES/preferred/GFDL-1.2 \ + LICENSES/preferred/gfdl-1.2.texi.readme \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/preferred/MIT \ + LICENSES/stand-alone/GPL-3.0 + +# 0001-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch deleted file mode 100644 index 671d92c150db..000000000000 --- a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= -Date: Fri, 10 Dec 2021 13:54:26 +0200 -Subject: [PATCH] Fix maybe uninitialized errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: José Pekkarinen -Upstream: https://github.com/OpenSC/OpenSC/commit/05ec8c7fe785a2b9aeaac1164adb349df42b7f80 ---- - src/libopensc/pkcs15-coolkey.c | 12 ++++++------ - src/pkcs15init/pkcs15-asepcos.c | 2 +- - src/tools/opensc-explorer.c | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c -index 586475dd..15684cef 100644 ---- a/src/libopensc/pkcs15-coolkey.c -+++ b/src/libopensc/pkcs15-coolkey.c -@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, - static int - coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) - { -- const u8 *val; -- size_t val_len; -- u8 data_type; -+ const u8 *val = NULL; -+ size_t val_len = 0; -+ u8 data_type = 0; - int r; - - r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); -@@ -168,8 +168,8 @@ static int - coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) - { - int r; -- const u8 *val; -- size_t val_len; -+ const u8 *val = NULL; -+ size_t val_len = 0; - - r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); - if (r < 0) { -@@ -186,7 +186,7 @@ static int - coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) - { - const u8 *val; -- size_t val_len; -+ size_t val_len = 0; - int r; - - r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); -diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c -index d7122012..bc0efb5c 100644 ---- a/src/pkcs15init/pkcs15-asepcos.c -+++ b/src/pkcs15init/pkcs15-asepcos.c -@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, - { - sc_file_t *nfile = NULL; - u8 buf[64], sbuf[64], *p = buf, *q = sbuf; -- int r, akn; -+ int r, akn = 0; - - if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) - return SC_ERROR_OBJECT_NOT_VALID; -diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c -index 9ec4daa1..04efdf8f 100644 ---- a/src/tools/opensc-explorer.c -+++ b/src/tools/opensc-explorer.c -@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) - char *line; - int cargc; - char *cargv[260]; -- int multiple; -+ int multiple = 0; - struct command *cmd; - char prompt[3*SC_MAX_PATH_STRING_SIZE]; - --- -2.25.1 - diff --git a/package/opensc/0002-added-compatibility-with-LibreSSL.patch b/package/opensc/0002-added-compatibility-with-LibreSSL.patch deleted file mode 100644 index 86a17448f85f..000000000000 --- a/package/opensc/0002-added-compatibility-with-LibreSSL.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 302ad70471efa279b033d4d5511d979ec5d965fe Mon Sep 17 00:00:00 2001 -From: Frank Morgner -Date: Thu, 20 Jan 2022 17:01:46 +0100 -Subject: [PATCH] added compatibility with LibreSSL - -[Retrieved (and backported) from: -https://github.com/OpenSC/OpenSC/commit/302ad70471efa279b033d4d5511d979ec5d965fe] -Signed-off-by: Fabrice Fontaine ---- - src/libopensc/sc-ossl-compat.h | 7 +++++++ - src/tests/p11test/p11test_case_common.c | 14 ++++++++++++++ - src/tests/p11test/p11test_case_ec_derive.c | 4 ++++ - src/tests/p11test/p11test_case_readonly.c | 9 +++++++-- - 4 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index f885f85bb9..ec694ad48d 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -105,6 +105,13 @@ extern "C" { - /* workaround unused value warning for a macro that does nothing */ - #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L - #define OPENSSL_malloc_init() -+#define FIPS_mode() (0) -+#define EVP_sha3_224() (NULL) -+#define EVP_sha3_256() (NULL) -+#define EVP_sha3_384() (NULL) -+#define EVP_sha3_512() (NULL) -+#define EVP_PKEY_new_raw_public_key(t, e, p, l) (NULL) -+#define EVP_PKEY_get_raw_public_key(p, pu, l) (0) - #endif - - #if OPENSSL_VERSION_NUMBER >= 0x30000000L -diff --git a/src/tests/p11test/p11test_case_common.c b/src/tests/p11test/p11test_case_common.c -index e432f8f4ed..f091dbcc10 100644 ---- a/src/tests/p11test/p11test_case_common.c -+++ b/src/tests/p11test/p11test_case_common.c -@@ -164,6 +164,7 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; - } -+#ifdef EVP_PKEY_ED25519 - } else if (o->type == EVP_PKEY_ED25519) { - if (token.num_ed_mechs > 0 ) { - o->num_mechs = token.num_ed_mechs; -@@ -184,6 +185,8 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; - } -+#endif -+#ifdef EVP_PKEY_X25519 - } else if (o->type == EVP_PKEY_X25519) { - if (token.num_montgomery_mechs > 0 ) { - o->num_mechs = token.num_montgomery_mechs; -@@ -204,6 +207,7 @@ add_supported_mechs(test_cert_t *o) - o->mechs[0].result_flags = 0; - o->mechs[0].usage_flags = CKF_DERIVE; - } -+#endif - } - } - -@@ -601,6 +605,7 @@ int callback_public_keys(test_certs_t *objects, - a = template[6].pValue; - if (d2i_ASN1_PRINTABLESTRING(&curve, &a, (long)template[6].ulValueLen) != NULL) { - switch (o->key_type) { -+#ifdef EVP_PKEY_ED25519 - case CKK_EC_EDWARDS: - if (strcmp((char *)curve->data, "edwards25519")) { - debug_print(" [WARN %s ] Unknown curve name. " -@@ -608,6 +613,8 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_ED25519; - break; -+#endif -+#ifdef EVP_PKEY_X25519 - case CKK_EC_MONTGOMERY: - if (strcmp((char *)curve->data, "curve25519")) { - debug_print(" [WARN %s ] Unknown curve name. " -@@ -615,16 +622,20 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_X25519; - break; -+#endif - default: - debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); - return -1; - } - ASN1_PRINTABLESTRING_free(curve); - } else if (d2i_ASN1_OBJECT(&obj, &a, (long)template[6].ulValueLen) != NULL) { -+#if defined(EVP_PKEY_ED25519) || defined (EVP_PKEY_X25519) - int nid = OBJ_obj2nid(obj); -+#endif - ASN1_OBJECT_free(obj); - - switch (o->key_type) { -+#ifdef EVP_PKEY_ED25519 - case CKK_EC_EDWARDS: - if (nid != NID_ED25519) { - debug_print(" [WARN %s ] Unknown OID. " -@@ -632,6 +643,8 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_ED25519; - break; -+#endif -+#ifdef EVP_PKEY_X25519 - case CKK_EC_MONTGOMERY: - if (nid != NID_X25519) { - debug_print(" [WARN %s ] Unknown OID. " -@@ -639,6 +652,7 @@ int callback_public_keys(test_certs_t *objects, - } - evp_type = EVP_PKEY_X25519; - break; -+#endif - default: - debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); - return -1; -diff --git a/src/tests/p11test/p11test_case_ec_derive.c b/src/tests/p11test/p11test_case_ec_derive.c -index 9f13b3e9d6..f7a5f92f9e 100644 ---- a/src/tests/p11test/p11test_case_ec_derive.c -+++ b/src/tests/p11test/p11test_case_ec_derive.c -@@ -89,6 +89,7 @@ pkcs11_derive(test_cert_t *o, token_info_t * info, - - int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) - { -+#ifdef EVP_PKEY_X25519 - unsigned char *secret = NULL, *pkcs11_secret = NULL; - EVP_PKEY_CTX *pctx = NULL; - EVP_PKEY *pkey = NULL; /* This is peer key */ -@@ -210,6 +211,9 @@ int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) - free(secret); - free(pkcs11_secret); - return 1; -+#else -+ return 0; -+#endif - } - - int test_derive(test_cert_t *o, token_info_t *info, test_mech_t *mech) -diff --git a/src/tests/p11test/p11test_case_readonly.c b/src/tests/p11test/p11test_case_readonly.c -index 624bd6a54d..2aefdc7a70 100644 ---- a/src/tests/p11test/p11test_case_readonly.c -+++ b/src/tests/p11test/p11test_case_readonly.c -@@ -522,6 +522,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, - rv, ERR_error_string(ERR_peek_last_error(), NULL)); - return -1; - } -+#ifdef EVP_PKEY_ED25519 - } else if (o->type == EVP_PKEY_ED25519) { - /* need to be created even though we do not do any MD */ - EVP_MD_CTX *ctx = EVP_MD_CTX_create(); -@@ -547,7 +548,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, - EVP_MD_CTX_free(ctx); - return -1; - } -- -+#endif - } else { - fprintf(stderr, " [ KEY %s ] Unknown type. Not verifying\n", o->id_str); - } -@@ -641,7 +642,11 @@ int sign_verify_test(test_cert_t *o, token_info_t *info, test_mech_t *mech, - return 0; - } - -- if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA && o->type != EVP_PKEY_ED25519) { -+ if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA -+#ifdef EVP_PKEY_ED25519 -+ && o->type != EVP_PKEY_ED25519 -+#endif -+ ) { - debug_print(" [SKIP %s ] Skip non-RSA and non-EC key", o->id_str); - return 0; - } diff --git a/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch b/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch deleted file mode 100644 index 1d262362d66f..000000000000 --- a/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d13059d1ec2bbb8fe7068db0d66d521daa4b71ce Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 14:27:22 +0200 -Subject: [PATCH] Fix build with libressl >= 3.5.0 - -libressl added back FIPS_mode since version 3.5.0 and -https://github.com/libressl-portable/openbsd/commit/a97eabc90d7647e374c1c6da686aeec63c49ff14 - -libressl provides X509_get_extension_flags since version 3.5.0 and -https://github.com/libressl-portable/openbsd/commit/3180723224c1b2c7856a110b8213e4966995d7e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OpenSC/OpenSC/pull/2593 & - https://github.com/OpenSC/OpenSC/pull/2595 (merged)] ---- - src/libopensc/sc-ossl-compat.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index f0d55279..2c42794c 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -86,9 +86,11 @@ extern "C" { - #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay - -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L - #define X509_get_extension_flags(x) (x->ex_flags) - #define X509_get_key_usage(x) (x->ex_kusage) - #define X509_get_extended_key_usage(x) (x->ex_xkusage) -+#endif - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -@@ -104,7 +106,9 @@ extern "C" { - /* workaround unused value warning for a macro that does nothing */ - #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L - #define OPENSSL_malloc_init() -+#if LIBRESSL_VERSION_NUMBER < 0x30500000L - #define FIPS_mode() (0) -+#endif - #define EVP_sha3_224() (NULL) - #define EVP_sha3_256() (NULL) - #define EVP_sha3_384() (NULL) --- -2.35.1 - diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash index 517cfe503a35..232222062c7f 100644 --- a/package/opensc/opensc.hash +++ b/package/opensc/opensc.hash @@ -1,5 +1,5 @@ # Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ -sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz +sha256 24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8 opensc-0.24.0.tar.gz # Computed locally sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index f9e2f5083e5c..49bdcae37a5b 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENSC_VERSION = 0.22.0 +OPENSC_VERSION = 0.24.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING OPENSC_CPE_ID_VENDOR = opensc_project OPENSC_DEPENDENCIES = openssl pcsc-lite OPENSC_INSTALL_STAGING = YES -OPENSC_CONF_OPTS = --disable-cmocka --disable-strict +OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests $(eval $(autotools-package)) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 000000000000..5c056033a9b7 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ‘used’ is not supportedcw +> for ‘-fzero-call-used-regs’ on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index eefb11ec15e6..618b13133d8f 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.1 (base64 encoded) -sha256 19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 openssh-9.1p1.tar.gz +# From https://www.openssh.com/txt/release-9.4p1 +sha256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c openssh-9.6p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index b70e327620a0..ef530cc85033 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.1 +OPENSSH_VERSION_MAJOR = 9.6 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ @@ -35,6 +38,10 @@ define OPENSSH_PERMISSIONS /var/empty d 755 root root - - - - - endef +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_110934),y) +OPENSSH_CONF_OPTS += --without-hardening +endif + ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) OPENSSH_CONF_OPTS += --without-pie endif diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 67855f50e0b3..de1ba3261ed0 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET @@ -30,16 +31,12 @@ if BR2_PACKAGE_OPENVMTOOLS config BR2_PACKAGE_OPENVMTOOLS_PAM bool "PAM support" - # linux-pam needs locale and wchar, but we already have this - # dependency on the main symbol, above. - depends on !BR2_STATIC_LIBS + # linux-pam needs locale, dynamic library and wchar, but we + # already have these dependencies on the main symbol, above. select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" depends on BR2_PACKAGE_HAS_UDEV @@ -56,9 +53,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" +comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale, dynamic library" depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_ENABLE_LOCALE || \ + !BR2_ENABLE_LOCALE || BR2_STATIC_LIBS || \ BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 0959b7f83809..a60362a09cb1 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 08340a389905c84196b6cd750add1bc0fa2d46a1afebfd589c24120946c13e68 openvpn-2.5.7.tar.gz +sha256 8794b7125998c68f30de654267a702b9581454ca1e7061511fcc5f99fea4bd32 openvpn-2.5.9.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 5c602e0448fc..1e47b75557e8 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.7 +OPENVPN_VERSION = 2.5.9 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index ad267c5c943f..384a7323ee0f 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -16,7 +16,7 @@ HOST_OPKG_UTILS_DEPENDENCIES = \ host-xz # Nothing to build; only scripts to install. -define OPKG_UTILS_INSTALL_CMDS +define OPKG_UTILS_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install-utils endef diff --git a/package/opus/opus.mk b/package/opus/opus.mk index d8e0623e153a..611b0e1da0da 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.3.1 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 63553a81e737..efd38c542c9f 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -9,6 +9,7 @@ OPUSFILE_SITE = https://downloads.xiph.org/releases/opus OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING +OPUSFILE_CPE_ID_VENDOR = xiph OPUSFILE_INSTALL_STAGING = YES # 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch diff --git a/package/orc/orc.hash b/package/orc/orc.hash index 136fc3ece4da..1e584c1190f4 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum -sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.34.tar.xz.sha256sum +sha256 8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f orc-0.4.34.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index be718e6f8505..b2d2bb461b5c 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.33 +ORC_VERSION = 0.4.34 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index e903e92c49e7..3e73572a800e 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org -comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index 529c538ff258..d359edf36e9b 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.tar.gz +sha256 47c77e95609812da82feee30db435c3b7c720d4fd3147d466ead126e657b6d9c paho-mqtt-c-1.3.13.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk index 8d1fe009a751..ec4e96c77ff9 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.12 +PAHO_MQTT_C_VERSION = 1.3.13 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/package/parted/Config.in b/package/parted/Config.in index f48b365a2d7a..ea6c3db2bf7b 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "parted needs a toolchain w/ locale, wchar, gcc >=5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/pcm-tools/pcm-tools.hash b/package/pcm-tools/pcm-tools.hash index 1853dcebb574..cfa3faeff7bb 100644 --- a/package/pcm-tools/pcm-tools.hash +++ b/package/pcm-tools/pcm-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa48ab1473720aeb7837b67bfc612100f484748720a8b8034daff00419709057 pcm-tools-202110.tar.gz +sha256 29416f83d1de95594d225f63af34f8f074ee4822010ce2e05b1fabc66933472a pcm-tools-93fc9193a70e2f1f054be554c48f4a4791be5032-br1.tar.gz sha256 0f476c77009f982dcc4bdff41e692ddd456a9862908e99f2ae3d57296decc649 LICENSE diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index d676df57f9ac..c53049269644 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -4,8 +4,12 @@ # ################################################################################ -PCM_TOOLS_VERSION = 202110 -PCM_TOOLS_SITE = $(call github,opcm,pcm,$(PCM_TOOLS_VERSION)) +# Don't use the github helper, as pcm-tools uses git attributes that are +# replaced when gnerating the archive. +# 93fc9193a70e2f1f054be554c48f4a4791be5032 is the hash of the 202110 tag. +PCM_TOOLS_VERSION = 93fc9193a70e2f1f054be554c48f4a4791be5032 +PCM_TOOLS_SITE = https://github.com/opcm/pcm +PCM_TOOLS_SITE_METHOD = git PCM_TOOLS_LICENSE = BSD-3-Clause PCM_TOOLS_LICENSE_FILES = LICENSE @@ -13,6 +17,14 @@ PCM_TOOLS_EXE_FILES = \ pcm-core pcm-iio pcm-lspci pcm-memory pcm-msr pcm-numa \ pcm-pcicfg pcm-pcie pcm-power pcm-sensor pcm-tsx pcm +# version.h contains git attributes; replace them with the previously-known +# value. +define PCM_TOOLS_FIXUP_VERSION_H + $(SED) 's/\$$Format:%ci ID=%h\$$/2021-10-25 16:07:54 +0200 ID=93fc9193/' \ + $(@D)/version.h +endef +PCM_TOOLS_POST_EXTRACT_HOOKS += PCM_TOOLS_FIXUP_VERSION_H + define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ diff --git a/package/perftest/Config.in b/package/perftest/Config.in index 25cd1a9b8d59..6d291b0f7215 100644 --- a/package/perftest/Config.in +++ b/package/perftest/Config.in @@ -20,7 +20,8 @@ config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS config BR2_PACKAGE_PERFTEST bool "perftest" depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # rdma-core + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # rdma-core depends on !BR2_STATIC_LIBS # rdma-core # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) depends on !BR2_TOOLCHAIN_USES_MUSL diff --git a/package/perl-clone/Config.in b/package/perl-clone/Config.in new file mode 100644 index 000000000000..78f13dfe6b08 --- /dev/null +++ b/package/perl-clone/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_CLONE + bool "perl-clone" + depends on !BR2_STATIC_LIBS + help + recursively copy Perl datatypes. + + https://metacpan.org/release/Clone + +comment "perl-clone needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-clone/perl-clone.hash b/package/perl-clone/perl-clone.hash new file mode 100644 index 000000000000..7b69b97d0655 --- /dev/null +++ b/package/perl-clone/perl-clone.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 cafa8984a2c2e005e54b27dd1e3f0afe Clone-0.46.tar.gz +sha256 aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b Clone-0.46.tar.gz + +# computed by scancpan +sha256 40aa7eb133e97b075024380640528760a54aefc344781741ed02539a375db5ac README.md diff --git a/package/perl-clone/perl-clone.mk b/package/perl-clone/perl-clone.mk new file mode 100644 index 000000000000..9e04329eabd9 --- /dev/null +++ b/package/perl-clone/perl-clone.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-clone +# +################################################################################ + +PERL_CLONE_VERSION = 0.46 +PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz +PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU +PERL_CLONE_LICENSE = Artistic or GPL-1.0+ +PERL_CLONE_LICENSE_FILES = README.md +PERL_CLONE_DISTNAME = Clone + +$(eval $(perl-package)) diff --git a/package/perl-http-cookies/Config.in b/package/perl-http-cookies/Config.in index 3ca461bf8337..147d9521bb74 100644 --- a/package/perl-http-cookies/Config.in +++ b/package/perl-http-cookies/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES bool "perl-http-cookies" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help HTTP cookie jars. https://github.com/libwww-perl/HTTP-Cookies + +comment "perl-http-cookies needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-daemon/Config.in b/package/perl-http-daemon/Config.in index 0c7ffe723aab..4d6277a79961 100644 --- a/package/perl-http-daemon/Config.in +++ b/package/perl-http-daemon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON bool "perl-http-daemon" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_LWP_MEDIATYPES # runtime @@ -7,3 +8,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON A simple http server class. https://github.com/libwww-perl/HTTP-Daemon + +comment "perl-http-daemon needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 82538cfce818..e2cb42f94116 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + depends on !BR2_STATIC_LIBS # perl-clone + select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_IO_HTML # runtime @@ -9,3 +11,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE HTTP style message (base class). https://github.com/libwww-perl/HTTP-Message + +comment "perl-http-message needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-negotiate/Config.in b/package/perl-http-negotiate/Config.in index c519ede2df01..2e82ce5ad27f 100644 --- a/package/perl-http-negotiate/Config.in +++ b/package/perl-http-negotiate/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PERL_HTTP_NEGOTIATE bool "perl-http-negotiate" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help choose a variant to serve. https://metacpan.org/release/HTTP-Negotiate + +comment "perl-http-negotiate needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk index 0663820b2e25..6cbe4b33daa7 100644 --- a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk +++ b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk @@ -9,6 +9,8 @@ PERL_LWP_PROTOCOL_HTTPS_SOURCE = LWP-Protocol-https-$(PERL_LWP_PROTOCOL_HTTPS_VE PERL_LWP_PROTOCOL_HTTPS_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LWP_PROTOCOL_HTTPS_LICENSE = Artistic or GPL-1.0+ PERL_LWP_PROTOCOL_HTTPS_LICENSE_FILES = LICENSE +PERL_LWP_PROTOCOL_HTTPS_CPE_ID_VENDOR = lwp\:\:protocol\:\:https_project +PERL_LWP_PROTOCOL_HTTPS_CPE_ID_PRODUCT = lwp\:\:protocol\:\:https PERL_LWP_PROTOCOL_HTTPS_DISTNAME = LWP-Protocol-https $(eval $(perl-package)) diff --git a/package/perl-plack/Config.in b/package/perl-plack/Config.in index c81ac4a444f6..420f8257e5ee 100644 --- a/package/perl-plack/Config.in +++ b/package/perl-plack/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_PLACK bool "perl-plack" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_APACHE_LOGFORMAT_COMPILER # runtime select BR2_PACKAGE_PERL_COOKIE_BAKER # runtime select BR2_PACKAGE_PERL_DEVEL_STACKTRACE # runtime @@ -19,3 +20,6 @@ config BR2_PACKAGE_PERL_PLACK toolkit). https://github.com/plack/Plack + +comment "perl-plack needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b21023f7303c..983b921e2798 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt -md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz -sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz -sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz.{md5,sha1,sha256}.txt +md5 17946060e6279cf32d08edc92c40efc3 perl-5.36.3.tar.xz +sha1 9949e79c92171b39f4fb2b19ffd4ea293b8dd589 perl-5.36.3.tar.xz +sha256 45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd perl-5.36.3.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash -sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.2/perl-cross-1.5.2.hash +sha256 584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90 perl-cross-1.5.2.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README +sha256 810c97bea10842d2e47bc79e51acdfa1628cfee34fa0d89330f4eb3a44e3def9 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 9be00e1b2c43..71aef9997b0e 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 36 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.4 +PERL_CROSS_VERSION = 1.5.2 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index ab3aecdaa397..6bfaf6640ffe 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1566,13 +1566,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch new file mode 100644 index 000000000000..9b5b9966cd5a --- /dev/null +++ b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch @@ -0,0 +1,94 @@ +From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 12 Apr 2023 13:33:07 +0800 +Subject: [PATCH] xxhash.h: Fix GCC 12 -Og + +Change whether to inline XXH3_hashLong_withSecret to a config option + +Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec + +Signed-off-by: Mingli Yu + +Closes GH-11062. + +Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 + +Signed-off-by: Bernd Kuhls +--- + ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h +index b5bd286496c7..8e816c0584eb 100644 +--- a/ext/hash/xxhash/xxhash.h ++++ b/ext/hash/xxhash/xxhash.h +@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + */ + # define XXH_NO_INLINE_HINTS 0 + ++/*! ++ * @def XXH3_INLINE_SECRET ++ * @brief Determines whether to inline the XXH3 withSecret code. ++ * ++ * When the secret size is known, the compiler can improve the performance ++ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). ++ * ++ * However, if the secret size is not known, it doesn't have any benefit. This ++ * happens when xxHash is compiled into a global symbol. Therefore, if ++ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. ++ * ++ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers ++ * that are *sometimes* force inline on -Og, and it is impossible to automatically ++ * detect this optimization level. ++ */ ++# define XXH3_INLINE_SECRET 0 ++ + /*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. +@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + # endif + #endif + ++#ifndef XXH3_INLINE_SECRET ++# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ ++ || !defined(XXH_INLINE_ALL) ++# define XXH3_INLINE_SECRET 0 ++# else ++# define XXH3_INLINE_SECRET 1 ++# endif ++#endif ++ + #ifndef XXH32_ENDJMP + /* generally preferable for performance */ + # define XXH32_ENDJMP 0 +@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + #endif + ++#if XXH3_INLINE_SECRET ++# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE ++#else ++# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE ++#endif + + + /* ************************************* +@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + */ +-XXH_FORCE_INLINE XXH64_hash_t ++XXH3_WITH_SECRET_INLINE XXH64_hash_t + XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) + { +@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + * It's important for performance to pass @secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + */ +-XXH_FORCE_INLINE XXH128_hash_t ++XXH3_WITH_SECRET_INLINE XXH128_hash_t + XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) diff --git a/package/php/php.hash b/package/php/php.hash index 41aa32615620..4ce3616de3e4 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 49f02d7f2045..81a3d2c4a7b5 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.3 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -84,6 +84,13 @@ else PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no endif +# php has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +PHP_CFLAGS += -marm +endif + PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 5e957a555acb..22d1c7c28e7d 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM - depends on BR2_INSTALL_LIBSTDCPP # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index 4929e5d3d1e9..9d2de6c866de 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -60,7 +60,7 @@ comment "pipewire v4l2 support needs udev and a toolchain w/ headers >= 3.18" endif -comment "pipewire needs a toolchain w/ dynamic library, NTPL, gcc >= 5" +comment "pipewire needs a toolchain w/ dynamic library, NPTL, gcc >= 5" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index ecf4a035ecbb..c3e751498424 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -30,6 +30,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ + -Dvulkan=disabled \ -Dsession-managers=[] \ -Dlegacy-rtkit=false \ -Davb=disabled \ @@ -180,13 +181,6 @@ else PIPEWIRE_CONF_OPTS += -Dlibusb=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) -PIPEWIRE_CONF_OPTS += -Dvulkan=enabled -PIPEWIRE_DEPENDENCIES += mesa3d -else -PIPEWIRE_CONF_OPTS += -Dvulkan=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) PIPEWIRE_CONF_OPTS += -Dpw-cat=enabled -Dsndfile=enabled PIPEWIRE_DEPENDENCIES += libsndfile @@ -222,7 +216,7 @@ else PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled endif -ifeq ($(WEBRTC_AUDIO_PROCESSING),y) +ifeq ($(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing else diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 6e6d787d27e6..37eb974c46cb 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -24,6 +24,13 @@ PIXMAN_CONF_OPTS = \ --disable-loongson-mmi \ --disable-arm-iwmmxt +# Affects only tests, and we don't build tests (see +# 0001-Disable-tests.patch). See +# https://gitlab.freedesktop.org/pixman/pixman/-/issues/76, which says +# "not sure why NVD keeps assigning CVEs like this. This is just a +# test executable". +PIXMAN_IGNORE_CVES += CVE-2023-37769 + # The ARM SIMD code from pixman requires a recent enough ARM core, but # there is a runtime CPU check that makes sure it doesn't get used if # the HW doesn't support it. The only case where the ARM SIMD code diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 666c5ac9718d..2c277f7079e1 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -34,7 +34,10 @@ PKG_COMMON_CARGO_ENV = \ # using nighly features on stable releases, i.e features that are not # yet considered stable. # -# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# CARGO_UNSTABLE_HOST_CONFIG="true" enables the host specific +# configuration feature +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" enables the nightly # configuration option target-applies-to-host value to be set # # CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value @@ -43,9 +46,11 @@ PKG_COMMON_CARGO_ENV = \ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_HOST_CONFIG="true" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc # @@ -53,11 +58,13 @@ PKG_CARGO_ENV = \ # and should be removed when fixed upstream # ifeq ($(NORMALIZED_ARCH),arm) - PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" + PKG_CARGO_ENV += \ + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" endif HOST_PKG_CARGO_ENV = \ - $(PKG_COMMON_CARGO_ENV) + $(PKG_COMMON_CARGO_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and @@ -88,9 +95,22 @@ ifneq ($$($(2)_SUBDIR),) $(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml endif +# Because we append vendored info, we can't rely on the values being empty +# once we eventually get into the generic-package infra. So, we duplicate +# the heuristics here +ifndef $(2)_LICENSE + ifdef $(3)_LICENSE + $(2)_LICENSE = $$($(3)_LICENSE) + endif +endif + # Due to vendoring, it is pretty likely that not all licenses are -# listed in _LICENSE. +# listed in _LICENSE. If the license is unset, it is "unknown" +# so adding unknowns to some unknown is still some other unkown, +# so don't append the blurb in that case. +ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed +endif # Note: in all the steps below, we "cd" into the build directory to # execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the @@ -130,7 +150,6 @@ else # ifeq ($(4),target) define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ @@ -171,7 +190,6 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0718f21aad2e..078470808ea6 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -66,9 +66,7 @@ github = https://github.com/$(1)/$(2)/archive/$(3) gitlab = https://gitlab.com/$(1)/$(2)/-/archive/$(3) # Expressly do not check hashes for those files -# Exported variables default to immediately expanded in some versions of -# make, but we need it to be recursively-epxanded, so explicitly assign it. -export BR_NO_CHECK_HASH_FOR = +BR_NO_CHECK_HASH_FOR = ################################################################################ # DOWNLOAD_URIS - List the candidates URIs where to get the package from: @@ -110,12 +108,13 @@ endif define DOWNLOAD $(Q)mkdir -p $($(2)_DL_DIR) $(Q)$(EXTRA_ENV) $($(2)_DL_ENV) \ + BR_NO_CHECK_HASH_FOR="$(if $(BR2_DOWNLOAD_FORCE_CHECK_HASHES),,$(BR_NO_CHECK_HASH_FOR))" \ flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(2)_DL_VERSION)' \ -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ - -H '$($(2)_HASH_FILE)' \ + $(foreach f,$($(2)_HASH_FILES),-H '$(f)') \ -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9d2..328bf6760e5f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -92,18 +92,8 @@ endif ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the -# proper staging and host directories for the current package: find -# all text files that contain the PPD root, and replace it with the -# current package's PPD. define PPD_FIXUP_PATHS - $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ - |while read -d '' f; do \ - file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ - printf '%s\0' "$${f}"; \ - done \ - |xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' + $(call ppd-fixup-paths,$(PER_PACKAGE_DIR)/$($(PKG)_NAME)) endef # Remove python's pre-compiled "sysconfigdata", as it may contain paths to @@ -519,11 +509,15 @@ else endif $(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) -$(2)_HASH_FILE = \ +$(2)_HASH_FILES = \ $$(strip \ - $$(if $$(wildcard $$($(2)_PKGDIR)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash),\ - $$($(2)_PKGDIR)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash,\ - $$($(2)_PKGDIR)/$$($(2)_RAWNAME).hash)) + $$(foreach d, $$($(2)_PKGDIR) $$(addsuffix /$$($(2)_RAWNAME), $$(call qstrip,$$(BR2_GLOBAL_PATCH_DIR))),\ + $$(if $$(wildcard $$(d)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash),\ + $$(d)/$$($(2)_VERSION)/$$($(2)_RAWNAME).hash,\ + $$(d)/$$($(2)_RAWNAME).hash\ + )\ + )\ + ) ifdef $(3)_OVERRIDE_SRCDIR $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) @@ -1057,17 +1051,17 @@ endif rm -f $$($(2)_TARGET_INSTALL_IMAGES) rm -f $$($(2)_TARGET_INSTALL_HOST) -$(1)-reinstall: $(1)-clean-for-reinstall $(1) +$(1)-reinstall: $(1)-clean-for-reinstall .WAIT $(1) $(1)-clean-for-rebuild: $(1)-clean-for-reinstall rm -f $$($(2)_TARGET_BUILD) -$(1)-rebuild: $(1)-clean-for-rebuild $(1) +$(1)-rebuild: $(1)-clean-for-rebuild .WAIT $(1) $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild rm -f $$($(2)_TARGET_CONFIGURE) -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) +$(1)-reconfigure: $(1)-clean-for-reconfigure .WAIT $(1) # define the PKG variable for all targets, containing the # uppercase package variable prefix @@ -1142,7 +1136,7 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined)) else - $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$(F),$$($(2)_DIR)/$$(F),$$($(2)_HASH_FILES))$$(sep)) endif # license files ifeq ($$($(2)_REDISTRIBUTE),YES) @@ -1230,8 +1224,11 @@ KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) ifneq ($$($(2)_SELINUX_MODULES),) PACKAGES_SELINUX_MODULES += $$($(2)_SELINUX_MODULES) endif + +ifeq ($(BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION),y) PACKAGES_SELINUX_EXTRA_MODULES_DIRS += \ $$(if $$(wildcard $$($(2)_PKGDIR)/selinux),$$($(2)_PKGDIR)/selinux) +endif ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index da9c9a21ac92..8e27602d4110 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -91,9 +91,22 @@ $(2)_DL_ENV += \ GOPROXY=direct \ $$($(2)_GO_ENV) +# Because we append vendored info, we can't rely on the values being empty +# once we eventually get into the generic-package infra. So, we duplicate +# the heuristics here +ifndef $(2)_LICENSE + ifdef $(3)_LICENSE + $(2)_LICENSE = $$($(3)_LICENSE) + endif +endif + # Due to vendoring, it is pretty likely that not all licenses are -# listed in _LICENSE. +# listed in _LICENSE. If the license is unset, it is "unknown" +# so adding unknowns to some unknown is still some other unkown, +# so don't append the blurb in that case. +ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed +endif # Build step. Only define it if not already defined by the package .mk # file. @@ -102,6 +115,7 @@ ifeq ($(4),target) ifeq ($(BR2_STATIC_LIBS),y) $(2)_LDFLAGS += -extldflags '-static' +$(2)_TAGS += osusergo netgo endif # Build package for target diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index fdaddf08dfd3..ccf78692e885 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -50,7 +50,6 @@ $(2)_DEPENDENCIES += qt5base endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) -$(2)_DEPENDENCIES += host-perl $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 0945e6ed318a..723bbe4e246e 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -34,9 +34,9 @@ define KCONFIG_ENABLE_OPT fi endef # KCONFIG_SET_OPT (option, value [, file]) -KCONFIG_SET_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) +KCONFIG_SET_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) # KCONFIG_DISABLE_OPT (option [, file]) -KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) +KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) # Helper functions to determine the name of a package and its # directory from its makefile directory, using the $(MAKEFILE_LIST) @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), @@ -214,10 +218,19 @@ ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) # $1: space-separated list of packages to rsync from # $2: 'host' or 'target' # $3: destination directory +# $4: literal "copy" or "hardlink" to copy or hardlink files from src to dest define per-package-rsync mkdir -p $(3) $(foreach pkg,$(1),\ - rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + rsync -a \ + --hard-links \ + $(if $(filter hardlink,$(4)), \ + --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/, \ + $(if $(filter copy,$(4)), \ + $(empty), \ + $(error per-package-rsync can only "copy" or "hardlink", not "$(4)") \ + ) \ + ) \ $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ $(3)$(sep)) endef @@ -230,8 +243,23 @@ endef # # $1: space-separated list of packages to rsync from define prepare-per-package-directory - $(call per-package-rsync,$(1),host,$(HOST_DIR)) - $(call per-package-rsync,$(1),target,$(TARGET_DIR)) + $(call per-package-rsync,$(1),host,$(HOST_DIR),hardlink) + $(call per-package-rsync,$(1),target,$(TARGET_DIR),hardlink) +endef + +# Ensure files like .la, .pc, .pri, .cmake, and so on, point to the +# proper staging and host directories for the current package: find +# all text files that contain the PPD root, and replace it with the +# current package's PPD. +# $1: destination root directory containing host and staging +define ppd-fixup-paths + $(Q)grep --binary-files=without-match -lrZ '$(PER_PACKAGE_DIR)/[^/]\+/' $(HOST_DIR) \ + |while read -d '' f; do \ + file -b --mime-type "$${f}" | grep -q '^text/' || continue; \ + printf '%s\0' "$${f}"; \ + done \ + |xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(1)/:g' endef endif @@ -256,13 +284,13 @@ define legal-manifest # {HOST|TARGET}, pkg, version, license, license-files, sou echo '"$(2)","$(3)","$(4)","$(5)","$(6)","$(7)","$(8)"' >>$(LEGAL_MANIFEST_CSV_$(1)) endef -define legal-license-file # pkgname, pkgname-pkgver, pkg-hashfile, filename, file-fullpath, {HOST|TARGET} - mkdir -p $(LICENSE_FILES_DIR_$(6))/$(2)/$(dir $(4)) && \ +define legal-license-file # {HOST|TARGET}, pkgname, pkgname-pkgver, filename, file-fullpath, pkg-hashfiles + mkdir -p $(LICENSE_FILES_DIR_$(1))/$(3)/$(dir $(4)) && \ { \ - support/download/check-hash $(3) $(5) $(4); \ + support/download/check-hash $(5) $(4) $(6); \ case $${?} in (0|3) ;; (*) exit 1;; esac; \ } && \ - cp $(5) $(LICENSE_FILES_DIR_$(6))/$(2)/$(4) + cp $(5) $(LICENSE_FILES_DIR_$(1))/$(3)/$(4) endef non-virtual-deps = $(foreach p,$(1),$(if $($(call UPPERCASE,$(p))_IS_VIRTUAL),,$(p))) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index e9587fae6b2c..1d73b691e173 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -5,7 +5,7 @@ ################################################################################ PKGCONF_VERSION = 1.6.3 -PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf +PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING diff --git a/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch deleted file mode 100644 index ba2f073a5959..000000000000 --- a/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001 -From: Hernan Martinez -Date: Tue, 16 Aug 2022 23:07:25 -0500 -Subject: [PATCH] Fix optional JSON support for MySQL (#3753) - -* Fix optional JSON support for MySQL - -* Fix optional JSON support for MySQLTest ---- - Data/MySQL/src/ResultMetadata.cpp | 2 ++ - Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp -index 61b49dd54..adb5dae84 100644 ---- a/Data/MySQL/src/ResultMetadata.cpp -+++ b/Data/MySQL/src/ResultMetadata.cpp -@@ -133,8 +133,10 @@ namespace - case MYSQL_TYPE_LONG_BLOB: - case MYSQL_TYPE_BLOB: - return Poco::Data::MetaColumn::FDT_BLOB; -+#ifdef POCO_MYSQL_JSON - case MYSQL_TYPE_JSON: - return Poco::Data::MetaColumn::FDT_JSON; -+#endif - default: - return Poco::Data::MetaColumn::FDT_UNKNOWN; - } -diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp -index 80a3683b1..2a286d35e 100644 ---- a/Data/MySQL/testsuite/src/MySQLTest.cpp -+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp -@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite() - CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); - CppUnit_addTest(pSuite, MySQLTest, testLongBLOB); - CppUnit_addTest(pSuite, MySQLTest, testLongTEXT); -+#ifdef POCO_MYSQL_JSON - CppUnit_addTest(pSuite, MySQLTest, testJSON); -+#endif - CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts); - CppUnit_addTest(pSuite, MySQLTest, testFloat); - CppUnit_addTest(pSuite, MySQLTest, testDouble); --- -2.37.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index 820e6319662b..1ba513f22790 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -116,8 +116,8 @@ config BR2_PACKAGE_POCO_ZIP endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/package/poco/poco.hash b/package/poco/poco.hash index eea3e2494a6a..0a1e900b3fb1 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index d078faa8e535..7b4e7afaa98c 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.2 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -57,13 +57,7 @@ ifeq ($(BR2_SOFT_FLOAT),y) POCO_CONF_OPTS += --no-fpenvironment endif -ifeq ($(BR2_STATIC_LIBS),y) -POCO_MAKE_TARGET = static_release -else ifeq ($(BR2_SHARED_LIBS),y) POCO_MAKE_TARGET = shared_release -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -POCO_MAKE_TARGET = all_release -endif POCO_LDFLAGS=$(TARGET_LDFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -74,7 +68,6 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ - --cflags=-std=c++14 \ --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ diff --git a/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch new file mode 100644 index 000000000000..478759e0ccf2 --- /dev/null +++ b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch @@ -0,0 +1,45 @@ +From e5cc11e0b5b867f4705fd28ff1b981c1224be1cd Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 17 May 2023 22:42:05 +0200 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +Upstream: https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe +[Thomas: backported to fix CVE-2023-34872] +Signed-off-by: Thomas Petazzoni +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb49..4c68be99 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid + // Copyright (C) 2009 Nick Jones + // Copyright (C) 2016 Jason Crain + // Copyright (C) 2017 Adrian Johnson +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector(); ++ } + } + } + +-- +2.41.0 + diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 93681e04af28..bb07b2ee6af3 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04e40fad924a6de62e63017a6fd4c04696c1f526dedc2ba5ef275cedf646292a poppler-22.10.0.tar.xz +sha256 d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 poppler-22.12.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 02ccf742acdd..776fb4d5667f 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,13 +4,15 @@ # ################################################################################ -POPPLER_VERSION = 22.10.0 +POPPLER_VERSION = 22.12.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = https://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_CPE_ID_VENDOR = freedesktop +# 0001-OutlineItem-open-Fix-crash-on-malformed-files.patch +POPPLER_IGNORE_CVES += CVE-2023-34872 POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = \ @@ -47,7 +49,8 @@ POPPLER_DEPENDENCIES += gobject-introspection POPPLER_CONF_OPTS += \ -DENABLE_GOBJECT_INTROSPECTION=ON \ -DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \ - -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler + -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 4148180adfec..8d0eedddf1ed 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -11,8 +11,6 @@ POSTGIS_MAKE = $(MAKE1) POSTGIS_LICENSE = GPL-2.0+ (PostGIS), BSD-2-Clause, MIT, Apache-2.0, ISC, BSL-1.0, CC-BY-SA-3.0 POSTGIS_LICENSE_FILES = LICENSE.TXT POSTGIS_CPE_ID_VENDOR = postgis -# configure.ac is patched so need to run autoreconf -POSTGIS_AUTORECONF = YES POSTGIS_DEPENDENCIES = postgresql libgeos proj libxml2 diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 3e89d3ec3503..03409d6135c0 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 -sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.6/postgresql-15.6.tar.bz2.sha256 +sha256 8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb postgresql-15.6.tar.bz2 # License file, Locally calculated -sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT +sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index a2aed9a2eb79..da37affe7b3d 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.2 +POSTGRESQL_VERSION = 15.6 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -19,6 +19,10 @@ POSTGRESQL_CONF_ENV = \ POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# CVE-2017-8806 is related to postgresql-common package +# It is false positive for postgresql +POSTGRESQL_IGNORE_CVES += CVE-2017-8806 + # https://www.postgresql.org/docs/11/static/install-procedure.html: # "If you want to invoke the build from another makefile rather than # manually, you must unset MAKELEVEL or set it to zero" @@ -83,6 +87,13 @@ else POSTGRESQL_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_ICU),y) +POSTGRESQL_DEPENDENCIES += icu +POSTGRESQL_CONF_OPTS += --with-icu +else +POSTGRESQL_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) POSTGRESQL_DEPENDENCIES += libxml2 POSTGRESQL_CONF_OPTS += --with-libxml diff --git a/package/powertop/Config.in b/package/powertop/Config.in index 0f323a7bfb9b..fd88a3d0eb6d 100644 --- a/package/powertop/Config.in +++ b/package/powertop/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_POWERTOP depends on BR2_TOOLCHAIN_HAS_THREADS # libnl depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_PCIUTILS select BR2_PACKAGE_LIBNL help A tool to diagnose issues with power consumption and power diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index c3e8d2549c37..e035868fa94b 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -6,10 +6,16 @@ POWERTOP_VERSION = 2.13 POWERTOP_SITE = https://01.org/sites/default/files/downloads -POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \ - $(TARGET_NLS_DEPENDENCIES) POWERTOP_LICENSE = GPL-2.0 POWERTOP_LICENSE_FILES = COPYING + +POWERTOP_DEPENDENCIES = \ + host-pkgconf \ + libnl \ + ncurses \ + $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ + $(TARGET_NLS_DEPENDENCIES) + POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0001-dont-force-stack-smashing-protection.patch POWERTOP_AUTORECONF = YES diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index d9d6244f103c..25d017a84f29 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -37,15 +37,6 @@ PPPD_DEPENDENCIES += libpcap PPPD_MAKE_OPTS += FILTER=y endif -# pppd bundles some but not all of the needed kernel headers. The embedded -# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34, -# and has been part of the kernel headers since 2.6.23, so drop it -define PPPD_DROP_INTERNAL_IF_PPOL2TP_H - $(RM) $(@D)/include/linux/if_pppol2tp.h -endef - -PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H - # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is # definitely not useful since the C library only uses # /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf diff --git a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch new file mode 100644 index 000000000000..e04d191ce007 --- /dev/null +++ b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch @@ -0,0 +1,30 @@ +From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Mar 2024 12:36:31 +0100 +Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are + installed as root + +... as this can be considered acceptable when cross-compiling +Privoxy inside an autobuilder with only a root user. + +Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32 +Signed-off-by: Fabrice Fontaine +--- + GNUmakefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index 04cceb15..cf79aae1 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ +- exit 1 ;\ + fi ;\ + else \ + GROUP_T=$(GROUP) ;\ +-- +2.39.2 + diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index f950f26b8601..5a7d153a3102 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 proftpd-1.3.8.tar.gz +sha256 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 proftpd-1.3.8b.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 398155222d73..0820822e1788 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.8 +PROFTPD_VERSION = 1.3.8b PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING diff --git a/package/protozero/Config.in b/package/protozero/Config.in index 19048dfe8da0..e6347e6f7f3a 100644 --- a/package/protozero/Config.in +++ b/package/protozero/Config.in @@ -16,5 +16,5 @@ config BR2_PACKAGE_PROTOZERO https://github.com/mapbox/protozero -comment "protozero needs a toolchain w/ C++, gcc >= 4.7" +comment "protozero needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index 138b05ebb400..b2be59fff459 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -10,7 +10,6 @@ PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING PURE_FTPD_CPE_ID_VENDOR = pureftpd -PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) PURE_FTPD_CONF_OPTS = \ --with-altlog \ diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch new file mode 100644 index 000000000000..d2abcb64cf77 --- /dev/null +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch @@ -0,0 +1,41 @@ +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Mar 2024 20:37:33 +0100 +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build + +Build on uclibc is broken since version 0.75 and commit +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used +even if is not available: + +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; + | ^~~~~~~~~ + +To fix this build failure, include + +Fixes: + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f + +Upstream: Rejected after sending to Simon Tatham +Signed-off-by: Fabrice Fontaine +--- + unix/utils/arm_arch_queries.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h +index fa46c622..5cce7f31 100644 +--- a/unix/utils/arm_arch_queries.h ++++ b/unix/utils/arm_arch_queries.h +@@ -18,6 +18,8 @@ + + #if defined __arm__ || defined __aarch64__ + ++#include ++ + #if HAVE_SYS_TYPES_H + #include + #endif +-- +2.43.0 + diff --git a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch b/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch deleted file mode 100644 index 78cef8b908be..000000000000 --- a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3f30f3a7e3f07f5ca3cef0f405b02e22a018c6e4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 9 May 2021 15:22:29 +0200 -Subject: [PATCH] unix/uxutils.h: fix build on uclibc - -Build on uclibc is broken since version 0.75 and commit -65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used -even if is not available: - -unix/uxutils.c: In function 'platform_aes_hw_available': -unix/uxutils.c:13:22: error: 'AT_HWCAP2' undeclared (first use in this function) - 13 | return getauxval(AT_HWCAP2) & HWCAP2_AES; - | ^~~~~~~~~ - -To fix this build failure, include - -Fixes: - - http://autobuild.buildroot.org/results/726f7c5ce13e78ed91e827b872e9d7ccfa13f298 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to Simon Tatham ] ---- - unix/uxutils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/unix/uxutils.h b/unix/uxutils.h -index c9acff53..b80bf972 100644 ---- a/unix/uxutils.h -+++ b/unix/uxutils.h -@@ -18,6 +18,8 @@ - - #if defined __arm__ || defined __aarch64__ - -+#include -+ - #ifdef HAVE_SYS_TYPES_H - #include - #endif --- -2.30.2 - diff --git a/package/putty/Config.in b/package/putty/Config.in index cd8b3bb2132d..f89283b99ae7 100644 --- a/package/putty/Config.in +++ b/package/putty/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_PUTTY depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR help - PuTTY is a free SSH and Telnet client. Without GTK2 + PuTTY is a free SSH and Telnet client. Without GTK2 or GTK3 activated, only the commandline tools plink, pscp, psftp, - and puttygen are built; enable GTK2 for the graphical - client. + and puttygen are built; enable GTK2 or GTK3 for the + graphical client. http://www.chiark.greenend.org.uk/~sgtatham/putty/ diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 861d45cb769d..84569a31e52d 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,8 +1,7 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.76/{md5,sha1,sha256,sha512}sums -md5 9d22f8c56c1eaa1c0af3098438f25908 putty-0.76.tar.gz -sha1 de09f50aee330eb05ad0cb81b970d0cc8e5c9b25 putty-0.76.tar.gz -sha256 547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f putty-0.76.tar.gz -sha512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25 putty-0.76.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.80/{sha1,sha256,sha512}sums +sha1 9c4a96f63ee3e927472191c935cc89228693c03a putty-0.80.tar.gz +sha256 2013c83a721b1753529e9090f7c3830e8fe4c80a070ccce764539badb3f67081 putty-0.80.tar.gz +sha512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90 putty-0.80.tar.gz # Locally calculated -sha256 3f3e870dd3d0867d79370b1d433602c60bb91b59de04e5d8f2a149b788530d53 LICENCE +sha256 7ede37f344ee03436c155a375ecb6cdb42a77105baa6e7804bf43260dc4a0c54 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index e57a78be9615..bff6e7807479 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,18 +4,22 @@ # ################################################################################ -PUTTY_VERSION = 0.76 +PUTTY_VERSION = 0.80 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE PUTTY_CPE_ID_VENDOR = putty -PUTTY_CONF_OPTS = --disable-gtktest +PUTTY_DEPENDENCIES = host-pkgconf +PUTTY_CONF_OPTS = -DPUTTY_GSSAPI=OFF -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -PUTTY_CONF_OPTS += --with-gtk=2 +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +PUTTY_DEPENDENCIES += libgtk3 +else ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_DEPENDENCIES += libgtk2 -else -PUTTY_CONF_OPTS += --without-gtk endif -$(eval $(autotools-package)) +ifeq ($(BR2_STATIC_LIBS),y) +PUTTY_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNO_LIBDL" +endif + +$(eval $(cmake-package)) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 8b0b15f13b17..8944b5f77fcc 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) diff --git a/package/python-asttokens/Config.in b/package/python-asttokens/Config.in new file mode 100644 index 000000000000..2732b8124bce --- /dev/null +++ b/package/python-asttokens/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ASTTOKENS + bool "python-asttokens" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Annotate AST trees with source code positions. + + https://github.com/gristlabs/asttokens diff --git a/package/python-asttokens/python-asttokens.hash b/package/python-asttokens/python-asttokens.hash new file mode 100644 index 000000000000..6529e4db412e --- /dev/null +++ b/package/python-asttokens/python-asttokens.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asttokens/json +md5 a9ae6ae0f85398e511bcb9ec87695eed asttokens-2.2.1.tar.gz +sha256 4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3 asttokens-2.2.1.tar.gz +# Locally computed sha256 checksums +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/python-asttokens/python-asttokens.mk b/package/python-asttokens/python-asttokens.mk new file mode 100644 index 000000000000..8a8ce1ddd92d --- /dev/null +++ b/package/python-asttokens/python-asttokens.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-asttokens +# +################################################################################ + +PYTHON_ASTTOKENS_VERSION = 2.2.1 +PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz +PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/c8/e3/b0b4f32162621126fbdaba636c152c6b6baec486c99f48686e66343d638f +PYTHON_ASTTOKENS_SETUP_TYPE = setuptools +PYTHON_ASTTOKENS_LICENSE = Apache-2.0 +PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE + +PYTHON_ASTTOKENS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 5d21e29d88fe..68a9ffca71ba 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime diff --git a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch new file mode 100644 index 000000000000..837f2804d2c9 --- /dev/null +++ b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch @@ -0,0 +1,101 @@ +From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001 +From: Serhii Abarovskyi +Date: Tue, 9 May 2023 18:33:54 +0300 +Subject: [PATCH] Use setuptools-scm v7+ for building the dists + +Since version 7, setuptools-scm has native support for git archive, +so the setuptools-scm-git-archive project is obsolete +and this patch removes it from the build dependencies. +Close #515 + +Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 +Signed-off-by: Fabrice Fontaine +--- + .git_archival.txt | 3 +++ + pyproject.toml | 3 +-- + requirements/dist-build-constraints.in | 3 +-- + requirements/dist-build-constraints.txt | 16 +++++++--------- + setup.cfg | 3 +-- + 5 files changed, 13 insertions(+), 15 deletions(-) + +diff --git a/.git_archival.txt b/.git_archival.txt +index 95cb3eea4e..3994ec0a83 100644 +--- a/.git_archival.txt ++++ b/.git_archival.txt +@@ -1 +1,4 @@ ++node: $Format:%H$ ++node-date: $Format:%cI$ ++describe-name: $Format:%(describe:tags=true)$ + ref-names: $Format:%D$ +diff --git a/pyproject.toml b/pyproject.toml +index b1e5f60a80..88df57dcc1 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -6,8 +6,7 @@ requires = [ + "setuptools>=34.4", + + # Plugins +- "setuptools_scm[toml]>=3.5", +- "setuptools_scm_git_archive>=1.1", ++ "setuptools-scm >= 7.0.0", + ] + build-backend = "setuptools.build_meta" + +diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in +index 26b57228a9..a37baef1a9 100644 +--- a/requirements/dist-build-constraints.in ++++ b/requirements/dist-build-constraints.in +@@ -5,8 +5,7 @@ + setuptools >= 34.4 + + # Plugins +-setuptools_scm[toml] >= 3.5 +-setuptools_scm_git_archive >= 1.1 ++setuptools-scm[toml] >= 7.0.0 + + # Dynamic (coming from setuptools' PEP 517 build backend) + wheel +diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt +index 525f2be30f..8bd4343ff6 100644 +--- a/requirements/dist-build-constraints.txt ++++ b/requirements/dist-build-constraints.txt +@@ -1,18 +1,16 @@ + # +-# This file is autogenerated by pip-compile with python 3.10 +-# To update, run: ++# This file is autogenerated by pip-compile with Python 3.10 ++# by the following command: + # + # pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in + # +-packaging==21.3 ++packaging==23.1 + # via setuptools-scm +-pyparsing==3.0.6 +- # via packaging +-setuptools-scm==6.3.2 ++setuptools-scm==7.1.0 + # via -r requirements/dist-build-constraints.in +-setuptools-scm-git-archive==1.1 +- # via -r requirements/dist-build-constraints.in +-tomli==2.0.0 ++tomli==2.0.1 ++ # via setuptools-scm ++typing-extensions==4.6.3 + # via setuptools-scm + wheel==0.37.1 + # via -r requirements/dist-build-constraints.in +diff --git a/setup.cfg b/setup.cfg +index 1f2b08f4c3..900c7b4feb 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -64,8 +64,7 @@ include_package_data = True + packages = find: + include_package_data = True + setup_requires = +- setuptools_scm>=1.15.0 +- setuptools_scm_git_archive>=1.0 ++ setuptools_scm >= 7.0.0 + install_requires = + importlib_metadata; python_version < '3.8' + more_itertools >= 2.6 diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index f75065c7da6b..571584d09816 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -10,6 +10,6 @@ PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/8c/e7/8e6387d59a35 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools -PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm host-python-setuptools-scm-git-archive +PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 8fc38f61a6b8..e090501056ad 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz +sha256 44696b92bea2b44c1d0bf2828477dddeb3b4dfb312ad82ce06d7b704c0985e27 python-configshell-fb-1.1.30.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index d0dd421e8dad..3446a86e8dbe 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.30 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index a23944a06f68..e08301475005 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz +sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a130b2d10d96..67aa20742dd2 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD diff --git a/package/python-dbus-fast/Config.in b/package/python-dbus-fast/Config.in index c9562fecfa01..b7168106d7a0 100644 --- a/package/python-dbus-fast/Config.in +++ b/package/python-dbus-fast/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DBUS_FAST bool "python-dbus-fast" select BR2_PACKAGE_HOST_PYTHON_CYTHON select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime help A faster version of dbus-next, a DBus library for Python with asyncio support. diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 5830cadc93d0..c236a6dc0b47 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime help diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index cb03b33bfe82..ca678327c828 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz -sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz +md5 33dc961e25b6ed54e22b62726b334d4d Django-4.2.11.tar.gz +sha256 6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4 Django-4.2.11.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index e8c91cf51f42..1647fc0593f4 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.7 +PYTHON_DJANGO_VERSION = 4.2.11 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 - +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/d2/e2/c0e7586dd4db1140be179b1386346d1b2e2570dfc7c0d1c0343bdf0d43b0 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index b2296f42eb92..ae5a7a518190 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 0a71e1a78bb8..a8b3cbc1d6b4 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa064 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) diff --git a/package/python-executing/Config.in b/package/python-executing/Config.in new file mode 100644 index 000000000000..e1f8f8efdf2a --- /dev/null +++ b/package/python-executing/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_EXECUTING + bool "python-executing" + help + Get the currently executing AST node of a frame, and other + information. + + https://github.com/alexmojaki/executing diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash new file mode 100644 index 000000000000..40fd43b5fd46 --- /dev/null +++ b/package/python-executing/python-executing.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/executing/json +md5 e6fa9a6abf00555ccc8a6b3524729238 executing-1.2.0.tar.gz +sha256 19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 executing-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-executing/python-executing.mk b/package/python-executing/python-executing.mk new file mode 100644 index 000000000000..4c968323ea6d --- /dev/null +++ b/package/python-executing/python-executing.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-executing +# +################################################################################ + +PYTHON_EXECUTING_VERSION = 1.2.0 +PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8f/ac/89ff37d8594b0eef176b7cec742ac868fef853b8e18df0309e3def9f480b +PYTHON_EXECUTING_SETUP_TYPE = setuptools +PYTHON_EXECUTING_LICENSE = MIT +PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt + +PYTHON_EXECUTING_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index fb747bc00e76..1e419348b92c 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -10,5 +10,7 @@ PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/28/5b/0d1f0296485 PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE +PYTHON_GUNICORN_CPE_ID_VENDOR = gunicorn +PYTHON_GUNICORN_CPE_ID_PRODUCT = gunicorn $(eval $(python-package)) diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 3cf534d05518..4b581c1001d3 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -10,5 +10,7 @@ PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE +PYTHON_HPACK_CPE_ID_VENDOR = python +PYTHON_HPACK_CPE_ID_PRODUCT = hpack $(eval $(python-package)) diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 84229eabd060..320ef01c7aff 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -10,5 +10,7 @@ PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/ac/b6/b55c3f49042 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools +PYTHON_HTML5LIB_CPE_ID_VENDOR = html5lib +PYTHON_HTML5LIB_CPE_ID_PRODUCT = html5lib $(eval $(python-package)) diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk index e76987d1e954..9f00cf73875a 100644 --- a/package/python-iniparse/python-iniparse.mk +++ b/package/python-iniparse/python-iniparse.mk @@ -10,6 +10,9 @@ PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse PYTHON_INIPARSE_LICENSE = Python-2.0, MIT PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE PYTHON_INIPARSE_SETUP_TYPE = setuptools +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_INIPARSE_DEPENDENCIES = host-python-six $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 0ccf064217db..9cb4285ec342 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -15,6 +15,7 @@ define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py + sed -i "s%os.environ.get('IPTABLES_LIBDIR', None)%\"/usr/lib\"%" $(@D)/iptc/util.py endef PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 3de49ae57420..c217efcfd1ee 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime @@ -7,6 +8,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime + select BR2_PACKAGE_PYTHON_STACK_DATA # runtime select BR2_PACKAGE_PYTHON_TRAITLETS # runtime help IPython is a command shell for interactive computing in diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index f5a114c2f308..aa274314eb9a 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -11,6 +11,8 @@ PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython PYTHON_IPYTHON_CPE_ID_PRODUCT = ipython +# Affects only Windows. Can be dropped once we update to >= 8.10.0 +PYTHON_IPYTHON_IGNORE_CVES += CVE-2023-24816 PYTHON_IPYTHON_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 071106605fae..366f8d90fd45 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -9,6 +9,8 @@ PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/fd/78/4cdc5927d5f3c3c86c4da0108c2eeba544cd67e773232164d59f3e442ff0 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project +PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools PYTHON_LMDB_DEPENDENCIES = host-python-cffi diff --git a/package/python-mako/Config.in b/package/python-mako/Config.in index 442e290efa44..7bba31943e4c 100644 --- a/package/python-mako/Config.in +++ b/package/python-mako/Config.in @@ -1,8 +1,27 @@ config BR2_PACKAGE_PYTHON_MAKO bool "python-mako" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help Mako is a template library written in Python. It provides a familiar, non-XML syntax which compiles into Python modules for maximum performance. https://pypi.python.org/pypi/Mako + +if BR2_PACKAGE_PYTHON_MAKO + +config BR2_PACKAGE_PYTHON_MAKO_EXT_PYGMENTPLUGIN + bool "mako extension pygmentplugin" + select BR2_PACKAGE_PYTHON_PYGMENTS # runtime + help + Provide python-pygments support for + mako.ext.pygmentplugin + +config BR2_PACKAGE_PYTHON_MAKO_EXT_BABELPLUGIN + bool "mako extension babelplugin" + select BR2_PACKAGE_PYTHON_BABEL # runtime + help + Provide python-babel support for + mako.ext.babelplugin + +endif diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2fb..7764f32f62da 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -10,6 +10,8 @@ PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +PYTHON_MAKO_CPE_ID_VENDOR = sqlalchemy +PYTHON_MAKO_CPE_ID_PRODUCT = mako # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b93677766274..8a9281b8e7fa 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_QHULL diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 812bfdae4ae2..fda42e7d9dfa 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = \ numpy/core/include/numpy/libdivide/LICENSE.txt \ numpy/linalg/lapack_lite/LICENSE.txt \ tools/npy_tempita/license.txt +PYTHON_NUMPY_CPE_ID_VENDOR = numpy +PYTHON_NUMPY_CPE_ID_PRODUCT = numpy PYTHON_NUMPY_SETUP_TYPE = setuptools PYTHON_NUMPY_DEPENDENCIES = host-python-cython diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 1e49487d6aee..eb0ccbf46fce 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -10,5 +10,7 @@ PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf40010379 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE +PYTHON_OAUTHLIB_CPE_ID_VENDOR = oauthlib_project +PYTHON_OAUTHLIB_CPE_ID_PRODUCT = oauthlib $(eval $(python-package)) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 52c5d5117eb1..5a166f2f067f 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -10,5 +10,7 @@ PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING +PYTHON_OPCUA_ASYNCIO_CPE_ID_VENDOR = freeopcua +PYTHON_OPCUA_ASYNCIO_CPE_ID_PRODUCT = opcua-asyncio $(eval $(python-package)) diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 8cf3aaa3ecec..fdcb113f0cfb 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -12,5 +12,8 @@ PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt PYTHON_PIP_CPE_ID_VENDOR = pypa PYTHON_PIP_CPE_ID_PRODUCT = pip +# Disputed CVE: things work as designed, and only affects the +# --extra-index-url option. This CVE will never be fixed. +PYTHON_PIP_IGNORE_CVES += CVE-2018-20225 $(eval $(python-package)) diff --git a/package/python-pure-eval/Config.in b/package/python-pure-eval/Config.in new file mode 100644 index 000000000000..f6ccd6056dc1 --- /dev/null +++ b/package/python-pure-eval/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PURE_EVAL + bool "python-pure-eval" + help + Safely evaluate AST nodes without side effects. + + http://github.com/alexmojaki/pure_eval diff --git a/package/python-pure-eval/python-pure-eval.hash b/package/python-pure-eval/python-pure-eval.hash new file mode 100644 index 000000000000..5bf5dcb749cf --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pure_eval/json +md5 212fd27ca2c58d9effddec69748d738a pure_eval-0.2.2.tar.gz +sha256 2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 pure_eval-0.2.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-pure-eval/python-pure-eval.mk b/package/python-pure-eval/python-pure-eval.mk new file mode 100644 index 000000000000..f139ea270fcb --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pure-eval +# +################################################################################ + +PYTHON_PURE_EVAL_VERSION = 0.2.2 +PYTHON_PURE_EVAL_SOURCE = pure_eval-$(PYTHON_PURE_EVAL_VERSION).tar.gz +PYTHON_PURE_EVAL_SITE = https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd +PYTHON_PURE_EVAL_SETUP_TYPE = setuptools +PYTHON_PURE_EVAL_LICENSE = MIT +PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt + +PYTHON_PURE_EVAL_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index b566bdd066dc..1c927357fe5d 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -12,6 +12,8 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +PYTHON_PYCRYPTODOMEX_CPE_ID_VENDOR = pycryptodome +PYTHON_PYCRYPTODOMEX_CPE_ID_PRODUCT = pycryptodomex $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 512b2f857f0a..53e4a15c4f5e 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -12,4 +12,10 @@ PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu PYTHON_PYICU_SETUP_TYPE = setuptools +PYTHON_PYICU_ENV += \ + ICU_VERSION="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --modversion`" \ + PYICU_CFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --variable=CXXFLAGS`" \ + PYICU_LFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-L` \ + `$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-l`" + $(eval $(python-package)) diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk index dc68de83b3ed..077c60c09326 100644 --- a/package/python-pylibfdt/python-pylibfdt.mk +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -11,5 +11,7 @@ PYTHON_PYLIBFDT_SETUP_TYPE = setuptools PYTHON_PYLIBFDT_LICENSE = BSD-2-Clause or GPL-2.0+ PYTHON_PYLIBFDT_LICENSE_FILES = BSD-2-Clause GPL PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig +HOST_PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index b3f9565238fb..ecaa5496b513 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 70448e8d906d..03fc8bc4fbb9 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -12,7 +12,7 @@ PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 60f54a5484db..430bf204a18a 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted depends on BR2_USE_WCHAR select BR2_PACKAGE_PARTED help @@ -8,5 +9,6 @@ config BR2_PACKAGE_PYTHON_PYPARTED https://github.com/rhinstaller/pyparted -comment "pyparted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "pyparted needs a toolchain w/ locale, wchar, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/python-pysmb/Config.in b/package/python-pysmb/Config.in index 61d7c2a03e4d..bb935dddf170 100644 --- a/package/python-pysmb/Config.in +++ b/package/python-pysmb/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_PYSMB bool "python-pysmb" depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON_PYASN1 + select BR2_PACKAGE_PYTHON_TQDM help pysmb is an experimental SMB/CIFS library written in Python. It implements the client-side SMB/CIFS protocol (SMB1 and diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 1383e680d52f..c4aeabb25da7 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 796ea875cdae283529c03b9203d9c454 requests-2.28.1.tar.gz -sha256 7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 requests-2.28.1.tar.gz +md5 941e175c276cd7d39d098092c56679a4 requests-2.31.0.tar.gz +sha256 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 requests-2.31.0.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 7a21cca52c35..2c74db37113f 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.28.1 +PYTHON_REQUESTS_VERSION = 2.31.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/a5/61/a867851fd5ab77277495a8709ddda0861b28163c4613b011bc00228cc724 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index 3c2e39fffd11..39c390edb268 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz +sha256 ac15c113d09209c7b0d14d94a12ed88205a7c2feadd1096f573049fd737f7e74 python-rtslib-fb-2.1.76.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 09bde874f0b5..6396d26a3f54 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.74 +PYTHON_RTSLIB_FB_VERSION = 2.1.76 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 diff --git a/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch b/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch new file mode 100644 index 000000000000..17c3e05314c0 --- /dev/null +++ b/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch @@ -0,0 +1,66 @@ +From e8bbb7844c141b339ef0598decf2a808faa50f5e Mon Sep 17 00:00:00 2001 +From: Ralf Dragon +Date: Sun, 17 Dec 2023 22:55:17 +0100 +Subject: [PATCH] siplib: fix build with python >= 3.11 + +With python 3.11, the PyFrameObject structure members have been +removed from the public C API: + +https://docs.python.org/3.11/whatsnew/3.11.html#whatsnew311-c-api-porting +https://docs.python.org/3.11/whatsnew/3.11.html#pyframeobject-3-11-hiding + +This patch migrates to the opaque PyFrameObject. + +Upstream: Not Applicable, SIP 4.x is no longer maintained +Signed-off-by: Ralf Dragon +--- + siplib/sip.h | 2 +- + siplib/siplib.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/siplib/sip.h b/siplib/sip.h +index 251b122..b9d8ea2 100644 +--- a/siplib/sip.h ++++ b/siplib/sip.h +@@ -1799,7 +1799,7 @@ typedef struct _sipAPIDef { + int (*api_get_time)(PyObject *, sipTimeDef *); + PyObject *(*api_from_time)(const sipTimeDef *); + int (*api_is_user_type)(const sipWrapperType *); +- struct _frame *(*api_get_frame)(int); ++ PyFrameObject *(*api_get_frame)(int); + int (*api_check_plugin_for_type)(const sipTypeDef *, const char *); + PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **); + void (*api_unicode_write)(int, void *, int, unsigned); +diff --git a/siplib/siplib.c b/siplib/siplib.c +index db52b68..a297855 100644 +--- a/siplib/siplib.c ++++ b/siplib/siplib.c +@@ -448,7 +448,7 @@ static PyObject *sip_api_from_datetime(const sipDateDef *date, + static int sip_api_get_time(PyObject *obj, sipTimeDef *time); + static PyObject *sip_api_from_time(const sipTimeDef *time); + static int sip_api_is_user_type(const sipWrapperType *wt); +-static struct _frame *sip_api_get_frame(int); ++static PyFrameObject *sip_api_get_frame(int); + static int sip_api_check_plugin_for_type(const sipTypeDef *td, + const char *name); + static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar, +@@ -13741,13 +13741,13 @@ static int sip_api_is_user_type(const sipWrapperType *wt) + /* + * Return a frame from the execution stack. + */ +-static struct _frame *sip_api_get_frame(int depth) ++static PyFrameObject *sip_api_get_frame(int depth) + { +- struct _frame *frame = PyEval_GetFrame(); ++ PyFrameObject *frame = PyEval_GetFrame(); + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ frame = PyFrame_GetBack(frame); + --depth; + } + +-- +2.43.0 + diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 23b1338e496c..48b1a2482208 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -10,5 +10,7 @@ PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b6 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project +PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse $(eval $(python-package)) diff --git a/package/python-stack-data/Config.in b/package/python-stack-data/Config.in new file mode 100644 index 000000000000..508eb9cf132a --- /dev/null +++ b/package/python-stack-data/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_STACK_DATA + bool "python-stack-data" + select BR2_PACKAGE_PYTHON_ASTTOKENS # runtime + select BR2_PACKAGE_PYTHON_EXECUTING # runtime + select BR2_PACKAGE_PYTHON_PURE_EVAL # runtime + help + Extract data from python stack frames and tracebacks + for informative displays. + + http://github.com/alexmojaki/stack_data diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash new file mode 100644 index 000000000000..6decd3ca8eb9 --- /dev/null +++ b/package/python-stack-data/python-stack-data.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/stack_data/json +md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz +sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk new file mode 100644 index 000000000000..494ce8f4546d --- /dev/null +++ b/package/python-stack-data/python-stack-data.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-stack-data +# +################################################################################ + +PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SETUP_TYPE = setuptools +PYTHON_STACK_DATA_LICENSE = MIT +PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch new file mode 100644 index 000000000000..357c6f2f129c --- /dev/null +++ b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch @@ -0,0 +1,42 @@ +From ac79778c91bd9a4a92111f7e06d4b12674571113 Mon Sep 17 00:00:00 2001 +From: Ben Darnell +Date: Sat, 13 May 2023 20:58:52 -0400 +Subject: [PATCH] web: Fix an open redirect in StaticFileHandler + +Under some configurations the default_filename redirect could be exploited +to redirect to an attacker-controlled site. This change refuses to redirect +to URLs that could be misinterpreted. + +A test case for the specific vulnerable configuration will follow after the +patch has been available. + +Upstream: https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f +[Thomas: backported to fix CVE-2023-28370] +Signed-off-by: Thomas Petazzoni +--- + tornado/web.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/tornado/web.py b/tornado/web.py +index cd6a81b4..05b571eb 100644 +--- a/tornado/web.py ++++ b/tornado/web.py +@@ -2806,6 +2806,15 @@ class StaticFileHandler(RequestHandler): + # but there is some prefix to the path that was already + # trimmed by the routing + if not self.request.path.endswith("/"): ++ if self.request.path.startswith("//"): ++ # A redirect with two initial slashes is a "protocol-relative" URL. ++ # This means the next path segment is treated as a hostname instead ++ # of a part of the path, making this effectively an open redirect. ++ # Reject paths starting with two slashes to prevent this. ++ # This is only reachable under certain configurations. ++ raise HTTPError( ++ 403, "cannot redirect path with two initial slashes" ++ ) + self.redirect(self.request.path + "/", permanent=True) + return None + absolute_path = os.path.join(absolute_path, self.default_filename) +-- +2.41.0 + diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 2af86ecb18a0..f4a4c97d2a20 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -12,5 +12,7 @@ PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb PYTHON_TORNADO_CPE_ID_PRODUCT = tornado PYTHON_TORNADO_SETUP_TYPE = setuptools +# 0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch +PYTHON_TORNADO_IGNORE_CVES += CVE-2023-28370 $(eval $(python-package)) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 963967332e35..aa42f1a71135 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 38f7d1589aa9720101316d07fcbd05c8 urllib3-1.26.13.tar.gz -sha256 c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8 urllib3-1.26.13.tar.gz +md5 f986d8e9616d2a43389f678d5dad9893 urllib3-1.26.18.tar.gz +sha256 f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 urllib3-1.26.18.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 5868927440b8..b22a11361f44 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.13 +PYTHON_URLLIB3_VERSION = 1.26.18 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/c2/51/32da03cf19d17d46cce5c731967bf58de9bd71db3a379932f53b094deda4 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/0c/39/64487bf07df2ed854cc06078c27c0d0abc59bd27b32232876e403c333a08 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python diff --git a/package/python-uvloop/Config.in b/package/python-uvloop/Config.in index b3fb275091aa..c9a05111cb3d 100644 --- a/package/python-uvloop/Config.in +++ b/package/python-uvloop/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_UVLOOP depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_PYTHON3_SSL help @@ -11,7 +12,8 @@ config BR2_PACKAGE_PYTHON_UVLOOP http://github.com/MagicStack/uvloop -comment "python-uvloop needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "python-uvloop needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index a8534977688e..1b4d8f563208 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz +sha256 d5d79f6260ec9f53f90447ad59313a8fac0571fce0018aa5f6fcf95d28c04382 python-web2py-2.26.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 4425b09d1233..fe7774fc2bd1 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.23.0 +PYTHON_WEB2PY_VERSION = 2.26.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 0b60a4006690..34adc67088e8 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/werkzeug/json -md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz -sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz +md5 3bb49cd2f2b51a1c638532e9a935e207 werkzeug-2.3.8.tar.gz +sha256 554b257c74bbeb7a0d254160a4f8ffe185243f52a52035060b761ca62d977f03 werkzeug-2.3.8.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index 0dd27d145fea..e8ef32bb1b39 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.3 -PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 +PYTHON_WERKZEUG_VERSION = 2.3.8 +PYTHON_WERKZEUG_SOURCE = werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/3d/4b/d746f1000782c89d6c97df9df43ba8f4d126038608843d3560ae88d201b5 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch index 0085d5a63f36..228b86a90baf 100644 --- a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -12,6 +12,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ @@ -48,9 +50,9 @@ index 403380e181..f5d0573067 100644 - lib2to3/tests/data \ - lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ - test test/audiodata \ - test/capath test/cjkencodings \ - test/data test/decimaltestdata \ + test \ + test/audiodata \ + test/capath \ @@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch index 04f7e34435a7..b89e1d27bce8 100644 --- a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -9,6 +9,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 10 +++++++--- configure.ac | 9 +++++++++ @@ -26,14 +28,15 @@ index 9f4cdf14cf..4f83911200 100644 tomllib \ turtledemo \ unittest \ -@@ -2001,8 +2000,6 @@ TESTSUBDIRS= ctypes/test \ - test/tracedmodules \ - test/xmltestdata test/xmltestdata/c14n-20 \ +@@ -2038,9 +2038,6 @@ + test/xmltestdata \ + test/xmltestdata/c14n-20 \ test/ziptestdata \ -- tkinter/test tkinter/test/test_tkinter \ +- tkinter/test \ +- tkinter/test/test_tkinter \ - tkinter/test/test_ttk \ - unittest/test unittest/test/testmock - + unittest/test \ + unittest/test/testmock ifeq (@PYDOC@,yes) @@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) LIBSUBDIRS += sqlite3 diff --git a/package/python3/Config.in b/package/python3/Config.in index 761c38c850a3..38f0580aa4e2 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_PYTHON3_2TO3 config BR2_PACKAGE_PYTHON3_BERKELEYDB bool "berkeleydb" select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_BERKELEYDB_DBM help berkeleydb module for Python3 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index f235347efb5d..962d32b5d917 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,5 @@ +# From https://www.python.org/downloads/release/python-3118/ +md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz # Locally computed -sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 56fe95cd071d..1fa49cf9dd31 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -13,9 +13,6 @@ PYTHON3_LICENSE_FILES = LICENSE PYTHON3_CPE_ID_VENDOR = python PYTHON3_CPE_ID_PRODUCT = python -# 0033-3.11-gh-98433-Fix-quadratic-time-idna-decoding.-GH-9.patch -PYTHON3_IGNORE_CVES += CVE-2022-45061 - # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. diff --git a/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file mode 100644 index 000000000000..2d303cd01275 --- /dev/null +++ b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch @@ -0,0 +1,73 @@ +From 274f00f33411caee51973a9f7701daf194da5a0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:00 -0500 +Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-2-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 24b25759be..10af5e0d8e 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -111,31 +111,6 @@ + #define FS_IOC32_SETFLAGS _IOW('f', 2, int) + #define FS_IOC32_GETVERSION _IOR('v', 1, int) + #define FS_IOC32_SETVERSION _IOW('v', 2, int) +- +-#define BLKGETSIZE64 _IOR(0x12,114,size_t) +-#define BLKDISCARD _IO(0x12,119) +-#define BLKIOMIN _IO(0x12,120) +-#define BLKIOOPT _IO(0x12,121) +-#define BLKALIGNOFF _IO(0x12,122) +-#define BLKPBSZGET _IO(0x12,123) +-#define BLKDISCARDZEROES _IO(0x12,124) +-#define BLKSECDISCARD _IO(0x12,125) +-#define BLKROTATIONAL _IO(0x12,126) +-#define BLKZEROOUT _IO(0x12,127) +- +-#define FIBMAP _IO(0x00,1) +-#define FIGETBSZ _IO(0x00,2) +- +-struct file_clone_range { +- __s64 src_fd; +- __u64 src_offset; +- __u64 src_length; +- __u64 dest_offset; +-}; +- +-#define FICLONE _IOW(0x94, 9, int) +-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +- + #else + #include + #endif +-- +2.25.1 + diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted file mode 100644 index 8dc2dd8823d6..000000000000 --- a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 12 Dec 2022 09:03:17 -0600 -Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags - -The values in env->flags are a subset of tb->flags. -Restore only the bits that belong. - -Cc: qemu-stable@nongnu.org -Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") -Signed-off-by: Guenter Roeck -Message-ID: <20221212011345.GA2235238@roeck-us.net> -[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] -Signed-off-by: Richard Henderson -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - target/sh4/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c -index 951eb6b9c8..f0934b20fa 100644 ---- a/target/sh4/cpu.c -+++ b/target/sh4/cpu.c -@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, - SuperHCPU *cpu = SUPERH_CPU(cs); - - cpu->env.pc = tb_pc(tb); -- cpu->env.flags = tb->flags; -+ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; - } - - static void superh_restore_state_to_opc(CPUState *cs, --- -2.25.1 - diff --git a/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file mode 100644 index 000000000000..2a36a5cbb413 --- /dev/null +++ b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch @@ -0,0 +1,82 @@ +From e07973ca745958da739f8ece80273da48f94f031 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:01 -0500 +Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36 + sys/mount.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-3-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 18 ------------------ + meson.build | 2 -- + 2 files changed, 20 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 10af5e0d8e..d974c76b60 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -95,25 +95,7 @@ + #include + #include + #include +- +-#ifdef HAVE_SYS_MOUNT_FSCONFIG +-/* +- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, +- * which in turn prevents use of linux/fs.h. So we have to +- * define the constants ourselves for now. +- */ +-#define FS_IOC_GETFLAGS _IOR('f', 1, long) +-#define FS_IOC_SETFLAGS _IOW('f', 2, long) +-#define FS_IOC_GETVERSION _IOR('v', 1, long) +-#define FS_IOC_SETVERSION _IOW('v', 2, long) +-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +-#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +-#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +-#define FS_IOC32_GETVERSION _IOR('v', 1, int) +-#define FS_IOC32_SETVERSION _IOW('v', 2, int) +-#else + #include +-#endif + #include + #if defined(CONFIG_FIEMAP) + #include +diff --git a/meson.build b/meson.build +index b88867ca9d..39e83bbafe 100644 +--- a/meson.build ++++ b/meson.build +@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) + config_host_data.set('HAVE_IPPROTO_MPTCP', + cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', +- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) + + # has_member + config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', +-- +2.25.1 + diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a54158..de6475e7197b 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU Linux. When using KVM, QEMU can virtualize x86, server and embedded PowerPC, and S390 guests. - http://qemu.org/ + https://www.qemu.org/ if BR2_PACKAGE_QEMU @@ -53,6 +53,7 @@ config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_QEMU_FDT if !BR2_PACKAGE_QEMU_CHOOSE_TARGETS help Say 'y' to build system emulators/virtualisers. diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index e671e1d184de..93f7c98f1c2e 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz +sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cc8dc42a243e..72a0160f8668 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,9 +6,9 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 7.2.0 +QEMU_VERSION = 7.2.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz -QEMU_SITE = http://download.qemu.org +QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; @@ -474,6 +474,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-sasl \ --enable-slirp \ --enable-tools \ + --disable-guest-agent \ $(HOST_QEMU_OPTS) endef diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index efa0e16e9a2e..a3161d62bbc9 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -7,6 +7,8 @@ QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_CPE_ID_VENDOR = qt +QT5BASE_CPE_ID_PRODUCT = qt QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index a50f19d7f221..5feb1e5bc26a 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -5,7 +5,7 @@ ################################################################################ QT5COAP_VERSION = 5.15.2 -QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git +QT5COAP_SITE = https://code.qt.io/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES QT5COAP_LICENSE = GPL-3.0, GFDL-1.3 diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 412e31c65295..91b99aaa87b7 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -5,7 +5,7 @@ ################################################################################ QT5KNX_VERSION = 5.15.2 -QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git +QT5KNX_SITE = https://code.qt.io/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES QT5KNX_LICENSE = GPL-3.0 with exception diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 0b62cf1bed59..824d58d1d122 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -5,7 +5,7 @@ ################################################################################ QT5MQTT_VERSION = 5.15.2 -QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git +QT5MQTT_SITE = https://code.qt.io/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES QT5MQTT_LICENSE = GPL-3.0 with exception diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d329..1edb252c9675 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).2 +QT6_VERSION = $(QT6_VERSION_MAJOR).3 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 63af37383665..cb111bd405f4 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 -sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e6cf4f14bbbc..1018bce44186 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_CPE_ID_VENDOR = qt +QT6BASE_CPE_ID_PRODUCT = qt QT6BASE_LICENSE = \ GPL-2.0+ or LGPL-3.0, \ diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index be01f13363e6..98c89319626f 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 -sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 +sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 1eaa3d615056..9341978d8621 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 -sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241bac0..fd174bc65738 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" + depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 + depends on !BR2_sh # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -15,7 +17,9 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/quickjs/ comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" + depends on !BR2_microblaze depends on !BR2_nios2 + depends on !BR2_sh depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch b/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch new file mode 100644 index 000000000000..347063cfb3b0 --- /dev/null +++ b/package/rabbitmq-c/0001-Add-option-to-read-username-password-from-file.patch @@ -0,0 +1,130 @@ +From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 +From: Christian Kastner +Date: Tue, 13 Jun 2023 14:21:52 +0200 +Subject: [PATCH] Add option to read username/password from file (#781) + +* Add option to read username/password from file + +Upstream: https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 +Signed-off-by: Fabrice Fontaine +--- + tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + +diff --git a/tools/common.c b/tools/common.c +index 73b47e25..7efe557b 100644 +--- a/tools/common.c ++++ b/tools/common.c +@@ -18,6 +18,11 @@ + #include "compat.h" + #endif + ++/* For when reading auth data from a file */ ++#define MAXAUTHTOKENLEN 128 ++#define USERNAMEPREFIX "username:" ++#define PASSWORDPREFIX "password:" ++ + void die(const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); +@@ -125,6 +130,7 @@ static char *amqp_vhost; + static char *amqp_username; + static char *amqp_password; + static int amqp_heartbeat = 0; ++static char *amqp_authfile; + #ifdef WITH_SSL + static int amqp_ssl = 0; + static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; +@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { + "the password to login with", "password"}, + {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, + "heartbeat interval, set to 0 to disable", "heartbeat"}, ++ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, ++ "path to file containing username/password for authentication", "file"}, + #ifdef WITH_SSL + {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, + {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, +@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { + #endif /* WITH_SSL */ + {NULL, '\0', 0, NULL, 0, NULL, NULL}}; + ++void read_authfile(const char *path) { ++ size_t n; ++ FILE *fp = NULL; ++ char token[MAXAUTHTOKENLEN]; ++ ++ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || ++ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { ++ die("Out of memory"); ++ } else if ((fp = fopen(path, "r")) == NULL) { ++ die("Could not read auth data file %s", path); ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { ++ die("Malformed auth file (missing username)"); ++ } ++ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_username); ++ if (amqp_username[n - 1] != '\n') { ++ die("Username too long"); ++ } else { ++ amqp_username[n - 1] = '\0'; ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { ++ die("Malformed auth file (missing password)"); ++ } ++ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_password); ++ if (amqp_password[n - 1] != '\n') { ++ die("Password too long"); ++ } else { ++ amqp_password[n - 1] = '\0'; ++ } ++ ++ (void)fgetc(fp); ++ if (!feof(fp)) { ++ die("Malformed auth file (trailing data)"); ++ } ++} ++ + static void init_connection_info(struct amqp_connection_info *ci) { + ci->user = NULL; + ci->password = NULL; +@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_username) { + if (amqp_url) { + die("--username and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--username and --authfile options cannot be used at the same time"); + } + + ci->user = amqp_username; +@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_password) { + if (amqp_url) { + die("--password and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--password and --authfile options cannot be used at the same time"); + } + + ci->password = amqp_password; + } + ++ if (amqp_authfile) { ++ if (amqp_url) { ++ die("--authfile and --url options cannot be used at the same time"); ++ } ++ ++ read_authfile(amqp_authfile); ++ ci->user = amqp_username; ++ ci->password = amqp_password; ++ } ++ + if (amqp_vhost) { + if (amqp_url) { + die("--vhost and --url options cannot be used at the same time"); diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index 18ecaa309879..fad6655e4ed2 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -14,6 +14,9 @@ RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ -DBUILD_TOOLS_DOCS=OFF +# 0001-Add-option-to-read-username-password-from-file.patch +RABBITMQ_C_IGNORE_CVES += CVE-2023-35789 + # BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable ifeq ($(BR2_SHARED_STATIC_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/package/ramspeed/Config.in b/package/ramspeed/Config.in index b236329a84d1..bd0438ffe1e8 100644 --- a/package/ramspeed/Config.in +++ b/package/ramspeed/Config.in @@ -1,5 +1,9 @@ +comment "ramspeed needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 + config BR2_PACKAGE_RAMSPEED bool "ramspeed" + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 help RAMspeed is a free open source command line utility to measure cache and memory performance. diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 000000000000..6dfb476faaaa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch new file mode 100644 index 000000000000..c2c2d812600e --- /dev/null +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -0,0 +1,41 @@ +From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Wed, 5 Oct 2022 10:41:16 -0400 +Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with + an invalid locale specification + +Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b +[peter: stripped unrelated ._.gitignore change] +Signed-off-by: Peter Seiderer +--- + nls.c | 4 ++++ + patchlevel | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/nls.c b/nls.c +index 5c6a13b..8c027d6 100644 +--- a/nls.c ++++ b/nls.c +@@ -141,6 +141,10 @@ _rl_init_locale (void) + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; + #endif +diff --git a/patchlevel b/patchlevel +index d8c9df7..fdf4740 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 +-- +2.39.2 + diff --git a/package/redis/redis.hash b/package/redis/redis.hash index eb8c21be9850..61ae276de9b0 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz +sha256 98066f5363504b26c34dd20fbcc3c957990d764cdf42576c836fc021073f4341 redis-7.0.15.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index b08be1153879..2c5702d10dbb 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.7 +REDIS_VERSION = 7.0.15 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/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df43..523a1546400c 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,13 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS help Use the refpolicy as provided by Buildroot. diff --git a/package/riscv64-elf-toolchain/riscv64-elf-toolchain.hash b/package/riscv64-elf-toolchain/riscv64-elf-toolchain.hash new file mode 100644 index 000000000000..9f40da09413b --- /dev/null +++ b/package/riscv64-elf-toolchain/riscv64-elf-toolchain.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 de2bb188300dc38d74103516ce5cfd1060dfd105e8a408e9e3991512cf27285e riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-centos6.tar.gz diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index be3f078a0bce..7f08fa25fbf7 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RNG_TOOLS help Daemon to use hardware random number generators. - http://sourceforge.net/projects/gkernel/ + https://github.com/nhorman/rng-tools if BR2_PACKAGE_RNG_TOOLS diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 3e565103e415..933370c9a99e 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -5,7 +5,7 @@ ################################################################################ RNG_TOOLS_VERSION = 6.16 -RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) +RNG_TOOLS_SITE = $(call github,nhorman,rng-tools,v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project diff --git a/package/rockchip-mali/rockchip-mali.hash b/package/rockchip-mali/rockchip-mali.hash index 446bf9ac65eb..b19937fa0723 100644 --- a/package/rockchip-mali/rockchip-mali.hash +++ b/package/rockchip-mali/rockchip-mali.hash @@ -1,2 +1,2 @@ -sha256 ee440d859e9d7dfdf29b9a00c7a633337913c407be567d3651c29c12eb75fd9c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427.tar.gz +sha256 1a291bbd75f317ee9205eb356aed617ac269db166ad6528a1734361cc08f8f7c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e6042.tar.gz sha256 a78acc73de9909efb879800d4daa4640c4aaa55cd751238a133954aba15e4285 END_USER_LICENCE_AGREEMENT.txt diff --git a/package/rockchip-mali/rockchip-mali.mk b/package/rockchip-mali/rockchip-mali.mk index 5c8e5543468e..125b1c61fd6c 100644 --- a/package/rockchip-mali/rockchip-mali.mk +++ b/package/rockchip-mali/rockchip-mali.mk @@ -4,7 +4,15 @@ # ################################################################################ -ROCKCHIP_MALI_VERSION = 721653b5b3b525a4f80d15aa7e2f9df7b7e60427 +# Full sha1 is 721653b5b3b525a4f80d15aa7e2f9df7b7e60427, but we use the +# "mirrors" repository, which names the top-level directory "mirrors-VERSION" +# while the original was the "libmali" repository which named the top-level +# directory "libmali-VERSION". Hence the content changes, and thus the hash +# changes. +# To avoid conflict with the old tarball on s.b.o. used by older versions of +# Buildroot, we can't use the same filename for the generated archive, so we +# drop the last char in the commit hash. +ROCKCHIP_MALI_VERSION = 721653b5b3b525a4f80d15aa7e2f9df7b7e6042 ROCKCHIP_MALI_SITE = $(call github,JeffyCN,mirrors,$(ROCKCHIP_MALI_VERSION)) ROCKCHIP_MALI_LICENSE = Proprietary ROCKCHIP_MALI_LICENSE_FILES = END_USER_LICENCE_AGREEMENT.txt diff --git a/package/rpm/0001-fix-var-declare-in-label-error.patch b/package/rpm/0001-fix-var-declare-in-label-error.patch new file mode 100644 index 000000000000..648040c66307 --- /dev/null +++ b/package/rpm/0001-fix-var-declare-in-label-error.patch @@ -0,0 +1,40 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 + +Upstream: b960c0b43a080287a7c13533eeb2d9f288db1414 +Signed-off-by: James Knight +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642d..183293edb0 100644 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++ int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + + setmeta: + /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); + if (!rc && fd == -1 && mayopen) { + int flags = O_RDONLY; + /* Only follow safe symlinks, and never on temporary files */ diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index dfe50303f7db..fd03f062bc7d 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.18.0.html -sha256 2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 rpm-4.18.0.tar.bz2 +# From https://rpm.org/wiki/Releases/4.18.1.html +sha256 37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 rpm-4.18.1.tar.bz2 # Hash for license file sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index fc57a14fd651..2b289fcc9f8d 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -5,7 +5,7 @@ ################################################################################ RPM_VERSION_MAJOR = 4.18 -RPM_VERSION = $(RPM_VERSION_MAJOR).0 +RPM_VERSION = $(RPM_VERSION_MAJOR).1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ @@ -29,7 +29,10 @@ RPM_SELINUX_MODULES = rpm RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ - --with-gnu-ld + --with-gnu-ld \ + --without-fapolicyd \ + --without-fsverity \ + --without-imaevm ifeq ($(BR2_PACKAGE_ACL),y) RPM_DEPENDENCIES += acl @@ -104,7 +107,6 @@ endif # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ - CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) diff --git a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch new file mode 100644 index 000000000000..538115996898 --- /dev/null +++ b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch @@ -0,0 +1,28 @@ +From 556a2c5bc2f6244f140a96302d4df92cfc25af8b Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Tue, 25 Oct 2022 21:55:53 -0700 +Subject: [PATCH] Check for EVP_MD_CTX_copy in crypto lib instead of MD5_Init. + +Upstream: https://github.com/WayneD/rsync/commit/556a2c5bc2f6244f140a96302d4df92cfc25af8b +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a2c99558..ccad7f13 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(MD5_Init, crypto, ++ AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, + [AC_DEFINE(USE_OPENSSL) + enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; + no_lib="$no_lib openssl"]) + else + AC_MSG_RESULT(no) diff --git a/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch new file mode 100644 index 000000000000..61fe4b026913 --- /dev/null +++ b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch @@ -0,0 +1,48 @@ +From 93865bad4c00e7d3c867965663fdb9a1a0448db8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 1 Jan 2023 16:53:23 +0100 +Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl dependencies + +Use pkg-config to retrieve openssl dependencies such as -latomic and +avoids the following build failure when building statically on +architectures such as sparc: + +/home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': +threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' + +Fixes: + - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/WayneD/rsync/pull/426 +--- + configure.ac | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ccad7f13..b9591866 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,11 +432,15 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto, + [AC_DEFINE(USE_OPENSSL) +- enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; +- no_lib="$no_lib openssl"]) ++ enable_openssl=yes ++ LIBS="$LIBS $LIBCRYPTO_LIBS"], ++ [AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ [AC_DEFINE(USE_OPENSSL) ++ enable_openssl=yes], ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; ++ no_lib="$no_lib openssl"])]) + else + AC_MSG_RESULT(no) + err_msg="$err_msg$nl- Failed to find openssl/md4.h and openssl/md5.h for openssl crypto lib support." +-- +2.35.1 + diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3fd2ef257ead..b9d392c8cb52 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -10,7 +10,9 @@ RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync -RSYNC_DEPENDENCIES = zlib popt +# We're patching configure.ac +RSYNC_AUTORECONF = YES +RSYNC_DEPENDENCIES = host-pkgconf zlib popt # We know that our C library is modern enough for C99 vsnprintf(). Since # configure can't detect this, we tell configure that vsnprintf() is safe. RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes @@ -20,9 +22,11 @@ RSYNC_CONF_OPTS = \ --disable-roll-simd \ --disable-md5-asm -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -RSYNC_CONF_ENV += LIBS=-latomic -endif +# reconfigure must be run after autoreconf +define RSYNC_RUN_RECONFIGURE + cd $(@D) && PATH=$(BR_PATH) make reconfigure +endef +RSYNC_POST_CONFIGURE_HOOKS += RSYNC_RUN_RECONFIGURE ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl diff --git a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch new file mode 100644 index 000000000000..f9e2d6845d78 --- /dev/null +++ b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch @@ -0,0 +1,41 @@ +From f48d99fab8b79e573850067a3ff2d8c16aa95ce1 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Sep 2022 21:17:17 +0200 +Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the + end of EXTRA_FLAGS assignment + +At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS +since it's assigned at the beginning of the Makefile. For example it's not +possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't +allow to build these modules for big endian architectures. So let's move +the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last +EXTRA_CFLAGS assignment. + +Upstream: https://github.com/jwrdegoede/rtl8189ES_linux/pull/101 + +Signed-off-by: Giulio Benetti +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dfca305..6f91d0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) + EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall +@@ -2208,6 +2207,8 @@ ifneq ($(USER_MODULE_NAME),) + MODULE_NAME := $(USER_MODULE_NAME) + endif + ++EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) ++ + ifneq ($(KERNELRELEASE),) + + ########### this part for *.mk ############################ +-- +2.34.1 + diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 4f117cfd14e3..377812fba810 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz +sha256 9ff7aa9ee8cd7a8f386531d3b009e7bcbce1ff71bb676c187c40e538755eb8b5 rtl8189fs-75a566a830037c7d1309c5a9fe411562772a1cf2.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 15a5329a45b2..bd2946924226 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,14 +4,23 @@ # ################################################################################ -RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 +RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 +RTL8189FS_USER_EXTRA_CFLAGS = \ + -UCONFIG_LITTLE_ENDIAN \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN + RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CFLAGS)" + +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +RTL8189FS_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n +endif define RTL8189FS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 1bb164fa86d7..f62ce2bf6c77 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -9,7 +9,7 @@ RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING -RTL8723DS_USER_EXTRA_CLAGS = \ +RTL8723DS_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ -DRTW_USE_CFG80211_STA_EVENT \ @@ -20,7 +20,7 @@ RTL8723DS_MODULE_MAKE_OPTS = \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CLAGS)" + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CFLAGS)" define RTL8723DS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 964ec04ec4b9..8a40f584def2 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -24,7 +24,7 @@ RTTY_CONF_OPTS += \ -DUSE_MBEDTLS=OFF \ -DUSE_OPENSSL=ON \ -DUSE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ -DSSL_SUPPORT=ON \ diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 6c8fddd39787..d6eb27d352c3 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34 runc-1.1.4.tar.gz +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index b60f1da2e713..273509b860d7 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.4 +RUNC_VERSION = 1.1.12 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e806..11cfae5e9b1d 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfccf..bb66de5ec59d 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642fdc..000000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64fe0..1b4b08ceccd4 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e784..814a3c1dd43a 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rygel/Config.in b/package/rygel/Config.in index 30e843053705..e160068a5561 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -52,12 +52,12 @@ comment "gstreamer1 needs gst1-editing-services" endchoice -comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" +endif # BR2_PACKAGE_RYGEL + +comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_8 - -endif # BR2_PACKAGE_RYGEL + !BR2_HOST_GCC_AT_LEAST_8 || !BR2_PACKAGE_PYTHON3 diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host index 1967f33ab317..cd11e8633e53 100644 --- a/package/sam-ba/Config.in.host +++ b/package/sam-ba/Config.in.host @@ -1,7 +1,6 @@ config BR2_PACKAGE_HOST_SAM_BA bool "host sam-ba" depends on BR2_HOSTARCH = "x86_64" - select BR2_HOSTARCH_NEEDS_IA32_LIBS help Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 79216860dd8b..8259e91fc653 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -19,7 +19,7 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 240d730cbee..c6d8df43c74 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -406,21 +406,6 @@ def configure(conf): +@@ -436,21 +436,6 @@ def configure(conf): strlcpy_in_bsd = False diff --git a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 484e6722ea23..1c4de6a02ef7 100644 --- a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Sun, 20 Oct 2019 00:03:14 +0300 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -33,18 +33,20 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13] +[Bernd: rebased for version 4.11.13 & 4.17.7] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 8c55ae2a938..4fdae8062c5 100644 +index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ - conf.RECURSE('source4/heimdal_build') +@@ -6,3 +6,14 @@ + + conf.define('USING_EMBEDDED_HEIMDAL', 1) + conf.RECURSE('third_party/heimdal_build') + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): @@ -56,34 +58,6 @@ index 8c55ae2a938..4fdae8062c5 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 0ff6dad2f55..f77c177442f 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- 2.20.1 + diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch new file mode 100644 index 000000000000..aa55c0989150 --- /dev/null +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -0,0 +1,41 @@ +From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 7 May 2023 11:02:26 +0200 +Subject: [PATCH] 3rdparty/heimdal: Use perl module JSON:PP, part of core, instead + of JSON package + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch + +Signed-off-by: Bernd Kuhls +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/heimdal/heimdal/pull/1176 +--- + third_party/heimdal/cf/make-proto.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/third_party/heimdal/cf/make-proto.pl b/third_party/heimdal/cf/make-proto.pl +index 36a040ce6c0..ad21dbad9e1 100644 +--- a/third_party/heimdal/cf/make-proto.pl ++++ b/third_party/heimdal/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP; + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +-- +2.25.1 + diff --git a/package/samba4/0004-lib-util-Add-signal.h-include.patch b/package/samba4/0004-lib-util-Add-signal.h-include.patch deleted file mode 100644 index 838a8fa6d756..000000000000 --- a/package/samba4/0004-lib-util-Add-signal.h-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d1732a79dbf30c41802245909d0250ebe2b9d92e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Dec 2021 10:27:42 +0100 -Subject: [PATCH] lib/util: Add signal.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with samba-4.15.3 and uClibc: - -../../source3/printing/samba-bgqd.c: In function ‘main’: -../../source3/printing/samba-bgqd.c:340:21: error: ‘SIGPIPE’ undeclared (first use in this function); did you mean ‘EPIPE’? -../../source3/printing/samba-bgqd.c:384:14: error: ‘SIGTERM’ undeclared (first use in this function) - -Patch sent upstream: -https://gitlab.com/samba-team/samba/-/merge_requests/2296 - -Signed-off-by: Bernd Kuhls ---- - lib/util/signal.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/util/signal.h b/lib/util/signal.h -index 0663af6ab94..f662ee110d6 100644 ---- a/lib/util/signal.h -+++ b/lib/util/signal.h -@@ -21,6 +21,7 @@ - #ifndef _SAMBA_UTIL_SIGNAL_H_ - #define _SAMBA_UTIL_SIGNAL_H_ - -+#include - #include - - /** --- -2.30.2 - diff --git a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch b/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch deleted file mode 100644 index b338596d7aae..000000000000 --- a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Gentoo bug 855047 - -Fixes uClibc build when uClibc was build without netgroup support. -Upstream enables netgroup support based on getdomainname() being -present: -https://github.com/samba-team/samba/commit/f179184a2be2ddd38f463fcc12252f8d24e529f8#diff-b8d1bc25b89846e70ecb61cb296a8f5c50c9a0a1b62e46790fae81aa9d5bfaaeR632 - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch - -Signed-off-by: Bernd Kuhls - ---- a/lib/util/access.c -+++ b/lib/util/access.c -@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s) - return true; - } - } else if (tok[0] == '@') { /* netgroup: look it up */ --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - DATA_BLOB tmp; - char *mydomain = NULL; - char *hostname = NULL; ---- a/source3/auth/user_util.c -+++ b/source3/auth/user_util.c -@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char - - bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) - { --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - char nis_domain_buf[256]; - const char *nis_domain = NULL; - char *lowercase_user = NULL; diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81cbab45527d..3a69e90675f1 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc -sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.9.tar.asc +sha256 f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245 samba-4.18.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 31f692e03d7a..9b2319791625 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.12 +SAMBA4_VERSION = 4.18.9 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -93,6 +93,13 @@ else SAMBA4_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +SAMBA4_CONF_OPTS += --with-libunwind +SAMBA4_DEPENDENCIES += libunwind +else +SAMBA4_CONF_OPTS += --without-libunwind +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" SAMBA4_DEPENDENCIES += ncurses @@ -120,7 +127,7 @@ define SAMBA4_CONFIGURE_CMDS PERL="$(HOST_DIR)/bin/perl" \ $(TARGET_CONFIGURE_OPTS) \ $(SAMBA4_CONF_ENV) \ - ./buildtools/bin/waf configure \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 3040dddbbbea..0e8a99509059 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help Sconeserver is a modular, object-orientated and extremely diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index bfbd5dc6ede0..89abc8d3b297 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,7 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_PCRE),pcre) \ + pcre \ zlib # disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark diff --git a/package/screen/0001-no-memcpy-fallback.patch b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch similarity index 77% rename from package/screen/0001-no-memcpy-fallback.patch rename to package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch index 2137907199cd..ab002701d7ee 100644 --- a/package/screen/0001-no-memcpy-fallback.patch +++ b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch @@ -1,6 +1,7 @@ +From 545875ad0b6c9697fae41ae8770e95d117fe3cca Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: Do not use memcpy as an alternative for bcopy/memmove +Subject: [PATCH] Do not use memcpy as an alternative for bcopy/memmove The configure script runs a small test program to check whether memcpy can handle overlapping memory areas. However, it is not valid @@ -16,15 +17,17 @@ Signed-off-by: Maarten ter Huurne Signed-off-by: Ricardo Martincoski [Bernd: rebase on top of 4.7.0] Signed-off-by: Bernd Kuhls +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- acconfig.h | 3 +-- - configure.ac | 18 +----------------- + configure.ac | 22 +--------------------- os.h | 8 ++------ osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 34 deletions(-) + 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/acconfig.h b/acconfig.h -index 2e46985..9b0b9d4 100644 +index 46d62b0..f83572c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -476,7 +476,7 @@ @@ -45,43 +48,47 @@ index 2e46985..9b0b9d4 100644 /* diff --git a/configure.ac b/configure.ac -index 27690a6..b8e3bec 100644 +index 1a12c04..6f6c2da 100644 --- a/configure.ac +++ b/configure.ac -@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) +@@ -1278,7 +1278,7 @@ AC_TRY_LINK([ + fdwalk(NULL, NULL); + ],AC_DEFINE(HAVE_FDWALK)) -AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) +AC_CHECKING(whether memmove/bcopy handles overlapping arguments) AC_TRY_RUN([ - main() { - char buf[10]; -@@ -1175,22 +1175,6 @@ main() { - exit(0); /* libc version works properly. */ - }], AC_DEFINE(USEMEMMOVE)) + #include + #include +@@ -1319,26 +1319,6 @@ main() { + }], AC_DEFINE(USEMEMMOVE),, + AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) -- -AC_TRY_RUN([ +-#include +-#include +- -#define bcopy(s,d,l) memcpy(d,s,l) +- +-int -main() { - char buf[10]; - strcpy(buf, "abcdefghi"); - bcopy(buf, buf + 2, 3); - if (strncmp(buf, "ababcf", 6)) -- exit(1); +- return 1; - strcpy(buf, "abcdefghi"); - bcopy(buf + 2, buf, 3); - if (strncmp(buf, "cdedef", 6)) -- exit(1); -- exit(0); /* libc version works properly. */ +- return 1; +- return 0; /* libc version works properly. */ -}], AC_DEFINE(USEMEMCPY),,:) - AC_SYS_LONG_FILE_NAMES AC_MSG_CHECKING(for vsprintf) diff --git a/os.h b/os.h -index e827ac9..0b41fb9 100644 +index 2a1c2ca..d1ac87e 100644 --- a/os.h +++ b/os.h @@ -142,12 +142,8 @@ extern int errno; @@ -100,7 +107,7 @@ index e827ac9..0b41fb9 100644 #endif diff --git a/osdef.h.in b/osdef.h.in -index 8687b60..e4057a0 100644 +index 6ddbd66..abdacf7 100644 --- a/osdef.h.in +++ b/osdef.h.in @@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); @@ -122,5 +129,5 @@ index 8687b60..e4057a0 100644 extern void bcopy __P((char *, char *, int)); #endif -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0002-install-no-backup-binary.patch b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch similarity index 85% rename from package/screen/0002-install-no-backup-binary.patch rename to package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch index 7842662b5767..ef82cd3e76d0 100644 --- a/package/screen/0002-install-no-backup-binary.patch +++ b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch @@ -1,18 +1,21 @@ +From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 14 Sep 2014 23:58:34 +0200 -Subject: Do not create backup of old installed binary +Subject: [PATCH] Do not create backup of old installed binary This is a rather unusual feature that packagers will not expect. Signed-off-by: Maarten ter Huurne [baruch: update for 4.6.2] Signed-off-by: Baruch Siach +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 187a69b..65549e9 100644 +index 26ec404..3efbbfd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -83,12 +83,9 @@ screen: $(OFILES) @@ -37,5 +40,5 @@ index 187a69b..65549e9 100644 cd doc; $(MAKE) uninstall -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0003-install-always-chmod.patch b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch similarity index 73% rename from package/screen/0003-install-always-chmod.patch rename to package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch index 0aa7690b086f..bc3f676af3c1 100644 --- a/package/screen/0003-install-always-chmod.patch +++ b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch @@ -1,22 +1,25 @@ +From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:03:05 +0200 -Subject: Change binary permission flags even if chown fails +Subject: [PATCH] Change binary permission flags even if chown fails Typically when creating a package, the build is not run as root, so the chown will fail. But the chmod can still be done. Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 65549e9..3c12fdb 100644 +index 3efbbfd..0315fde 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,8 @@ screen: $(OFILES) - install_bin: .version screen + install_bin: .version screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) @@ -25,5 +28,5 @@ index 65549e9..3c12fdb 100644 rm -f $(DESTDIR)$(bindir)/screen (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0004-install-nonversioned-binary.patch b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch similarity index 72% rename from package/screen/0004-install-nonversioned-binary.patch rename to package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch index ecbbd6519754..15795874ae20 100644 --- a/package/screen/0004-install-nonversioned-binary.patch +++ b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch @@ -1,20 +1,23 @@ +From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:06:20 +0200 -Subject: Support overriding SCREEN to get a non-versioned binary +Subject: [PATCH] Support overriding SCREEN to get a non-versioned binary If a packager runs "make install SCREEN=screen", do not create "screen" as a symlink to itself. Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 3c12fdb..860f351 100644 +index 0315fde..4718f08 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen +@@ -86,9 +86,11 @@ install_bin: .version screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -chown root $(DESTDIR)$(bindir)/$(SCREEN) -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) @@ -27,5 +30,5 @@ index 3c12fdb..860f351 100644 ############################################################################### -- -1.8.4.5 +2.41.0 diff --git a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch new file mode 100644 index 000000000000..24df05de8c46 --- /dev/null +++ b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch @@ -0,0 +1,39 @@ +From 8b066a777b61600ff2c60cad0725f2089299ff56 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:24:41 +0200 +Subject: [PATCH] Renamed sched.h to eventqueue.h + +There is a system header that got shadowed by "sched.h". +While Screen itself doesn't include , other system headers +might include it indirectly. This broke the build when using uClibc +with pthread support. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + sched.h => eventqueue.h | 0 + screen.h | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename sched.h => eventqueue.h (100%) + +diff --git a/sched.h b/eventqueue.h +similarity index 100% +rename from sched.h +rename to eventqueue.h +diff --git a/screen.h b/screen.h +index 4823efb..2d51788 100644 +--- a/screen.h ++++ b/screen.h +@@ -43,7 +43,7 @@ + #include "osdef.h" + + #include "ansi.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "acls.h" + #include "comm.h" + #include "layer.h" +-- +2.41.0 + diff --git a/package/screen/0005-rename-sched_h.patch b/package/screen/0005-rename-sched_h.patch deleted file mode 100644 index 9b29b76e0711..000000000000 --- a/package/screen/0005-rename-sched_h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne ---- - eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - sched.h | 48 ------------------------------------------------ - screen.h | 2 +- - 3 files changed, 49 insertions(+), 49 deletions(-) - create mode 100644 eventqueue.h - delete mode 100644 sched.h - -diff --git a/eventqueue.h b/eventqueue.h -new file mode 100644 -index 0000000..fdc3fc4 ---- /dev/null -+++ b/eventqueue.h -@@ -0,0 +1,48 @@ -+/* Copyright (c) 2008, 2009 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Micah Cowan (micah@cowan.name) -+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Copyright (c) 1987 Oliver Laumann -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program (see the file COPYING); if not, see -+ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -+ * -+ **************************************************************** -+ * $Id$ GNU -+ */ -+ -+struct event -+{ -+ struct event *next; -+ void (*handler) __P((struct event *, char *)); -+ char *data; -+ int fd; -+ int type; -+ int pri; -+ struct timeval timeout; -+ int queued; /* in evs queue */ -+ int active; /* in fdset */ -+ int *condpos; /* only active if condpos - condneg > 0 */ -+ int *condneg; -+}; -+ -+#define EV_TIMEOUT 0 -+#define EV_READ 1 -+#define EV_WRITE 2 -+#define EV_ALWAYS 3 -diff --git a/sched.h b/sched.h -deleted file mode 100644 -index fdc3fc4..0000000 ---- a/sched.h -+++ /dev/null -@@ -1,48 +0,0 @@ --/* Copyright (c) 2008, 2009 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Micah Cowan (micah@cowan.name) -- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Copyright (c) 1987 Oliver Laumann -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 3, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program (see the file COPYING); if not, see -- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -- * -- **************************************************************** -- * $Id$ GNU -- */ -- --struct event --{ -- struct event *next; -- void (*handler) __P((struct event *, char *)); -- char *data; -- int fd; -- int type; -- int pri; -- struct timeval timeout; -- int queued; /* in evs queue */ -- int active; /* in fdset */ -- int *condpos; /* only active if condpos - condneg > 0 */ -- int *condneg; --}; -- --#define EV_TIMEOUT 0 --#define EV_READ 1 --#define EV_WRITE 2 --#define EV_ALWAYS 3 -diff --git a/screen.h b/screen.h -index 603ca3f..34238c8 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -1.8.4.5 - diff --git a/package/screen/0006-comm-h-now-depends-on-term-h.patch b/package/screen/0006-comm.h-now-depends-on-term.h.patch similarity index 59% rename from package/screen/0006-comm-h-now-depends-on-term-h.patch rename to package/screen/0006-comm.h-now-depends-on-term.h.patch index 6ff6f3da0bec..088dfb340c92 100644 --- a/package/screen/0006-comm-h-now-depends-on-term-h.patch +++ b/package/screen/0006-comm.h-now-depends-on-term.h.patch @@ -1,28 +1,30 @@ -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 +From 23a8ca6be87ad374d66854cee66ab758880cc651 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: comm.h now depends on term.h +Subject: [PATCH] comm.h now depends on term.h Signed-off-by: Fabrice Fontaine [Patch retrieved and updated from: http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- - src/Makefile.in | 2 +- + Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index e791e79..d4f7c0b 100644 +index 4718f08..7082a3e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h +@@ -132,7 +132,7 @@ kmapdef.c: term.h + tty.c: tty.sh + sh $(srcdir)/tty.sh tty.c -comm.h: comm.c comm.sh config.h +comm.h: comm.c comm.sh config.h term.h AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - docs: + osdef.h: osdef.sh config.h osdef.h.in -- -cgit v1.0-41-gc330 +2.41.0 diff --git a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch index f406a1afac69..d46bf723b800 100644 --- a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch +++ b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch @@ -1,4 +1,4 @@ -From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001 +From 8d8899b3ffd26d5049f8a9ccf12ff9ac65c352b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Oct 2018 22:29:32 +0200 Subject: [PATCH] comm.h needed for list_{display,generic}.o @@ -12,15 +12,17 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://savannah.gnu.org/bugs/index.php?54776] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index af5938b..e6d5247 100644 +index 7082a3e..cd363b7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -265,7 +265,7 @@ braille.h +@@ -349,7 +349,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ comm.h layer.h term.h image.h display.h window.h extern.h \ braille.h @@ -31,5 +33,5 @@ index af5938b..e6d5247 100644 list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h -- -2.17.1 +2.41.0 diff --git a/package/screen/screen.hash b/package/screen/screen.hash index a261d3100de4..ef32eb0696b0 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz.sig -sha256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 screen-4.9.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.1.tar.gz.sig +sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 3239a1c1f390..d4052b119151 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.9.0 +SCREEN_VERSION = 4.9.1 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING diff --git a/package/screenfetch/0001-Detect-which-awk-to-use.patch b/package/screenfetch/0001-Detect-which-awk-to-use.patch new file mode 100644 index 000000000000..86e51e55115d --- /dev/null +++ b/package/screenfetch/0001-Detect-which-awk-to-use.patch @@ -0,0 +1,783 @@ +From 39b6eec51f0c2fa5f2b0e876b14dcfc9c1febf97 Mon Sep 17 00:00:00 2001 +From: Nicolas Boichat +Date: Fri, 4 Aug 2023 12:55:36 +0000 +Subject: [PATCH] Detect which awk to use + +Some embedded distributions (e.g. buildroot) may only provide mawk, +without a symlink to awk. + +At first glance, awk scripts to appear to work fine with either +gawk or mawk. + +Signed-off-by: Nicolas Boichat +Upstream: https://github.com/KittyKatt/screenFetch/commit/b49a2334b8ba806dbc532219e86363886a85d9c8 +[rebased on 3.9.1] +--- + screenfetch-dev | 245 +++++++++++++++++++++++++----------------------- + 1 file changed, 130 insertions(+), 115 deletions(-) + +diff --git a/screenfetch-dev b/screenfetch-dev +index 1e53b2c..765930f 100755 +--- a/screenfetch-dev ++++ b/screenfetch-dev +@@ -352,9 +352,9 @@ colorNumberToCode () { + + detectColors () { + my_colors=$(sed 's/^,/na,/;s/,$/,na/;s/,/ /' <<< "${OPTARG}") +- my_lcolor=$(awk -F' ' '{print $1}' <<< "${my_colors}") ++ my_lcolor=$("${AWK}" -F' ' '{print $1}' <<< "${my_colors}") + my_lcolor=$(colorNumberToCode "${my_lcolor}") +- my_hcolor=$(awk -F' ' '{print $2}' <<< "${my_colors}") ++ my_hcolor=$("${AWK}" -F' ' '{print $2}' <<< "${my_colors}") + my_hcolor=$(colorNumberToCode "${my_hcolor}") + } + +@@ -462,7 +462,22 @@ case $1 in + --version) displayVersion; exit 0;; + esac + ++# Detect which awk to use (unless already specified in environment) ++if [[ -z "${AWK}" ]]; then ++ for awk in awk gawk mawk; do ++ if command -v "${awk}" > /dev/null; then ++ AWK="${awk}" ++ break ++ fi ++ done ++fi ++ ++if ! command -v "${AWK}" > /dev/null; then ++ errorOut "No awk interpreter available (AWK=\"${AWK}\")." ++ exit 1 ++fi + ++# Parse the rest of the flags (some of these functions require awk) + while getopts ":hsu:evVEnLNtlS:A:D:o:c:d:pa:w" flags; do + case $flags in + h) displayHelp; exit 0 ;; +@@ -608,8 +623,8 @@ detectdistro () { + "Debian") + if [[ -f /etc/crunchbang-lsb-release || -f /etc/lsb-release-crunchbang ]]; then + distro="CrunchBang" +- distro_release=$(awk -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) +- distro_codename=$(awk -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_release=$("${AWK}" -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_codename=$("${AWK}" -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) + elif [[ -f /etc/siduction-version ]]; then + distro="Siduction" + distro_release="(Debian Sid)" +@@ -620,10 +635,10 @@ detectdistro () { + elif [[ -f /etc/os-release ]]; then + if grep -q -i 'Raspbian' /etc/os-release ; then + distro="Raspbian" +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + elif grep -q -i 'BlankOn' /etc/os-release ; then + distro='BlankOn' +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + else + distro="Debian" + fi +@@ -639,7 +654,7 @@ detectdistro () { + ;; + "Sulin") + distro="Sulin" +- distro_release=$(awk -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) + distro_codename="Roolling donkey" # this is not wrong :D + ;; + "KaOS"|"kaos") +@@ -718,7 +733,7 @@ detectdistro () { + if grep -q 'SailfishOS' /etc/os-release; then + distro="SailfishOS" + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + fi + ;; +@@ -753,7 +768,7 @@ detectdistro () { + if grep -q -i 'SUSE Linux Enterprise' /etc/os-release ; then + distro="SUSE Linux Enterprise" + distro_codename="n/a" +- distro_release=$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') ++ distro_release=$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') + fi + fi + if [[ "${distro_codename}" == "Tumbleweed" ]]; then +@@ -789,7 +804,7 @@ detectdistro () { + distro="SailfishOS" + if [[ -f /etc/os-release ]]; then + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + ;; + "Sparky"|"SparkyLinux") +@@ -863,12 +878,12 @@ detectdistro () { + ;; + "Haiku") + distro="Haiku" +- distro_more="$(uname -v | awk '/^hrev/ {print $1}')" ++ distro_more="$(uname -v | "${AWK}" '/^hrev/ {print $1}')" + ;; + "GNU/Linux") + if type -p crux >/dev/null 2>&1; then + distro="CRUX" +- distro_more="$(crux | awk '{print $3}')" ++ distro_more="$(crux | "${AWK}" '{print $3}')" + fi + if type -p nixos-version >/dev/null 2>&1; then + distro="NixOS" +@@ -944,7 +959,7 @@ detectdistro () { + [[ "${distro}" == "Neon" ]] && distro="KDE neon" + [[ "${distro}" == "SLED" || "${distro}" == "sled" || "${distro}" == "SLES" || "${distro}" == "sles" ]] && distro="SUSE Linux Enterprise" + if [[ "${distro}" == "SUSE Linux Enterprise" && -f /etc/os-release ]]; then +- distro_more="$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" ++ distro_more="$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" + fi + if [[ "${distro}" == "Debian" && -f /usr/bin/pveversion ]]; then + distro="Proxmox VE" +@@ -955,7 +970,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" && "${OSTYPE}" =~ "linux" && -f /etc/lsb-release ]]; then + LSB_RELEASE=$(/dev/null; then + distro="Mac OS X" + elif [[ -f /var/run/dmesg.boot ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1080,7 +1095,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" ]] && [[ "${OSTYPE}" =~ "linux" || "${OSTYPE}" == "gnu" ]]; then + if [[ -f /etc/issue ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1123,8 +1138,8 @@ detectdistro () { + fi + elif [[ -f /etc/lsb-release ]]; then + if grep -q -i 'CHROMEOS_RELEASE_NAME' /etc/lsb-release; then +- distro="$(awk -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" +- distro_more="$(awk -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" ++ distro="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" ++ distro_more="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" + fi + fi + fi +@@ -1301,7 +1316,7 @@ detectuptime () { + now=$(date +%s) + uptime=$((now - boot)) + elif [[ "${distro}" == "Haiku" ]]; then +- uptime=$(uptime | awk -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') ++ uptime=$(uptime | "${AWK}" -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') + else + if [[ -f /proc/uptime ]]; then + uptime=$( /dev/null | awk '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') ++ gpu=$(glxinfo 2> /dev/null | "${AWK}" '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') + elif [[ "${distro}" == "Mac OS X" ]]; then +- gpu=$(system_profiler SPDisplaysDataType | awk -F': ' '/^ *Chipset Model:/ {print $2}' | awk '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') ++ gpu=$(system_profiler SPDisplaysDataType | "${AWK}" -F': ' '/^ *Chipset Model:/ {print $2}' | "${AWK}" '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then + gpu=$(wmic path Win32_VideoController get caption | sed -n '2p') + elif [[ "${distro}" == "Haiku" ]]; then +- gpu="$(listdev | grep -A2 -e 'device Display controller' | awk -F': ' '/^ +device/ {print $2}')" ++ gpu="$(listdev | grep -A2 -e 'device Display controller' | "${AWK}" -F': ' '/^ +device/ {print $2}')" + else + if [[ -n "$(PATH="/opt/bin:$PATH" type -p nvidia-smi)" ]]; then +- gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | awk -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') ++ gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | "${AWK}" -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') + elif [[ -n "$(PATH="/usr/sbin:$PATH" type -p glxinfo)" && -z "${gpu}" ]]; then + gpu_info=$($(PATH="/usr/sbin:$PATH" type -p glxinfo | cut -f1) 2>/dev/null) + gpu=$(grep "OpenGL renderer string" <<< "${gpu_info}" | cut -d ':' -f2 | sed -n -e '1h;2,$H;${g;s/\n/, /g' -e 'p' -e '}') +@@ -1650,12 +1665,12 @@ detectgpu () { + # Run it only on Intel Processors if GPU is unknown + DetectIntelGPU() { + if [ -r /proc/fb ]; then +- gpu=$(awk 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) ++ gpu=$("${AWK}" 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) + fi + + case $gpu in + *mfb) +- gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}') ++ gpu=$(lspci | grep -i vga | "${AWK}" -F ": " '{print $2}') + ;; + *intel*) + gpu="intel" +@@ -1667,7 +1682,7 @@ DetectIntelGPU() { + + if [[ "$gpu" = "intel" ]]; then + #Detect CPU +- local CPU=$(uname -p | awk '{print $3}') ++ local CPU=$(uname -p | "${AWK}" '{print $3}') + CPU=${CPU#*'-'}; #Detect CPU number + + #Detect Intel GPU +@@ -1710,7 +1725,7 @@ detectdisk () { + if [[ "${distro}" =~ (Free|Net|DragonFly)BSD ]]; then + totaldisk=$(df -h -c 2>/dev/null | tail -1) + elif [[ "${distro}" == "OpenBSD" ]]; then +- totaldisk=$(df -Pk 2> /dev/null | awk ' ++ totaldisk=$(df -Pk 2> /dev/null | "${AWK}" ' + /^\// {total+=$2; used+=$3; avail+=$4} + END{printf("total %.1fG %.1fG %.1fG %d%%\n", total/1048576, used/1048576, avail/1048576, used*100/total)}') + elif [[ "${distro}" == "Mac OS X" ]]; then +@@ -1718,9 +1733,9 @@ detectdisk () { + else + totaldisk=$(df -h -x aufs -x tmpfs -x overlay --total 2>/dev/null | tail -1) + fi +- disktotal=$(awk '{print $2}' <<< "${totaldisk}") +- diskused=$(awk '{print $3}' <<< "${totaldisk}") +- diskusedper=$(awk '{print $5}' <<< "${totaldisk}") ++ disktotal=$("${AWK}" '{print $2}' <<< "${totaldisk}") ++ diskused=$("${AWK}" '{print $3}' <<< "${totaldisk}") ++ diskusedper=$("${AWK}" '{print $5}' <<< "${totaldisk}") + diskusage="${diskused} / ${disktotal} (${diskusedper})" + diskusage_verbose=$(sed 's/%/%%/' <<< "$diskusage") + fi +@@ -1733,17 +1748,17 @@ detectdisk () { + detectmem () { + if [ "$distro" == "Mac OS X" ]; then + totalmem=$(echo "$(sysctl -n hw.memsize)" / 1024^2 | bc) +- wiredmem=$(vm_stat | grep wired | awk '{ print $4 }' | sed 's/\.//') +- activemem=$(vm_stat | grep ' active' | awk '{ print $3 }' | sed 's/\.//') +- compressedmem=$(vm_stat | grep occupied | awk '{ print $5 }' | sed 's/\.//') ++ wiredmem=$(vm_stat | grep wired | "${AWK}" '{ print $4 }' | sed 's/\.//') ++ activemem=$(vm_stat | grep ' active' | "${AWK}" '{ print $3 }' | sed 's/\.//') ++ compressedmem=$(vm_stat | grep occupied | "${AWK}" '{ print $5 }' | sed 's/\.//') + if [[ ! -z "$compressedmem | tr -d" ]]; then # FIXME: is this line correct? + compressedmem=0 + fi + usedmem=$(((wiredmem + activemem + compressedmem) * 4 / 1024)) + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ total_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((total_mem / 1024)) +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((total_mem - free_mem)) + usedmem=$((used_mem / 1024)) + elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then +@@ -1769,21 +1784,21 @@ detectmem () { + usedmem=$((used_mem / 1024 / 1024)) + elif [ "$distro" == "OpenBSD" ]; then + totalmem=$(($(sysctl -n hw.physmem) / 1024 / 1024)) +- usedmem=$(vmstat | awk '!/[a-z]/{gsub("M",""); print $3}') ++ usedmem=$(vmstat | "${AWK}" '!/[a-z]/{gsub("M",""); print $3}') + elif [ "$distro" == "NetBSD" ]; then +- phys_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ phys_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((phys_mem / 1024)) + if grep -q 'Cached' /proc/meminfo; then +- cache=$(awk '/Cached/ {print $2}' /proc/meminfo) ++ cache=$("${AWK}" '/Cached/ {print $2}' /proc/meminfo) + usedmem=$((cache / 1024)) + else +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((phys_mem - free_mem)) + usedmem=$((used_mem / 1024)) + fi + elif [ "$distro" == "Haiku" ]; then +- totalmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') +- usedmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') ++ totalmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') ++ usedmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') + else + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable + # Source: https://github.com/dylanaraps/neofetch/pull/391/files#diff-e863270127ca6116fd30e708cdc582fc +@@ -1798,7 +1813,7 @@ detectmem () { + #done + #usedmem=$((usedmem / 1024)) + #totalmem=$((totalmem / 1024)) +- mem=$(free -b | awk 'NR==2{print $2"-"$7}') ++ mem=$(free -b | "${AWK}" 'NR==2{print $2"-"$7}') + usedmem=$((mem / 1024 / 1024)) + totalmem=$((${mem//-*} / 1024 / 1024)) + fi +@@ -1823,7 +1838,7 @@ detectshell_ver () { + esac + + if [[ -n $version_data ]];then +- version=$(awk ' ++ version=$("${AWK}" ' + BEGIN { + IGNORECASE=1 + } +@@ -1842,7 +1857,7 @@ detectshell () { + if [[ ! "${shell_type}" ]]; then + if [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" || "${distro}" == "Haiku" || "${distro}" == "Alpine Linux" || + "${distro}" == "Mac OS X" || "${distro}" == "TinyCore" || "${distro}" == "Raspbian" || "${OSTYPE}" == "gnu" ]]; then +- shell_type=$(echo "$SHELL" | awk -F'/' '{print $NF}') ++ shell_type=$(echo "$SHELL" | "${AWK}" -F'/' '{print $NF}') + elif readlink -f "$SHELL" 2>&1 | grep -q -i 'busybox'; then + shell_type="BusyBox" + else +@@ -1851,7 +1866,7 @@ detectshell () { + elif [[ "${distro}" =~ "BSD" ]]; then + shell_type=$(ps -p $PPID -o command | tail -1) + else +- shell_type=$(ps -p "$(ps -p $PPID | awk '$1 !~ /PID/ {print $1}')" | awk 'FNR>1 {print $1}') ++ shell_type=$(ps -p "$(ps -p $PPID | "${AWK}" '$1 !~ /PID/ {print $1}')" | "${AWK}" 'FNR>1 {print $1}') + fi + shell_type=${shell_type/-} + shell_type=${shell_type//*\/} +@@ -1881,7 +1896,7 @@ detectshell () { + shell_version_data=$( detectshell_ver "$shell_type" "^zsh" "2" ) + ;; + fish) +- shell_version_data=$( fish --version | awk '{print $3}' ) ++ shell_version_data=$( fish --version | "${AWK}" '{print $3}' ) + ;; + esac + +@@ -1899,17 +1914,17 @@ detectshell () { + detectres () { + xResolution="No X Server" + if [[ ${distro} == "Mac OS X" ]]; then +- xResolution=$(system_profiler SPDisplaysDataType | awk '/Resolution:/ {print $2"x"$4" "}') ++ xResolution=$(system_profiler SPDisplaysDataType | "${AWK}" '/Resolution:/ {print $2"x"$4" "}') + if [[ "$(echo "$xResolution" | wc -l)" -ge 1 ]]; then + xResolution=$(echo "$xResolution" | tr "\\n" "," | sed 's/\(.*\),/\1/') + fi + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | awk 'NR==2 {print $1"x"$2}') ++ xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | "${AWK}" 'NR==2 {print $1"x"$2}') + elif [[ "${distro}" == "Haiku" ]]; then +- xResolution="$(screenmode | grep Resolution | awk '{gsub(/,/,""); print $2"x"$3}')" ++ xResolution="$(screenmode | grep Resolution | "${AWK}" '{gsub(/,/,""); print $2"x"$3}')" + elif [[ -n ${DISPLAY} ]]; then + if type -p xdpyinfo >/dev/null 2>&1; then +- xResolution=$(xdpyinfo | awk '/^ +dimensions/ {print $2}') ++ xResolution=$(xdpyinfo | "${AWK}" '/^ +dimensions/ {print $2}') + fi + fi + verboseOut "Finding current resolution(s)...found as '$xResolution'" +@@ -1937,7 +1952,7 @@ detectde () { + if type -p xprop >/dev/null 2>&1;then + xprop_root="$(xprop -root 2>/dev/null)" + if [[ -n ${xprop_root} ]]; then +- DE=$(echo "${xprop_root}" | awk 'BEGIN { ++ DE=$(echo "${xprop_root}" | "${AWK}" 'BEGIN { + de = "Not Present" + } + { +@@ -2099,7 +2114,7 @@ detectde () { + elif [[ ${KDE_FULL_SESSION} == 'true' ]]; then + DE="KDE" + DEver_data=$(kded --version 2>/dev/null) +- DEver=$(grep -si '^KDE:' <<< "$DEver_data" | awk '{print $2}') ++ DEver=$(grep -si '^KDE:' <<< "$DEver_data" | "${AWK}" '{print $2}') + fi + fi + fi +@@ -2154,7 +2169,7 @@ detectde () { + fi + elif [[ ${DE} == "LXQt" ]]; then + if type -p lxqt-about >/dev/null 2>&1; then +- DEver=$(lxqt-about --version | awk '/^liblxqt/ {print $2}') ++ DEver=$(lxqt-about --version | "${AWK}" '/^liblxqt/ {print $2}') + DE="${DE} ${DEver}" + fi + elif [[ ${DE} == "MATE" ]]; then +@@ -2169,12 +2184,12 @@ detectde () { + fi + elif [[ ${DE} == "Deepin" ]]; then + if [[ -f /etc/deepin-version ]]; then +- DEver="$(awk -F '=' '/Version/ {print $2}' /etc/deepin-version)" ++ DEver="$("${AWK}" -F '=' '/Version/ {print $2}' /etc/deepin-version)" + DE="${DE} ${DEver//* }" + fi + elif [[ ${DE} == "Trinity" ]]; then + if type -p tde-config >/dev/null 2>&1; then +- DEver="$(tde-config --version | awk -F ' ' '/TDE:/ {print $2}')" ++ DEver="$(tde-config --version | "${AWK}" -F ' ' '/TDE:/ {print $2}')" + DE="${DE} ${DEver//* }" + fi + fi +@@ -2418,7 +2433,7 @@ detectwmtheme () { + else + themeFile="$(reg query 'HKCU\Software\Microsoft\Windows\CurrentVersion\Themes' /v 'CurrentTheme')" + fi +- Win_theme=$(echo "$themeFile" | awk -F"\\" '{print $NF}' | sed 's|\.theme$||') ++ Win_theme=$(echo "$themeFile" | "${AWK}" -F"\\" '{print $NF}' | sed 's|\.theme$||') + fi + else + case $WM in +@@ -2433,7 +2448,7 @@ detectwmtheme () { + ;; + 'BlackBox') + if [ -f "$HOME/.blackboxrc" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" + fi + ;; + 'BudgieWM') +@@ -2465,11 +2480,11 @@ detectwmtheme () { + fi + ;; + 'E16') +- Win_theme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" ++ Win_theme="$("${AWK}" -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" + ;; + 'E17'|'Enlightenment') + if [ "$(which eet 2>/dev/null)" ]; then +- econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | awk '/value \"file\" string.*.edj/{ print $4 }')" ++ econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | "${AWK}" '/value \"file\" string.*.edj/{ print $4 }')" + econfigend="${econfig##*/}" + Win_theme=${econfigend%.*} + elif [ -n "${E_CONF_PROFILE}" ]; then +@@ -2485,12 +2500,12 @@ detectwmtheme () { + ;; + 'FluxBox'|'Fluxbox') + if [ -f "$HOME/.fluxbox/init" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" + fi + ;; + 'IceWM') + if [ -f "$HOME/.icewm/theme" ]; then +- Win_theme="$(awk -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" ++ Win_theme="$("${AWK}" -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" + fi + ;; + 'KWin'*) +@@ -2507,14 +2522,14 @@ detectwmtheme () { + Win_theme="Not Applicable" + KDE_CONFIG_DIR=${KDE_CONFIG_DIR%/} + if [[ -f $KDE_CONFIG_DIR/share/config/kwinrc ]]; then +- Win_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" ++ Win_theme="$("${AWK}" '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdebugrc ]]; then +- Win_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" ++ Win_theme="$("${AWK}" '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2522,7 +2537,7 @@ detectwmtheme () { + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdeglobals ]]; then +- Win_theme="$(awk '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" ++ Win_theme="$("${AWK}" '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2552,20 +2567,20 @@ detectwmtheme () { + ;; + 'OpenBox'|'Openbox') + if [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/openbox/rc.xml" ]; then +- Win_theme="$(awk -F"[<,>]" '/]" '/]" '/]" '//dev/null 2>&1; then + gtk2Theme=$(xfconf-query -c xsettings -p /Net/ThemeName 2>/dev/null) +@@ -2779,15 +2794,15 @@ detectgtk () { + fi + + if grep -q 'sNet\/ThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtk2Theme=$(awk -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtk2Theme=$("${AWK}" -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'IconThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkIcons=$(awk -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkIcons=$("${AWK}" -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'FontName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkFont=$(awk -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkFont=$("${AWK}" -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") + fi + ;; + +@@ -2796,15 +2811,15 @@ detectgtk () { + *) # Lightweight or No DE Found + if [ -f "$HOME/.gtkrc-2.0" ]; then + if grep -q 'gtk-theme' "$HOME/.gtkrc-2.0"; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'icon-theme' "$HOME/.gtkrc-2.0"; then +- gtkIcons=$(awk -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'font' "$HOME/.gtkrc-2.0"; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") + fi + fi + # $HOME/.gtkrc.mine theme detect only +@@ -2815,37 +2830,37 @@ detectgtk () { + fi + if [ -f "$minegtkrc" ]; then + if grep -q '^include' "$minegtkrc"; then +- gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | awk -F "/" '{ print $5 }') ++ gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | "${AWK}" -F "/" '{ print $5 }') + fi + if grep -q '^gtk-icon-theme-name' "$minegtkrc"; then +- gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | awk -F '"' '{print $2}') ++ gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | "${AWK}" -F '"' '{print $2}') + fi + fi + # /etc/gtk-2.0/gtkrc compatibility + if [[ -f /etc/gtk-2.0/gtkrc && ! -f "$HOME/.gtkrc-2.0" && ! -f "$HOME/.gtkrc.mine" && ! -f "$HOME/.gtkrc-2.0.mine" ]]; then + if grep -q 'gtk-theme-name' /etc/gtk-2.0/gtkrc; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-theme-name' /etc/gtk-2.0/gtkrc && ! [ "x$gtk2Theme" = "x" ]; then +- gtk2Theme=$(awk -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'icon-theme' /etc/gtk-2.0/gtkrc; then +- gtkIcons=$(awk -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-icon-theme' /etc/gtk-2.0/gtkrc && ! [ "x$gtkIcons" = "x" ]; then +- gtkIcons=$(awk -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'font' /etc/gtk-2.0/gtkrc; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + fi + + # EXPERIMENTAL gtk3 Theme detection + if [[ "$gtk3Theme" = "Not Found" && -f "$HOME/.config/gtk-3.0/settings.ini" ]]; then + if grep -q 'gtk-theme-name' "$HOME/.config/gtk-3.0/settings.ini"; then +- gtk3Theme=$(awk -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") ++ gtk3Theme=$("${AWK}" -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") + fi + fi + +@@ -2859,7 +2874,7 @@ detectgtk () { + + # ROX-Filer icon detect only + if [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options" ]; then +- gtkIcons=$(awk -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") ++ gtkIcons=$("${AWK}" -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") + fi + + # E17 detection +@@ -2872,10 +2887,10 @@ detectgtk () { + # Background Detection (feh, nitrogen) + if [ "$background_detect" == "1" ]; then + if [ -a "$HOME/.fehbg" ]; then +- gtkBackgroundFull=$(awk -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) +- gtkBackground=$(echo "$gtkBackgroundFull" | awk -F"/" '{print $NF}') ++ gtkBackgroundFull=$("${AWK}" -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) ++ gtkBackground=$(echo "$gtkBackgroundFull" | "${AWK}" -F"/" '{print $NF}') + elif [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg" ]; then +- gtkBackground=$(awk -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") ++ gtkBackground=$("${AWK}" -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") + fi + fi + +@@ -2910,7 +2925,7 @@ detectdroid () { + rom=$(getprop ro.build.display.id) + fi + baseband=$(getprop ro.baseband) +- cpu=$(awk -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) ++ cpu=$("${AWK}" -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) + } + + +@@ -6032,7 +6047,7 @@ asciiText () { + #n=${#fulloutput[*]} + for ((i=0; i<${#fulloutput[*]}; i++)); do + # echo "${out_array[@]}" +- case $(awk 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in ++ case $("${AWK}" 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in + 411|188|15|166|609) + f_size=${#fulloutput[*]} + o_size=${#out_array[*]} +-- +2.41.0.640.ga95def55d0-goog + diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index e26dcee30160..0c7bdf7fa109 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig -sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig +sha256 ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7 SDL2-2.26.5.tar.gz # Locally calculated sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index c01f12d12cf7..768decce355e 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.3 +SDL2_VERSION = 2.26.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif @@ -108,13 +112,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-xcursor endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -SDL2_DEPENDENCIES += xlib_libXinerama -SDL2_CONF_OPTS += --enable-video-x11-xinerama -else -SDL2_CONF_OPTS += --disable-video-x11-xinerama -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) SDL2_DEPENDENCIES += xlib_libXi SDL2_CONF_OPTS += --enable-video-x11-xinput @@ -136,13 +133,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-scrnsaver endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -SDL2_DEPENDENCIES += xlib_libXxf86vm -SDL2_CONF_OPTS += --enable-video-x11-vm -else -SDL2_CONF_OPTS += --disable-video-x11-vm -endif - else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash index f3bab151f22c..4592014d7f30 100644 --- a/package/sdl2_mixer/sdl2_mixer.hash +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 SDL2_mixer-2.0.4.tar.gz -sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt +sha256 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f SDL2_mixer-2.6.3.tar.gz +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk index f349b8ca80cf..074e28220549 100644 --- a/package/sdl2_mixer/sdl2_mixer.mk +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -4,11 +4,11 @@ # ################################################################################ -SDL2_MIXER_VERSION = 2.0.4 +SDL2_MIXER_VERSION = 2.6.3 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib -SDL2_MIXER_LICENSE_FILES = COPYING.txt +SDL2_MIXER_LICENSE_FILES = LICENSE.txt SDL2_MIXER_INSTALL_STAGING = YES SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 96caf63b303d..dbe9ac315447 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y) SEATD_CONF_OPTS += -Dlibseat-seatd=enabled -Dserver=enabled define SEATD_USERS - - - video -1 - - - - - + - - seat -1 - - - - - endef define SEATD_INSTALL_INIT_SYSV diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index 60a32022e6c1..c9b9c8be8df0 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.6.0/sngrep-1.6.0.tar.gz.md5sum -md5 1519ca6cd1167c0722debfb96e2ac173 sngrep-1.6.0.tar.gz +# From https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz.md5sum +md5 ee3cc7bd75adeb713411aa678e45ae4c sngrep-1.7.0.tar.gz # Locally computed -sha256 fd80964d6560f2ff57b4f5bef2353d1a6f7c48d2f1a5f0a167c854bd2e801999 sngrep-1.6.0.tar.gz +sha256 2e5ba3a4d6486ea00bd73d2cceff383ba162dcd6d0170ae74cfa3b1c206e2cb1 sngrep-1.7.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index eedb99492f5f..b86d7e83f0ac 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,11 +4,12 @@ # ################################################################################ -SNGREP_VERSION = 1.6.0 +SNGREP_VERSION = 1.7.0 SNGREP_SITE = \ https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE +SNGREP_CPE_ID_VENDOR = irontec SNGREP_AUTORECONF = YES SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf diff --git a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch b/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch deleted file mode 100644 index f60f84f9a25b..000000000000 --- a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch +++ /dev/null @@ -1,39 +0,0 @@ -fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -auth_priv.cpp: In member function 'virtual int Snmp_pp::AuthMD5::password_to_key(const unsigned char*, unsigned int, const unsigned char*, unsigned int, unsigned char*, unsigned int*)': -auth_priv.cpp:1132:20: error: aggregate 'Snmp_pp::MD5HashStateType md5_hash_state' has incomplete type and cannot be defined - MD5HashStateType md5_hash_state; - ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/b50b883c03e82564198a8b7e91bd14bf007772e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: merged (emailed to katz.agentpp.com@magenta.de)] - -diff -Naurp snmp++-3.4.9.orig/src/auth_priv.cpp snmp++-3.4.9/src/auth_priv.cpp ---- snmp++-3.4.9.orig/src/auth_priv.cpp 2022-05-13 11:39:14.083038544 +0200 -+++ snmp++-3.4.9/src/auth_priv.cpp 2022-05-13 15:00:42.576102348 +0200 -@@ -79,8 +79,9 @@ static const char *loggerModuleName = "s - - /* -- START: Defines for OpenSSL -- */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) --// OpenSSL versions up to 1.0.x and LibreSSL -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) -+// OpenSSL versions up to 1.0.x and LibreSSL versions up to 3.4.x - typedef EVP_MD_CTX EVPHashStateType; - - int evpAllocAndInit(EVP_MD_CTX *ctx, const EVP_MD *md) -@@ -138,7 +139,7 @@ typedef EVP_MD_CTX* MD5HashSta - #define MD5_PROCESS(s, p, l) EVP_DigestUpdate(*(s), p, l) - #define MD5_DONE(s, k) evpDigestFinalAndFree(s, k) - --#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - - typedef DES_key_schedule DESCBCType; - #define DES_CBC_START_ENCRYPT(c, iv, k, kl, r, s) \ diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch new file mode 100644 index 000000000000..4e81f7bfc157 --- /dev/null +++ b/package/snmppp/0001-fix-build-without-v3.patch @@ -0,0 +1,43 @@ +fix build without v3 + +Fix the following build failure without version3 raised since version +3.5.0: + +msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': +msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? + 263 | if (m_target->get_version() == version3) { + | ^~~~~~~~ + | version1 + +Fixes: + - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to katz.agentpp.com@magenta.de] + +diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp +--- snmp++-3.5.0.orig/src/msgqueue.cpp 2023-03-20 10:49:30.629000853 +0100 ++++ snmp++-3.5.0/src/msgqueue.cpp 2023-03-20 10:51:36.880664304 +0100 +@@ -260,18 +260,20 @@ + m_target->set_retry(m_target->get_retry() - 1); + SetSendTime(); + int status; +- if (m_target->get_version() == version3) { + #ifdef _SNMPv3 ++ if (m_target->get_version() == version3) { + // delete entry in cache + if (m_snmp->get_mpv3()) + m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id()); +-#endif + status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(), + *m_target, m_callBack, m_callData, m_socket, 0, this); + } + else { ++#endif + status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address); ++#ifdef _SNMPv3 + } ++#endif + if (status != 0) + return SNMP_CLASS_TL_FAILED; + diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 6dc3d39ced1a..74c6a3e98f2b 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d7a77fd05ecd99b25c51cbab08dfeef22a5edf2677875695c213631af59d5bae snmp++-3.4.10.tar.gz +sha256 43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf snmp++-3.5.0.tar.gz sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 005a5a9f3526..9f1916dd662b 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.10 +SNMPPP_VERSION = 3.5.0 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 4617725571ad..f7293bd262d1 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 03dda8653367501b7b1188a6b6513416902372e27475553de9318ee89ac390ff sofia-sip-1.13.12.tar.gz +sha256 846b3d5eef57702e8d18967070b538030252116af1500f4baa78ad068c5fdd64 sofia-sip-1.13.15.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 59c365365be9..9734da5020c7 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.12 +SOFIA_SIP_VERSION = 1.13.15 SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 5944ea3a2869..872b18ad15ee 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,8 +12,11 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_GETTEXTIZE = YES -SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile -SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" +SPEECHD_DEPENDENCIES = \ + host-pkgconf dotconf libglib2 libsndfile $(TARGET_NLS_DEPENDENCIES) +SPEECHD_CONF_ENV = \ + ac_cv_prog_HELP2MAN="" \ + LIBS=$(TARGET_NLS_LIBS) SPEECHD_CONF_OPTS = \ --disable-python \ --without-espeak \ diff --git a/package/speex/speex.mk b/package/speex/speex.mk index 6d61e93833dc..0bbcb2bde2f6 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -26,6 +26,10 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y) SPEEX_CONF_OPTS += --enable-arm5e-asm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SPEEX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define SPEEX_LIBTOOL_FIXUP $(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(@D)/libtool $(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(@D)/libtool diff --git a/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch new file mode 100644 index 000000000000..edb8b2ed1796 --- /dev/null +++ b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch @@ -0,0 +1,43 @@ +From 5e580eefac44d0c709afcf93eb5fca2fb353166a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 26 May 2023 13:38:34 -0700 +Subject: [PATCH] server: add SSL_OP_NO_RENEGOTIATION fallback path + +With LibreSSL SSL_OP_NO_CLIENT_RENEGOTIATION is opaque which is not +compatible with the OpenSSL 1.0.2 and earlier code path in +red-stream.cpp while SSL_OP_NO_RENEGOTIATION is not yet defined for the +newer OpenSSL code path in reds.cpp. + +So with OpenSSL 1.1.0 and later if SSL_OP_NO_RENEGOTIATION is undefined +and SSL_OP_NO_CLIENT_RENEGOTIATION is defined then define the former as +the latter. This will allow the build to succeed with LibreSSL 3.7.2 and +in the future when newer LibreSSL versions add SSL_OP_NO_RENEGOTIATION +that code path will then be used automatically. + +Signed-off-by: orbea +Acked-by: Frediano Ziglio + +Upstream: https://gitlab.freedesktop.org/spice/spice/-/commit/5e580eefac44d0c709afcf93eb5fca2fb353166a +Signed-off-by: Fabrice Fontaine +--- + server/red-stream.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/server/red-stream.h b/server/red-stream.h +index 716e93317..8e57c5e5e 100644 +--- a/server/red-stream.h ++++ b/server/red-stream.h +@@ -25,6 +25,10 @@ + + SPICE_BEGIN_DECLS + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(SSL_OP_NO_RENEGOTIATION) && defined(SSL_OP_NO_CLIENT_RENEGOTIATION) ++#define SSL_OP_NO_RENEGOTIATION SSL_OP_NO_CLIENT_RENEGOTIATION ++#endif ++ + typedef void (*AsyncReadDone)(void *opaque); + typedef void (*AsyncReadError)(void *opaque, int err); + +-- +GitLab + diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 789eddfa0aa2..3e35959120ca 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.40.1 SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES diff --git a/package/squid/Config.in b/package/squid/Config.in index 62721407687c..149884d8150d 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,18 +1,18 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP diff --git a/package/squid/squid.hash b/package/squid/squid.hash index b00d14011e18..4a8ea5d550b1 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v5/squid-5.7.tar.xz.asc -md5 7a3764a3c5833631a779d7827901cda7 squid-5.7.tar.xz -sha1 141e8007d6b1cfee34654127a9ca025125b37b58 squid-5.7.tar.xz +# From http://www.squid-cache.org/Versions/v6/squid-6.6.tar.xz.asc +md5 5a41134ee1b7e75f62088acdec92d2ca squid-6.6.tar.xz +sha1 f05e06a9dd3bf7501d2844e43d9ae1bd00e9edcc squid-6.6.tar.xz # Locally calculated -sha256 6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 squid-5.7.tar.xz +sha256 55bd7f9f4898153161ea1228998acb551bf840832b9e5b90fc8ecd2942420318 squid-6.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 355af0b9027d..6a2b52233647 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQUID_VERSION = 5.7 +SQUID_VERSION = 6.6 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v5 +SQUID_SITE = http://www.squid-cache.org/Versions/v6 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache @@ -21,7 +21,7 @@ SQUID_CONF_ENV = \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ BUILDCXX="$(HOSTCXX)" \ - BUILDCXXFLAGS="$(HOST_CXXFLAGS)" + BUILDCXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" SQUID_CONF_OPTS = \ --enable-async-io=8 \ --enable-linux-netfilter \ diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 897b3b6505d1..6ef7cda1a978 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -9,6 +9,7 @@ SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING +SSLH_CPE_ID_VENDOR = sslh_project SSLH_DEPENDENCIES = pcre2 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index a62488907f8c..fe7aaf6ac968 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -18,8 +18,11 @@ STELLARIUM_DEPENDENCIES = \ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_SHOWMYSKY=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DENABLE_XLSX=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) @@ -34,13 +37,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport ifeq ($(BR2_PACKAGE_GPSD),y) STELLARIUM_DEPENDENCIES += gpsd endif -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=ON \ - -DUSE_PLUGIN_TELESCOPECONTROL=ON +STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=OFF \ - -DUSE_PLUGIN_TELESCOPECONTROL=OFF +STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF endif $(eval $(cmake-package)) diff --git a/package/strace/Config.in b/package/strace/Config.in index dc245c7297bc..e0551f386134 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_STRACE 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 + # needs at least kernel headers 5.0 on musl aarch64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \ + !(BR2_aarch64 || BR2_aarch64_be) || \ + !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -22,3 +26,8 @@ comment "strace needs a toolchain w/ headers >= 4.0 on nios2" comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" depends on BR2_xtensa depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64" + depends on BR2_aarch64 || BR2_aarch64_be + depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index f2e597e0163a..5231e69ca824 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -204,9 +204,6 @@ config BR2_PACKAGE_STRONGSWAN_PKI bool "Enable pki certificate utility" default y -config BR2_PACKAGE_STRONGSWAN_SCEP - bool "Enable SCEP client tool" - config BR2_PACKAGE_STRONGSWAN_SCRIPTS bool "Enable additional utilities (found in scripts directory)" default y diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 4822f9152fd1..ed8cf0ae31d5 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.8.tar.bz2.md5 -md5 f46b0d3e7aed88824650d0721c887443 strongswan-5.9.8.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.13.tar.bz2.md5 +md5 9ada6be0c89846fb7ded1787a17cfbb2 strongswan-5.9.13.tar.bz2 # Calculated based on the hash above -sha256 d3303a43c0bd7b75a12b64855e8edcb53696f06190364f26d1533bde1f2e453c strongswan-5.9.8.tar.bz2 +sha256 56e30effb578fd9426d8457e3b76c8c3728cd8a5589594b55649b2719308ba55 strongswan-5.9.13.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index cae1433e3922..5521fb7dd45e 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.8 +STRONGSWAN_VERSION = 5.9.13 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ @@ -33,7 +33,6 @@ STRONGSWAN_CONF_OPTS += \ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \ --enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no) \ - --enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch deleted file mode 100644 index 32edd148a0ca..000000000000 --- a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Feb 2023 10:01:25 +0100 -Subject: [PATCH] configure.ac: fix openssl static build - -Do not use AX_APPEND_FLAG as it will break static builds by removing -duplicates such as -lz or -latomic which are needed by -lssl and --lcrypto. This will fix the following build failure with sparc which -needs -latomic: - -Checking for X509_STORE_CTX_get0_cert -configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 -/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': -x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' - -[...] - -In file included from ./hostcheck.c:38: -../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' - 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) - | ^~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/sudo-project/sudo/pull/244] ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8eccad7e4..523d8e56b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then - SUDO_APPEND_LIBPATH([LIBTLS], [$f]) - ;; - *) -- AX_APPEND_FLAG([$f], [LIBTLS]) -+ # Do not use AX_APPEND_FLAG as it will break static builds by removing -+ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto -+ LIBTLS="$LIBTLS $f" - ;; - esac - done --- -2.39.0 - diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch new file mode 100644 index 000000000000..446f1d179781 --- /dev/null +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch @@ -0,0 +1,41 @@ +From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 17 Feb 2024 17:52:45 +0100 +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() + +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) +broke the build on C libraries that miss process_vm_readv(), like +uClibc-ng. + +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, +but is then re-assigned and used a few lines below, outside any guard. + +Fix that by always declaring the object, as it is always needed. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c +--- + src/exec_ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c +index 9dd36c275..3d44b82e2 100644 +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, + unsigned long addr, unsigned long strtab) + { + const unsigned long strtab0 = strtab; ++ ssize_t nwritten; + size_t i; + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); + + #ifdef HAVE_PROCESS_VM_READV +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); + if (nwritten != -1 || errno != ENOSYS) + debug_return_ssize_t(nwritten); + #endif /* HAVE_PROCESS_VM_READV */ +-- +2.43.0 + diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index c920b9fe7449..066d3b9de6d0 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 sudo-1.9.12p2.tar.gz +sha256 558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558 sudo-1.9.15p5.tar.gz # Locally calculated -sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md +sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 3b5c8989175d..7961a9900248 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.12 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.15 +SUDO_VERSION_MINOR = p5 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -13,8 +13,6 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo -# We're patching configure.ac -SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ @@ -60,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 1f9ad4102bbf..6bdd512eac04 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -44,6 +44,7 @@ SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON +SUPERTUXKART_SUPPORTS_IN_SOURCE_BUILD = NO else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF diff --git a/package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch b/package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch similarity index 100% rename from package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch rename to package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch diff --git a/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch b/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch deleted file mode 100644 index 424b30d317f8..000000000000 --- a/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 44fe2328b715db25134ee095526d2fa47e6cd834 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Wed, 1 Jan 2020 15:25:57 +0100 -Subject: [PATCH] python: ensure proper shabang on python scripts - -When instlling python scripts, distutils would use the python used to -run setup.py as shabang for the scripts it installs. - -However, when cross-compiling, this is most often not correct. - -Instead, using '/usr/bin/env python' is guaranteed to find the proper -python in the PATH, so we need to instruct setyup.py to use that as the -executable. - -[yann.morin.1998@free.fr: - - author did not provide their SoB, but it's simple enough to - not require it for once - - provide proper commit log -] -Signed-off-by: Yann E. MORIN -[Fabrice: update for 6.0.0] -Signed-off-by: Fabrice Fontaine ---- - python/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index 59d195f29..a41604f72 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -6,11 +6,11 @@ EXTRA_DIST = setup.py \ - if HAVE_PYTHON_DISTUTILS - all-local: - cd $(srcdir) && \ -- $(HAVE_PYTHON) setup.py build --build-base "$(abs_builddir)" -+ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base "$(abs_builddir)" - - install-exec-local: - cd $(srcdir) && \ -- $(HAVE_PYTHON) setup.py build --build-base "$(abs_builddir)" \ -+ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base "$(abs_builddir)" \ - install --prefix $(DESTDIR)$(prefix) - - uninstall-local: --- -2.20.1 - diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index 38ab5e9cd3e3..41befa61b96b 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 00173634fa76aee636e38a90b1c02616c903e42173107d47b4114960b5fbe839 suricata-6.0.6.tar.gz +sha256 1bd546149ac6671c2476d520a38eab7755e10c3080fd2ec2dc8624b0cf89ee75 suricata-6.0.15.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 72b72cc94dc5..5b5263532845 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,13 +4,12 @@ # ################################################################################ -SURICATA_VERSION = 6.0.6 +SURICATA_VERSION = 6.0.15 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE SURICATA_CPE_ID_VENDOR = oisf -# 0001-python-ensure-proper-shabang-on-python-scripts.patch -# 0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch +# 0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch SURICATA_AUTORECONF = YES SURICATA_DEPENDENCIES = \ diff --git a/package/sway/Config.in b/package/sway/Config.in index f8d073520f10..08b691106945 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -2,17 +2,15 @@ config BR2_PACKAGE_SWAY bool "sway" depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots - depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, pango depends on BR2_USE_WCHAR # pango - depends on BR2_TOOLCHAIN_HAS_THREADS # pango depends on BR2_USE_MMU # pango depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango select BR2_PACKAGE_WLROOTS select BR2_PACKAGE_JSON_C @@ -20,6 +18,7 @@ config BR2_PACKAGE_SWAY select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_PANGO + select BR2_PACKAGE_XKEYBOARD_CONFIG # runtime help i3-compatible Wayland compositor diff --git a/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch b/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch deleted file mode 100644 index 3521bd3f8dfe..000000000000 --- a/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0dbebd008c04d266dc41c4bec8280a0744fd5130 Mon Sep 17 00:00:00 2001 -From: Francis Laniel -Date: Wed, 13 Apr 2022 18:01:11 +0100 -Subject: [PATCH] cmake: Check USE_BUNDLED_DEPS before getting - nlohmann-json. - -Upstream: https://github.com/draios/sysdig/pull/1869 -Signed-off-by: Francis Laniel ---- - cmake/modules/nlohmann-json.cmake | 29 +++++++++++++++++++---------- - 1 file changed, 19 insertions(+), 10 deletions(-) - -diff --git a/cmake/modules/nlohmann-json.cmake b/cmake/modules/nlohmann-json.cmake -index bb1279d7..feb0f071 100644 ---- a/cmake/modules/nlohmann-json.cmake -+++ b/cmake/modules/nlohmann-json.cmake -@@ -16,13 +16,22 @@ - # limitations under the License. - # - --set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") --message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") --set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") --ExternalProject_Add( -- njson -- URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" -- URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801" -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -+if(NOT USE_BUNDLED_DEPS) -+ find_path(NJSON_INCLUDE_DIR NAMES nlohmann/json.hpp) -+ if(NJSON_INCLUDE_DIR) -+ message(STATUS "Found njson: include: ${NJSON_INCLUDE_DIR}") -+ else() -+ message(FATAL_ERROR "Couldn't find system njson") -+ endif() -+else() -+ set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") -+ message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") -+ set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") -+ ExternalProject_Add( -+ njson -+ URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" -+ URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801" -+ CONFIGURE_COMMAND "" -+ BUILD_COMMAND "" -+ INSTALL_COMMAND "") -+endif() --- -2.25.1 - diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b7876843f..efb640fd4393 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index eaf505dc493d..ec0c66615777 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ @@ -14,14 +14,13 @@ SYSSTAT_LICENSE_FILES = COPYING SYSSTAT_CPE_ID_VENDOR = sysstat_project SYSSTAT_SELINUX_MODULES = sysstat -# NVD is not up-to-date; 12.6.1 includes c1e631eddc50, which fixes the issue -SYSSTAT_IGNORE_CVES += CVE-2022-39377 - ifeq ($(BR2_PACKAGE_LM_SENSORS),y) SYSSTAT_DEPENDENCIES += lm-sensors SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f4d933779e8..8c01a9ed74d4 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_FSCK + select BR2_PACKAGE_UTIL_LINUX_SULOGIN select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS @@ -100,7 +101,7 @@ menuconfig BR2_PACKAGE_SYSTEMD the apropriate ones (e.g. e2fsck, from the e2fsprogs package) according to the system configuration. - http://freedesktop.org/wiki/Software/systemd + https://freedesktop.org/wiki/Software/systemd/ if BR2_PACKAGE_SYSTEMD @@ -185,7 +186,7 @@ config BR2_PACKAGE_SYSTEMD_BACKLIGHT systemd-backlight is a service that restores the display backlight brightness at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html config BR2_PACKAGE_SYSTEMD_BINFMT bool "enable binfmt tool" @@ -202,7 +203,7 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP kernel when a user space program receives a fatal signal and dumps core. - http://www.freedesktop.org/software/systemd/man/systemd-coredump.html + https://www.freedesktop.org/software/systemd/man/systemd-coredump.html config BR2_PACKAGE_SYSTEMD_PSTORE bool "enable pstore support" @@ -220,7 +221,7 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT systemd-firstboot initializes the most basic system settings interactively on the first boot. - http://www.freedesktop.org/software/systemd/man/systemd-firstboot.html + https://www.freedesktop.org/software/systemd/man/systemd-firstboot.html config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" @@ -229,7 +230,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE When this features is enabled, additional tools and services are built to support suspending and resuming the system. - http://www.freedesktop.org/software/systemd/man/systemd-sleep.html + https://www.freedesktop.org/software/systemd/man/systemd-sleep.html config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" @@ -261,7 +262,7 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED systemd-hostnamed is a system service that may be used as a mechanism to change the system's hostname. - http://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" @@ -286,7 +287,7 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD machine and container images for systemd-machined and machinectl. - http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands + https://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands config BR2_PACKAGE_SYSTEMD_CATALOGDB bool "enable journal catalog database installation" @@ -309,14 +310,14 @@ config BR2_PACKAGE_SYSTEMD_LOCALED mechanism to change the system locale settings, as well as the console key mapping and default X11 key mapping. - http://www.freedesktop.org/software/systemd/man/systemd-localed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-localed.service.html config BR2_PACKAGE_SYSTEMD_LOGIND bool "enable login daemon" help systemd-logind is a system service that manages user logins. - http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html + https://www.freedesktop.org/software/systemd/man/systemd-logind.service.html config BR2_PACKAGE_SYSTEMD_MACHINED bool "enable machine daemon" @@ -325,7 +326,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED virtual machines and containers, and processes belonging to them. - http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html + https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" @@ -336,7 +337,7 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME primarily providing hostname resolution for the locally configured system hostname as returned by gethostname(2). - http://www.freedesktop.org/software/systemd/man/nss-myhostname.html + https://www.freedesktop.org/software/systemd/man/nss-myhostname.html config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" @@ -349,7 +350,7 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD This simple network configuration solution is an alternative to dhcpcd or ISC dhcp. - http://www.freedesktop.org/software/systemd/man/systemd-networkd.html + https://www.freedesktop.org/software/systemd/man/systemd-networkd.html config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" @@ -373,7 +374,7 @@ config BR2_PACKAGE_SYSTEMD_POLKIT useful for allowing unprivileged processes to speak to systemd's many privileged processes. - http://wiki.freedesktop.org/www/Software/polkit/ + https://wiki.freedesktop.org/www/Software/polkit/ comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ @@ -408,7 +409,7 @@ config BR2_PACKAGE_SYSTEMD_QUOTACHECK file systems are mounted. It is pulled in only if at least one file system has quotas enabled. - http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + https://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html config BR2_PACKAGE_SYSTEMD_RANDOMSEED bool "enable random-seed support" @@ -418,7 +419,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED shutdown. Saving/restoring the random seed across boots increases the amount of available entropy early at boot. - http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html config BR2_PACKAGE_SYSTEMD_REPART bool "enable repart support" @@ -440,7 +441,7 @@ config BR2_PACKAGE_SYSTEMD_RESOLVED caching and validating DNS/DNSSEC stub resolver, as well as an LLMNR resolver and responder. - http://www.freedesktop.org/software/systemd/man/systemd-resolved.html + https://www.freedesktop.org/software/systemd/man/systemd-resolved.html config BR2_PACKAGE_SYSTEMD_RFKILL bool "enable rfkill tools" @@ -448,7 +449,7 @@ config BR2_PACKAGE_SYSTEMD_RFKILL systemd-rfkill is a service that restores the RF kill switch state at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-rfkill@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-rfkill.service.html config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT bool "enable SMACK support" @@ -503,7 +504,7 @@ config BR2_PACKAGE_SYSTEMD_SYSUSERS systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). - http://www.freedesktop.org/software/systemd/man/systemd-sysusers.html + https://www.freedesktop.org/software/systemd/man/systemd-sysusers.html config BR2_PACKAGE_SYSTEMD_TIMEDATED bool "enable timedate daemon" @@ -513,7 +514,7 @@ config BR2_PACKAGE_SYSTEMD_TIMEDATED mechanism to change the system clock and timezone, as well as to enable/disable NTP time synchronization. - http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html + https://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable timesync daemon" @@ -526,7 +527,7 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD This simple NTP solution is an alternative to sntp/ntpd from the ntp package. - http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html + https://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" @@ -567,6 +568,6 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE systemd-vconsole-setup is an early boot service that configures the virtual console font and console keymap. - http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html endif diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 63467171ed8f..d23525686790 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -670,9 +670,9 @@ SYSTEMD_TARGET_FINALIZE_HOOKS += \ SYSTEMD_INSTALL_RESOLVCONF_HOOK ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd provides multiple units to autospawn getty as neede +# systemd provides multiple units to autospawn getty as needed # * getty@.service to start a getty on normal TTY -# * sertial-getty@.service to start a getty on serial lines +# * serial-getty@.service to start a getty on serial lines # * console-getty.service for generic /dev/console # * container-getty@.service for a getty on /dev/pts/* # @@ -680,18 +680,18 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * read the console= kernel command line parameter # * enable one of the above units depending on what it finds # -# Systemd defaults to enablinb getty@tty1.service +# Systemd defaults to enabling getty@tty1.service # # What we want to do -# * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH +# * Enable a getty on $BR2_TARGET_GENERIC_GETTY_PORT # * Set the baudrate for all units according to BR2_TARGET_GENERIC_GETTY_BAUDRATE # * Always enable a getty on the console using systemd-getty-generator # (backward compatibility with previous releases of buildroot) # # What we do # * disable getty@tty1 (enabled by upstream systemd) -# * enable getty@xxx if $BR2_TARGET_GENERIC_TTY_PATH is a tty -# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH +# * enable getty@xxx if $BR2_TARGET_GENERIC_GETTY_PORT is a tty +# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_GETTY_PORT # * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 7d1b2e8422c5..e83aa451f337 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0 taglib-1.13.tar.gz +sha256 c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b taglib-1.13.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index c68789100261..9bdf05b85d41 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.13 +TAGLIB_VERSION = 1.13.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 diff --git a/package/tar/0002-Fix-boundary-checking-in-base-256-decoder.patch b/package/tar/0002-Fix-boundary-checking-in-base-256-decoder.patch new file mode 100644 index 000000000000..7bad339fe0d5 --- /dev/null +++ b/package/tar/0002-Fix-boundary-checking-in-base-256-decoder.patch @@ -0,0 +1,33 @@ +From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sat, 11 Feb 2023 11:57:39 +0200 +Subject: [PATCH] Fix boundary checking in base-256 decoder + +* src/list.c (from_header): Base-256 encoding is at least 2 bytes +long. + +Signed-off-by: Peter Korsgaard +Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 +--- + src/list.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/list.c b/src/list.c +index 9fafc425..86bcfdd1 100644 +--- a/src/list.c ++++ b/src/list.c +@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, + where++; + } + } +- else if (*where == '\200' /* positive base-256 */ +- || *where == '\377' /* negative base-256 */) ++ else if (where <= lim - 2 ++ && (*where == '\200' /* positive base-256 */ ++ || *where == '\377' /* negative base-256 */)) + { + /* Parse base-256 output. A nonnegative number N is + represented as (256**DIGS)/2 + N; a negative number -N is +-- +2.39.2 + diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 80d7495b005d..dc17647b2c92 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,8 +13,9 @@ TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu -# only tar <= 1.16 -TAR_IGNORE_CVES += CVE-2007-4476 + +# 0002-Fix-boundary-checking-in-base-256-decoder.patch +TAR_IGNORE_CVES += CVE-2022-48303 ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl diff --git a/package/targetcli-fb/Config.in b/package/targetcli-fb/Config.in index 04c6a1ac09dd..eb7528fbea45 100644 --- a/package/targetcli-fb/Config.in +++ b/package/targetcli-fb/Config.in @@ -1,12 +1,23 @@ -comment "targetcli-fb depends on Python" +comment "targetcli-fb needs Python, a glibc toolchain, gcc >= 4.9, host gcc >= 8" depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_TARGETCLI_FB bool "targetcli-fb" depends on BR2_PACKAGE_PYTHON3 # python-configshell-fb + depends on BR2_USE_MMU # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # 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 select BR2_PACKAGE_PYTHON_CONFIGSHELL_FB select BR2_PACKAGE_PYTHON_RTSLIB_FB select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON_GOBJECT help targetcli-fb is a command-line interface for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 64f68a6675ab..1732fa99e54e 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz +sha256 605f4e4e4e7189d6a03f11a4f55e7ddb4671002d542c2f684f87dd68391dcdc2 targetcli-fb-2.1.58.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index c6ca776b27f3..e3f384810b32 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,13 +6,17 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.54 +TARGETCLI_FB_VERSION = 2.1.58 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project TARGETCLI_FB_SETUP_TYPE = setuptools -TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six +TARGETCLI_FB_DEPENDENCIES = \ + python-configshell-fb \ + python-gobject \ + python-rtslib-fb \ + python-six define TARGETCLI_FB_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/targetcli-fb/S50target \ diff --git a/package/tcl/0001-dont-build-compat.patch b/package/tcl/0001-Disable-tcl-compatibility-layers.patch similarity index 61% rename from package/tcl/0001-dont-build-compat.patch rename to package/tcl/0001-Disable-tcl-compatibility-layers.patch index 7a7d959cd254..b7b776ad5ddf 100644 --- a/package/tcl/0001-dont-build-compat.patch +++ b/package/tcl/0001-Disable-tcl-compatibility-layers.patch @@ -1,4 +1,6 @@ +From c829552921f0c7c8e522f911135ee100742b441b Mon Sep 17 00:00:00 2001 From: Andrew Ruder +Date: Tue, 8 Apr 2014 15:54:04 -0500 Subject: [PATCH] Disable tcl compatibility layers Turn off building compatibility layers for old/broken versions of @@ -9,17 +11,25 @@ to not have broken behavior. Signed-off-by: Andrew Ruder [Fabrice: Update for 8.6.12] Signed-off-by: Fabrice Fontaine +[Julien: Update for 8.6.13] +Signed-off-by: Julien Olivain --- + unix/tcl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index ca94abd4ad..42eb58d384 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ +@@ -2646,7 +2646,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ #include #include int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], - [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) -+ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then ++ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=ok])) + if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then tcl_ok=1 else +-- +2.41.0 + diff --git a/package/tcl/Config.in b/package/tcl/Config.in index f1fa0541a1b3..adb9f224883a 100644 --- a/package/tcl/Config.in +++ b/package/tcl/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_TCL # See this mailing list thread: # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_ZLIB help TCL (Tool Command Language) is a simple textual language. diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 97754b63d02b..0d8fe17c0e7b 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -75,7 +75,8 @@ TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) + $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ + zlib $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index e548e3262698..1a22889851c3 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at # https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 tcpdump-4.99.3.tar.gz +sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7a679ce4bfd6..91643e7beaa6 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.3 +TCPDUMP_VERSION = 4.99.4 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch deleted file mode 100644 index 73c0d10ffc49..000000000000 --- a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 -From: Su Laus -Date: Sat, 21 Jan 2023 15:58:10 +0000 -Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. - -[Retrieved from: -https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] -Signed-off-by: Fabrice Fontaine ---- - tools/tiffcrop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c -index 14fa18da..7db69883 100644 ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, - cropsize + NUM_BUFF_OVERSIZE_BYTES); - else - { -- prev_cropsize = seg_buffs[0].size; -+ prev_cropsize = seg_buffs[i].size; - if (prev_cropsize < cropsize) - { - next_buff = _TIFFrealloc( --- -GitLab - diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 73732892a54c..3aae7dc4d5f7 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a tiff-4.6.0.tar.gz sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f9754a4b4906..e384e8b81411 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.5.0 +TIFF_VERSION = 4.6.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = LICENSE.md @@ -12,22 +12,17 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES -# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch -TIFF_IGNORE_CVES += CVE-2022-48281 - # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ --disable-contrib \ --disable-tests \ - --disable-webp \ - --without-x + --disable-webp TIFF_DEPENDENCIES = host-pkgconf HOST_TIFF_CONF_OPTS = \ --disable-cxx \ - --without-x \ --disable-zlib \ --disable-libdeflate \ --disable-lzma \ diff --git a/package/tinyssh/tinyssh.hash b/package/tinyssh/tinyssh.hash index 462ffb90023f..bdb150423477 100644 --- a/package/tinyssh/tinyssh.hash +++ b/package/tinyssh/tinyssh.hash @@ -1,3 +1,3 @@ # locally computed -sha256 234656fc8d369608eb5d0f3a26280e0e38e2e6b134cfc610b6e24bce176acd4f tinyssh-20220801.tar.gz -sha256 b5dc19477e29f4111e1c16cd89ec0782f5a07b1a30e3bdb7c155425b81b12c46 LICENCE +sha256 d2cd49d0e5e8bdb808d86f07f946a0cfbf2dc9a449a4b8243a82be267d852b62 tinyssh-20240101.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENCE diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 1472f7ead135..80b6ccb85035 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -4,9 +4,9 @@ # ################################################################################ -TINYSSH_VERSION = 20220801 +TINYSSH_VERSION = 20240101 TINYSSH_SITE = $(call github,janmojzis,tinyssh,$(TINYSSH_VERSION)) -TINYSSH_LICENSE = Public Domain, CC0-1.0 +TINYSSH_LICENSE = CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE define TINYSSH_BUILD_CMDS diff --git a/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch b/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch deleted file mode 100644 index 2df7c6b6a784..000000000000 --- a/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_dh_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/crypt_ops/crypto_dh_openssl.c ---- a/src/lib/crypt_ops/crypto_dh_openssl.c.orig -+++ b/src/lib/crypt_ops/crypto_dh_openssl.c -@@ -60,7 +60,7 @@ crypto_validate_dh_params(const BIGNUM *p, const BIGNU - /* Copy into a temporary DH object, just so that DH_check() can be called. */ - if (!(dh = DH_new())) - goto out; --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - BIGNUM *dh_p, *dh_g; - if (!(dh_p = BN_dup(p))) - goto out; -@@ -223,7 +223,7 @@ new_openssl_dh_from_params(BIGNUM *p, BIGNUM *g) - goto err; - } - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - - if (!DH_set0_pqg(res_dh, dh_p, NULL, dh_g)) { - goto err; -@@ -276,7 +276,7 @@ crypto_dh_get_bytes(crypto_dh_t *dh) - int - crypto_dh_generate_public(crypto_dh_t *dh) - { --#ifndef OPENSSL_1_1_API -+#if !defined(OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) - again: - #endif - if (!DH_generate_key(dh->dh)) { -@@ -286,7 +286,7 @@ crypto_dh_generate_public(crypto_dh_t *dh) - return -1; - /* LCOV_EXCL_STOP */ - } --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - /* OpenSSL 1.1.x doesn't appear to let you regenerate a DH key, without - * recreating the DH object. I have no idea what sort of aliasing madness - * can occur here, so do the check, and just bail on failure. -@@ -327,7 +327,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si - - const BIGNUM *dh_pub; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *dh_priv; - DH_get0_key(dh->dh, &dh_pub, &dh_priv); - #else -@@ -338,7 +338,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si - if (crypto_dh_generate_public(dh)<0) - return -1; - else { --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - DH_get0_key(dh->dh, &dh_pub, &dh_priv); - #else - dh_pub = dh->dh->pub_key; diff --git a/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch b/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch deleted file mode 100644 index 1354a4221e0d..000000000000 --- a/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_rsa_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/crypt_ops/crypto_rsa_openssl.c ---- a/src/lib/crypt_ops/crypto_rsa_openssl.c.orig -+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c -@@ -47,7 +47,7 @@ struct crypto_pk_t - int - crypto_pk_key_is_private(const crypto_pk_t *k) - { --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - if (!k || !k->key) - return 0; - -@@ -212,7 +212,7 @@ crypto_pk_public_exponent_ok(const crypto_pk_t *env) - - const BIGNUM *e; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *n, *d; - RSA_get0_key(env->key, &n, &e, &d); - #else -@@ -242,7 +242,7 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_ - const BIGNUM *a_n, *a_e; - const BIGNUM *b_n, *b_e; - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - const BIGNUM *a_d, *b_d; - RSA_get0_key(a->key, &a_n, &a_e, &a_d); - RSA_get0_key(b->key, &b_n, &b_e, &b_d); -@@ -279,7 +279,7 @@ crypto_pk_num_bits(crypto_pk_t *env) - tor_assert(env); - tor_assert(env->key); - --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - /* It's so stupid that there's no other way to check that n is valid - * before calling RSA_bits(). - */ -@@ -572,7 +572,7 @@ static bool - rsa_private_key_too_long(RSA *rsa, int max_bits) - { - const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp; --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - - #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) - n = RSA_get0_n(rsa); diff --git a/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch b/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch deleted file mode 100644 index fe8586357a65..000000000000 --- a/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with opaque structs in LibreSSL 3.5 - -Downloaded from OpenBSD ports: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_tls_x509_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup - -Patch series was sent upstream: -https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 - -Signed-off-by: Bernd Kuhls - -Index: src/lib/tls/x509_openssl.c ---- a/src/lib/tls/x509_openssl.c.orig -+++ b/src/lib/tls/x509_openssl.c -@@ -329,7 +329,7 @@ tor_tls_cert_is_valid(int severity, - cert_key = X509_get_pubkey(cert->cert); - if (check_rsa_1024 && cert_key) { - RSA *rsa = EVP_PKEY_get1_RSA(cert_key); --#ifdef OPENSSL_1_1_API -+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) - if (rsa && RSA_bits(rsa) == 1024) { - #else - if (rsa && BN_num_bits(rsa->n) == 1024) { diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 51892f15c3d8..8cc8eb435f01 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum -sha256 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d tor-0.4.7.13.tar.gz +# From https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum +sha256 e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 tor-0.4.8.10.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 03bd99870859..12dcf3f07cd8 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.13 +TOR_VERSION = 0.4.8.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f9768..c9fa4e6ae0f2 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 ba9e52117f254f357ff502e7d60fce652b3bfb26327d236bbf5ab634235e40f1 tpm2-tss-3.2.2.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377e8..10d605fc65c7 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.2 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 @@ -26,7 +26,8 @@ TPM2_TSS_CONF_OPTS = \ ac_cv_prog_result_setfacl=yes \ ac_cv_prog_systemd_sysusers=no \ ac_cv_prog_systemd_tmpfiles=no \ - ac_cv_prog_result_useradd=yes \ + ac_cv_prog_useradd=yes \ + ac_cv_prog_groupadd=yes \ --with-crypto=ossl \ --disable-doxygen-doc \ --disable-defaultflags diff --git a/package/traceroute/traceroute.hash b/package/traceroute/traceroute.hash index 83791c18a43b..cf2eb127a21c 100644 --- a/package/traceroute/traceroute.hash +++ b/package/traceroute/traceroute.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 traceroute-2.1.0.tar.gz +sha256 05ebc7aba28a9100f9bbae54ceecbf75c82ccf46bdfce8b5d64806459a7e0412 traceroute-2.1.3.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/traceroute/traceroute.mk b/package/traceroute/traceroute.mk index a02982a6b5f0..133f8d3c3ee4 100644 --- a/package/traceroute/traceroute.mk +++ b/package/traceroute/traceroute.mk @@ -4,11 +4,12 @@ # ################################################################################ -TRACEROUTE_VERSION = 2.1.0 +TRACEROUTE_VERSION = 2.1.3 TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/traceroute-$(TRACEROUTE_VERSION) TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+ TRACEROUTE_LICENSE_FILES = COPYING COPYING.LIB +TRACEROUTE_CPE_ID_VENDOR = buc define TRACEROUTE_BUILD_CMDS $(TARGET_MAKE_ENV) VPATH=$(STAGING_DIR)/usr/lib $(MAKE) $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/tree/Config.in b/package/tree/Config.in index 234995f109f4..4821b5896095 100644 --- a/package/tree/Config.in +++ b/package/tree/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_TREE dircolors if the LS_COLORS environment variable is set and output is to tty. - http://mama.indstate.edu/users/ice/tree/ + http://oldmanprogrammer.net/source.php?dir=projects/tree comment "tree needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/package/tree/tree.mk b/package/tree/tree.mk index da0acbae49b8..5b8fd47602f5 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -6,7 +6,7 @@ TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz -TREE_SITE = http://mama.indstate.edu/users/ice/tree/src +TREE_SITE = http://oldmanprogrammer.net/tar/tree TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE diff --git a/package/ttyd/Config.in b/package/ttyd/Config.in index ecc705b17e94..103a4ac4aa88 100644 --- a/package/ttyd/Config.in +++ b/package/ttyd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TTYD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv, json-c depends on BR2_USE_MMU # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBWEBSOCKETS @@ -15,7 +16,8 @@ config BR2_PACKAGE_TTYD https://github.com/tsl0922/ttyd -comment "ttyd needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "ttyd needs a toolchain w/ NPTL, dynamic library, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index aadd320063dd..5488625ddd29 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html -sha512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 tzdata2022f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html +sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 45bd7cf6e6d9..08f3c83bd1f3 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2022f +TZDATA_VERSION = 2023c TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 diff --git a/package/uclibc/0001-aarch64-add-hwcap-header-file.patch b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch new file mode 100644 index 000000000000..058e3242f94e --- /dev/null +++ b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch @@ -0,0 +1,163 @@ +From becd0cbc4168534e311f47dda6f67450ad0006b5 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Tue, 8 Aug 2023 13:47:27 +0200 +Subject: [PATCH] aarch64: add hwcap header file + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=becd0cbc4168534e311f47dda6f67450ad0006b5 +--- + include/sys/auxv.h | 1 + + libc/sysdeps/linux/aarch64/bits/hwcap.h | 99 +++++++++++++++++++++++++ + libc/sysdeps/linux/common/bits/hwcap.h | 22 ++++++ + 3 files changed, 122 insertions(+) + create mode 100644 libc/sysdeps/linux/aarch64/bits/hwcap.h + create mode 100644 libc/sysdeps/linux/common/bits/hwcap.h + +diff --git a/include/sys/auxv.h b/include/sys/auxv.h +index f35196423..b07026457 100644 +--- a/include/sys/auxv.h ++++ b/include/sys/auxv.h +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + __BEGIN_DECLS + +diff --git a/libc/sysdeps/linux/aarch64/bits/hwcap.h b/libc/sysdeps/linux/aarch64/bits/hwcap.h +new file mode 100644 +index 000000000..20061f5d1 +--- /dev/null ++++ b/libc/sysdeps/linux/aarch64/bits/hwcap.h +@@ -0,0 +1,99 @@ ++/* Defines for bits in AT_HWCAP. AArch64 Linux version. ++ Copyright (C) 2016-2023 Free Software Foundation, Inc. ++ ++ 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 ++ . */ ++ ++#if !defined (_SYS_AUXV_H) ++# error "Never include directly; use instead." ++#endif ++ ++/* The following must match the kernel's and update the ++ list together with sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c. */ ++#define HWCAP_FP (1 << 0) ++#define HWCAP_ASIMD (1 << 1) ++#define HWCAP_EVTSTRM (1 << 2) ++#define HWCAP_AES (1 << 3) ++#define HWCAP_PMULL (1 << 4) ++#define HWCAP_SHA1 (1 << 5) ++#define HWCAP_SHA2 (1 << 6) ++#define HWCAP_CRC32 (1 << 7) ++#define HWCAP_ATOMICS (1 << 8) ++#define HWCAP_FPHP (1 << 9) ++#define HWCAP_ASIMDHP (1 << 10) ++#define HWCAP_CPUID (1 << 11) ++#define HWCAP_ASIMDRDM (1 << 12) ++#define HWCAP_JSCVT (1 << 13) ++#define HWCAP_FCMA (1 << 14) ++#define HWCAP_LRCPC (1 << 15) ++#define HWCAP_DCPOP (1 << 16) ++#define HWCAP_SHA3 (1 << 17) ++#define HWCAP_SM3 (1 << 18) ++#define HWCAP_SM4 (1 << 19) ++#define HWCAP_ASIMDDP (1 << 20) ++#define HWCAP_SHA512 (1 << 21) ++#define HWCAP_SVE (1 << 22) ++#define HWCAP_ASIMDFHM (1 << 23) ++#define HWCAP_DIT (1 << 24) ++#define HWCAP_USCAT (1 << 25) ++#define HWCAP_ILRCPC (1 << 26) ++#define HWCAP_FLAGM (1 << 27) ++#define HWCAP_SSBS (1 << 28) ++#define HWCAP_SB (1 << 29) ++#define HWCAP_PACA (1 << 30) ++#define HWCAP_PACG (1UL << 31) ++ ++#define HWCAP2_DCPODP (1 << 0) ++#define HWCAP2_SVE2 (1 << 1) ++#define HWCAP2_SVEAES (1 << 2) ++#define HWCAP2_SVEPMULL (1 << 3) ++#define HWCAP2_SVEBITPERM (1 << 4) ++#define HWCAP2_SVESHA3 (1 << 5) ++#define HWCAP2_SVESM4 (1 << 6) ++#define HWCAP2_FLAGM2 (1 << 7) ++#define HWCAP2_FRINT (1 << 8) ++#define HWCAP2_SVEI8MM (1 << 9) ++#define HWCAP2_SVEF32MM (1 << 10) ++#define HWCAP2_SVEF64MM (1 << 11) ++#define HWCAP2_SVEBF16 (1 << 12) ++#define HWCAP2_I8MM (1 << 13) ++#define HWCAP2_BF16 (1 << 14) ++#define HWCAP2_DGH (1 << 15) ++#define HWCAP2_RNG (1 << 16) ++#define HWCAP2_BTI (1 << 17) ++#define HWCAP2_MTE (1 << 18) ++#define HWCAP2_ECV (1 << 19) ++#define HWCAP2_AFP (1 << 20) ++#define HWCAP2_RPRES (1 << 21) ++#define HWCAP2_MTE3 (1 << 22) ++#define HWCAP2_SME (1 << 23) ++#define HWCAP2_SME_I16I64 (1 << 24) ++#define HWCAP2_SME_F64F64 (1 << 25) ++#define HWCAP2_SME_I8I32 (1 << 26) ++#define HWCAP2_SME_F16F32 (1 << 27) ++#define HWCAP2_SME_B16F32 (1 << 28) ++#define HWCAP2_SME_F32F32 (1 << 29) ++#define HWCAP2_SME_FA64 (1 << 30) ++#define HWCAP2_WFXT (1UL << 31) ++#define HWCAP2_EBF16 (1UL << 32) ++#define HWCAP2_SVE_EBF16 (1UL << 33) ++#define HWCAP2_CSSC (1UL << 34) ++#define HWCAP2_RPRFM (1UL << 35) ++#define HWCAP2_SVE2P1 (1UL << 36) ++#define HWCAP2_SME2 (1UL << 37) ++#define HWCAP2_SME2P1 (1UL << 38) ++#define HWCAP2_SME_I16I32 (1UL << 39) ++#define HWCAP2_SME_BI32I32 (1UL << 40) ++#define HWCAP2_SME_B16B16 (1UL << 41) ++#define HWCAP2_SME_F16F16 (1UL << 42) +diff --git a/libc/sysdeps/linux/common/bits/hwcap.h b/libc/sysdeps/linux/common/bits/hwcap.h +new file mode 100644 +index 000000000..e7b899df0 +--- /dev/null ++++ b/libc/sysdeps/linux/common/bits/hwcap.h +@@ -0,0 +1,22 @@ ++/* Defines for bits in AT_HWCAP. ++ Copyright (C) 2012-2023 Free Software Foundation, Inc. ++ ++ 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 _SYS_AUXV_H ++# error "Never include directly; use instead." ++#endif ++ ++/* No bits defined for this architecture. */ +-- +2.30.2 + diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch new file mode 100644 index 000000000000..da0135a5e30c --- /dev/null +++ b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch @@ -0,0 +1,85 @@ +From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 9 Aug 2023 10:31:28 +0200 +Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 +--- + include/fcntl.h | 20 ++++++++++++++++++++ + libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- + 2 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/include/fcntl.h b/include/fcntl.h +index 136f64d70..ce15ceaf6 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, + int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); + #endif + ++#ifdef __USE_GNU ++# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ ++# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ ++/* Owner types. */ ++enum __pid_type ++ { ++ F_OWNER_TID = 0, /* Kernel thread. */ ++ F_OWNER_PID, /* Process. */ ++ F_OWNER_PGRP, /* Process group. */ ++ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ ++ }; ++ ++/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ ++struct f_owner_ex ++ { ++ enum __pid_type type; /* Owner type of ID. */ ++ __pid_t pid; /* ID of owner. */ ++ }; ++#endif ++ + __END_DECLS + + #endif /* fcntl.h */ +diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h +index c143ba9c9..dbe929351 100644 +--- a/libc/sysdeps/linux/aarch64/bits/fcntl.h ++++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h +@@ -94,8 +94,6 @@ + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ + #endif + + +@@ -170,25 +168,6 @@ struct flock64 + }; + #endif + +- +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_PGRP, /* Process group. */ +- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +-- +2.30.2 + diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 0122d08789e9..8d87c0438367 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.42/uClibc-ng-1.0.42.tar.xz.sha256 -sha256 ec6dae44ce86558885e56bc3bef6bd4d082397114e6e1fc15795f71e804d7016 uClibc-ng-1.0.42.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.44.tar.xz.sha256 +sha256 7df9d987955827382f1c2400da513456becbb6f868bdfd37737265f1cbeec994 uClibc-ng-1.0.44.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 4c05d36ab342..4e7d8de64381 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.42 +UCLIBC_VERSION = 1.0.44 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ diff --git a/package/uftp/uftp.hash b/package/uftp/uftp.hash index e47cba939402..d4d3450d1a80 100644 --- a/package/uftp/uftp.hash +++ b/package/uftp/uftp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 -sha256 f0435fbc8e9ffa125e05600cb6c7fc933d7d587f5bae41b257267be4f2ce0e61 uftp-5.0.1.tar.gz +sha256 cb8668c19b1f10bc63a16ffa893e205dc3ec86361037d477d8003260ebc40080 uftp-5.0.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index ce865c20ec44..3dcd8646c010 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -4,8 +4,8 @@ # ################################################################################ -UFTP_VERSION = 5.0.1 -UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar +UFTP_VERSION = 5.0.3 +UFTP_SITE = https://downloads.sourceforge.net/project/uftp-multicast/source-tar UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd29f..843026abc785 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e9371f..5128d0e420e3 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl diff --git a/package/unifdef/unifdef.mk b/package/unifdef/unifdef.mk index 7d10595d1b72..fd74455894c6 100644 --- a/package/unifdef/unifdef.mk +++ b/package/unifdef/unifdef.mk @@ -6,7 +6,7 @@ UNIFDEF_VERSION = 2.12 UNIFDEF_SITE = https://dotat.at/prog/unifdef -UNIFDEF_LICENSE = BSD-2-Clause +UNIFDEF_LICENSE = BSD-2-Clause, BSD-3-Clause UNIFDEF_LICENSE_FILES = COPYING define HOST_UNIFDEF_BUILD_CMDS diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 44cc2013fbcb..14ccedd48fd2 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -28,4 +28,18 @@ UNZIP_IGNORE_CVES = \ CVE-2022-0529 \ CVE-2022-0530 +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) + +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CXXFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS)) + +UNZIP_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \ + -DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT" + $(eval $(cmake-package)) diff --git a/package/urandom-scripts/S20seedrng b/package/urandom-scripts/S01seedrng similarity index 100% rename from package/urandom-scripts/S20seedrng rename to package/urandom-scripts/S01seedrng diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 32f3e09343da..89abdfff7271 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ - $(TARGET_DIR)/etc/init.d/S20seedrng + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S01seedrng \ + $(TARGET_DIR)/etc/init.d/S01seedrng endef $(eval $(generic-package)) diff --git a/package/uuu/0001-Fix-missing-references.patch b/package/uuu/0001-Fix-missing-references.patch new file mode 100644 index 000000000000..140c9755c7d6 --- /dev/null +++ b/package/uuu/0001-Fix-missing-references.patch @@ -0,0 +1,40 @@ +From 24fd043225903247f71ac10666d820277c0b10b1 Mon Sep 17 00:00:00 2001 +From: nixgnauhcuy +Date: Tue, 9 May 2023 14:32:33 +0800 +Subject: [PATCH] Fix missing references + +Upstream: https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1 + +Signed-off-by: Giulio Benetti +--- + libuuu/libcomm.h | 1 + + uuu/buildincmd.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libuuu/libcomm.h b/libuuu/libcomm.h +index 0afdfa3..38d622d 100644 +--- a/libuuu/libcomm.h ++++ b/libuuu/libcomm.h +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + * + */ ++#include + #include + #include + #include +diff --git a/uuu/buildincmd.h b/uuu/buildincmd.h +index 9415117..46286cc 100644 +--- a/uuu/buildincmd.h ++++ b/uuu/buildincmd.h +@@ -31,6 +31,7 @@ + + #pragma once + ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index a0c74bbe052d..2dc6e879e1fe 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3460842778e91e7d2fae4201e49e4521e9d94fbbf3891ae6c52d3c9fc0673598 uvw-2.12.1_libuv_v1.44.tar.gz -sha256 1e3b8fb895c0396aaa2138ff82c02968524e220645b21b0a4ac765858a898732 LICENSE +sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz +sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index b6c2135d6f0e..12149d43ca56 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.12.1_libuv_v1.44 +UVW_VERSION = 3.2.0_libuv_v1.46 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 84e1927ce327..50a168fcab7b 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -8,7 +8,6 @@ V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING -V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 51a93539609b..875c913b09fe 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,6 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE +VALIJSON_CONF_OPTS = -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch index 9e6316e28425..f6ba84c9e51e 100644 --- a/package/vdr/0001-getloadavg.patch +++ b/package/vdr/0001-getloadavg.patch @@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +/* uclibc and dietlibc do not have this junk -ReneR */ +#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) ++int getloadavg (double loadavg[], int nelem) +{ + int fd; + diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-Fix-musl-build.patch similarity index 77% rename from package/vdr/0002-musl-compat.patch rename to package/vdr/0002-Fix-musl-build.patch index b6f8f414a965..8c0b8d663bc5 100644 --- a/package/vdr/0002-musl-compat.patch +++ b/package/vdr/0002-Fix-musl-build.patch @@ -1,12 +1,28 @@ -Fix musl build +From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Tue, 16 May 2023 19:57:39 +0200 +Subject: [PATCH] Fix musl build Downloaded from https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch +Initial commit: +https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html + Signed-off-by: Bernd Kuhls +--- + i18n.h | 2 +- + osd.c | 2 +- + thread.c | 4 +++- + tools.c | 4 ++-- + tools.h | 14 ++++++++++++-- + vdr.c | 6 ++++++ + 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/i18n.h b/i18n.h -index f8ad9de..b002bbf 100644 +index 03deb6f2..85ce4077 100644 --- a/i18n.h +++ b/i18n.h @@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); @@ -19,7 +35,7 @@ index f8ad9de..b002bbf 100644 ///< the current language. If no translation is available, the original ///< string will be returned. diff --git a/osd.c b/osd.c -index 524700a..ef975f5 100644 +index 47bda686..0d360c81 100644 --- a/osd.c +++ b/osd.c @@ -12,7 +12,7 @@ @@ -32,10 +48,10 @@ index 524700a..ef975f5 100644 #include "tools.h" diff --git a/thread.c b/thread.c -index 47eb977..58dba43 100644 +index 93eb8c0d..6e854541 100644 --- a/thread.c +++ b/thread.c -@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) +@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter) writeLockThreadId = 0; pthread_rwlockattr_t attr; pthread_rwlockattr_init(&attr); @@ -45,7 +61,7 @@ index 47eb977..58dba43 100644 pthread_rwlock_init(&rwlock, &attr); } -@@ -205,7 +207,7 @@ cMutex::cMutex(void) +@@ -210,7 +212,7 @@ cMutex::cMutex(void) locked = 0; pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -55,10 +71,10 @@ index 47eb977..58dba43 100644 } diff --git a/tools.c b/tools.c -index 754673d..fef9d2d 100644 +index d04033b1..8b161eec 100644 --- a/tools.c +++ b/tools.c -@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) +@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName) { if (!FileName) return NULL; @@ -67,7 +83,7 @@ index 754673d..fef9d2d 100644 if (!TargetName) { if (errno == ENOENT) // file doesn't exist TargetName = strdup(FileName); -@@ -1528,7 +1528,7 @@ +@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir() struct dirent *cReadDir::Next(void) { if (directory) { @@ -77,7 +93,7 @@ index 754673d..fef9d2d 100644 #else while ((result = readdir(directory)) != NULL) { diff --git a/tools.h b/tools.h -index 73cca5a..03f5fd1 100644 +index ff6169ee..60eda179 100644 --- a/tools.h +++ b/tools.h @@ -28,6 +28,16 @@ @@ -97,7 +113,7 @@ index 73cca5a..03f5fd1 100644 typedef unsigned char uchar; extern int SysLogLevel; -@@ -400,7 +410,7 @@ +@@ -444,7 +454,7 @@ class cReadDir { private: DIR *directory; struct dirent *result; @@ -106,7 +122,7 @@ index 73cca5a..03f5fd1 100644 union { // according to "The GNU C Library Reference Manual" struct dirent d; char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; -@@ -738,7 +748,7 @@ public: +@@ -818,7 +828,7 @@ public: data[i] = T(0); size = 0; } @@ -116,10 +132,10 @@ index 73cca5a..03f5fd1 100644 qsort(data, size, sizeof(T), Compare); } diff --git a/vdr.c b/vdr.c -index 8a49471..c2a82aa 100644 +index 1bdc51ab..0f426e61 100644 --- a/vdr.c +++ b/vdr.c -@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) +@@ -661,12 +661,18 @@ int main(int argc, char *argv[]) } } else if (Terminal) { @@ -137,4 +153,7 @@ index 8a49471..c2a82aa 100644 +#endif } - isyslog("VDR version %s started", VDRVERSION); + // Set user id in case we were started as root: +-- +2.39.2 + diff --git a/package/vdr/0003-Include-limits.h.patch b/package/vdr/0003-Include-limits.h.patch new file mode 100644 index 000000000000..7ddfd1703c53 --- /dev/null +++ b/package/vdr/0003-Include-limits.h.patch @@ -0,0 +1,51 @@ +From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001 +From: Roberto Oliveira +Date: Tue, 16 May 2023 20:01:18 +0200 +Subject: [PATCH] Include limits.h + +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Initial commits: +https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339 +https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html + +Signed-off-by: Bernd Kuhls +--- + config.h | 1 + + tools.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 72dd3d2a..b9ea769f 100644 +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +diff --git a/tools.c b/tools.c +index 8b161eec..56a2e0dd 100644 +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ extern "C" { + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + +-- +2.39.2 + diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch deleted file mode 100644 index c2efe291e6a4..000000000000 --- a/package/vdr/0003-include-missing-limits.patch +++ /dev/null @@ -1,30 +0,0 @@ -vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined -in limits.h. -Needs to be explicitly included on ppc64le and for all archs for debug build. - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch - -Signed-off-by: Bernd Kuhls ----- - ---- a/config.h -+++ b/config.h -@@ -19,6 +19,7 @@ - #include "i18n.h" - #include "font.h" - #include "tools.h" -+#include - - // VDR's own version number: - ---- a/tools.c -+++ b/tools.c -@@ -27,6 +27,7 @@ - #include - #include "i18n.h" - #include "thread.h" -+#include - - int SysLogLevel = 3; - diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch index 9cc45a96c16f..7b1a4c2c05e5 100644 --- a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -10,6 +10,8 @@ anything because musl has a basic NLS implementation. Even gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub libintl-musl implementation. +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029745.html + Signed-off-by: Thomas Petazzoni --- i18n.c | 2 ++ diff --git a/package/vdr/0005-Fix-musl-build.patch b/package/vdr/0005-Fix-musl-build.patch new file mode 100644 index 000000000000..390e78eab56f --- /dev/null +++ b/package/vdr/0005-Fix-musl-build.patch @@ -0,0 +1,37 @@ +From 075472ec580e03cc89971f0c118cb363776a304d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 16 May 2023 20:22:12 +0200 +Subject: [PATCH] Fix musl build + +malloc_trim is a GNU extension and therefore not present in non-glibc C +libraries such as musl. Wrapping this in an ifdef fixes musl builds. + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029742.html + +Signed-off-by: Bernd Kuhls +--- + vdr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vdr.c b/vdr.c +index 0f426e61..bc4902de 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -1588,12 +1588,14 @@ int main(int argc, char *argv[]) + cSchedules::Cleanup(); + // Plugins housekeeping: + PluginManager.Housekeeping(); ++#if defined(__GLIBC__) + // Memory cleanup: + static time_t LastMemoryCleanup = 0; + if ((Now - LastMemoryCleanup) > MEMCLEANUPDELTA) { + malloc_trim(0); + LastMemoryCleanup = Now; + } ++#endif + } + } + +-- +2.39.2 + diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 4000beedc180..194bcb4378d5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz -sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt +sha256 0056537cb57190aa41c12ba6c2ad04ce10e7f714cde4c1fe7193a37e1c44db46 vim-9.1.0145.tar.gz +sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE +sha256 7a2f621c8496396dae5eecdcc4dccff9d534dff4627193d3ebf7fa6d2cb27042 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e3648bfab911..fb8062e1fa90 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.1260 +VIM_VERSION = 9.1.0145 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src diff --git a/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch b/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch index 4fc639e2229c..5211ef882b68 100644 --- a/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch +++ b/package/vlc/0006-posix-remove-ancient-run-time-fallback-to-real-time-.patch @@ -23,6 +23,7 @@ posix/thread.c: In function ‘vlc_clock_setup_once’: posix/thread.c:88:18: error: lvalue required as left operand of assignment vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC; +[Bernd: rebased for 3.0.19] Signed-off-by: Bernd Kuhls --- src/posix/thread.c | 96 +++++++----------------------------------------------- @@ -93,7 +94,7 @@ index dab8b71f97..8878941913 100644 -# warning Monotonic clock not available. Expect timing issues. -#endif /* _POSIX_TIMERS */ - - static struct timespec mtime_to_ts (mtime_t date) + static struct timespec mtime_to_ts (vlc_tick_t date) { lldiv_t d = lldiv (date, CLOCK_FREQ); @@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar) @@ -117,7 +118,7 @@ index dab8b71f97..8878941913 100644 @@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...) - mtime_t mdate (void) + vlc_tick_t mdate (void) { -#if (_POSIX_TIMERS > 0) struct timespec ts; @@ -140,7 +141,7 @@ index dab8b71f97..8878941913 100644 } #undef mwait - void mwait (mtime_t deadline) + void mwait (vlc_tick_t deadline) { -#if (_POSIX_CLOCK_SELECTION > 0) - vlc_clock_setup (); @@ -165,7 +166,7 @@ index dab8b71f97..8878941913 100644 } #undef msleep -@@ -670,15 +604,7 @@ void msleep (mtime_t delay) +@@ -670,15 +604,7 @@ void msleep (vlc_tick_t delay) { struct timespec ts = mtime_to_ts (delay); diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 4b9940df33fd..40529bd6648d 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256 -sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz -# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1 -sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz +# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha256 +sha256 adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5 vlc-3.0.20.tar.xz +# From https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.sha1 +sha1 b834516ab701bf6311980ed5d67b77c834fdebe7 vlc-3.0.20.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index c6ae46f46940..d0fc1744c018 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.18 +VLC_VERSION = 3.0.20 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/package/wampcc/Config.in b/package/wampcc/Config.in index 92abc9cb25ab..41919361136e 100644 --- a/package/wampcc/Config.in +++ b/package/wampcc/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_WAMPCC depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LIBUV select BR2_PACKAGE_JANSSON @@ -16,12 +17,13 @@ config BR2_PACKAGE_WAMPCC https://github.com/darrenjs/wampcc -comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library" +comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 comment "wampcc needs a toolchain not affected by GCC bug 64735" depends on BR2_USE_MMU diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 000000000000..c9667fedbdd3 --- /dev/null +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.39.2 + diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 976341093e53..2a72cb084183 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c771297b5a16..ac4799d4cf90 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,6 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums -md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz -sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz -sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea041..73d9beb83b11 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.5 +WEBKITGTK_VERSION = 2.42.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk -WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ +WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ @@ -24,6 +24,7 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_SPELLCHECK=ON \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ + -DUSE_AVIF=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_SOUP2=ON \ @@ -70,6 +71,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON +WEBKITGTK_DEPENDENCIES += libjxl +else +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBMANETTE),y) WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON WEBKITGTK_DEPENDENCIES += libmanette @@ -77,35 +85,41 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Only one target platform can be built, assume X11 > Wayland +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON +WEBKITGTK_DEPENDENCIES += libgles +else +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON +WEBKITGTK_DEPENDENCIES += libgbm +else +WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF +endif -# GTK3-X11 target gives OpenGL from newer libgtk3 versions -# Consider this better than EGL + maybe GLESv2 since both can't be built -# 2D CANVAS acceleration requires OpenGL proper with cairo-gl ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_X11_TARGET=ON +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -else # !X11 -# GTK3-BROADWAY/WAYLAND needs at least EGL -WEBKITGTK_DEPENDENCIES += libegl -# GLESv2 support is optional though -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON -WEBKITGTK_DEPENDENCIES += libgles else -# Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -# We must explicitly state the wayland target + ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON +WEBKITGTK_DEPENDENCIES += libegl +else +WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif + +# If only the GTK Broadway backend is enabled, EGL is still needed. +ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) +WEBKITGTK_DEPENDENCIES += libegl endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else diff --git a/package/webp/webp.hash b/package/webp/webp.hash index 969e4cd3d7b1..adc543059b62 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df libwebp-1.2.4.tar.gz +sha256 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 libwebp-1.3.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 38a1564a6373..33cb4bd50729 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.4 +WEBP_VERSION = 1.3.2 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause diff --git a/package/websocketpp/0001-fix_cpp20_build.patch b/package/websocketpp/0001-fix_cpp20_build.patch new file mode 100644 index 000000000000..77b22920517f --- /dev/null +++ b/package/websocketpp/0001-fix_cpp20_build.patch @@ -0,0 +1,108 @@ +From 3197a520eb4c1e4754860441918a5930160373eb Mon Sep 17 00:00:00 2001 +From: Peter Thorson +Date: Tue, 29 Jun 2021 09:13:12 -0500 +Subject: [PATCH] [core] Remove the use of simple template ids as they have + been removed in c++20. + https://timsong-cpp.github.io/cppwp/n4861/diff.cpp17.class#2 references #991 + +Signed-off-by: Michael Nosthoff +Upstream: https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb +--- + websocketpp/endpoint.hpp | 2 +- + websocketpp/logger/basic.hpp | 14 +++++++------- + websocketpp/roles/server_endpoint.hpp | 6 +++--- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp +index 825eaa46d..10f525689 100644 +--- a/websocketpp/endpoint.hpp ++++ b/websocketpp/endpoint.hpp +@@ -111,7 +111,7 @@ class endpoint : public config::transport_type, public config::endpoint_base { + + + /// Destructor +- ~endpoint() {} ++ ~endpoint() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp +index 84514130e..4c9d83649 100644 +--- a/websocketpp/logger/basic.hpp ++++ b/websocketpp/logger/basic.hpp +@@ -58,33 +58,33 @@ namespace log { + template + class basic { + public: +- basic(channel_type_hint::value h = ++ basic(channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(std::ostream * out) ++ basic(std::ostream * out) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(out) {} + +- basic(level c, channel_type_hint::value h = ++ basic(level c, channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(level c, std::ostream * out) ++ basic(level c, std::ostream * out) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(out) {} + + /// Destructor +- ~basic() {} ++ ~basic() {} + + /// Copy constructor +- basic(basic const & other) ++ basic(basic const & other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) +@@ -97,7 +97,7 @@ class basic { + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- basic(basic && other) ++ basic(basic && other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) +diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp +index 4a5865eff..04fee18f9 100644 +--- a/websocketpp/roles/server_endpoint.hpp ++++ b/websocketpp/roles/server_endpoint.hpp +@@ -75,11 +75,11 @@ class server : public endpoint,config> { + } + + /// Destructor +- ~server() {} ++ ~server() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +- server(server &) = delete; ++ server(server &) = delete; + + // no copy assignment operator because endpoints are not copyable + server & operator=(server const &) = delete; +@@ -87,7 +87,7 @@ class server : public endpoint,config> { + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- server(server && o) : endpoint,config>(std::move(o)) {} ++ server(server && o) : endpoint,config>(std::move(o)) {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no move assignment operator because of const member variables diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 6e7850df16d3..802cb4f9b18d 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c2e2927a65fe4d7ec2f9872fca35c6b7bf12090ac62116d63c5f17b95a3a786 wilc-firmware-wilc_linux_15_7.tar.gz +sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index e31829d4301e..12c825cf92e8 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_15_7 +WILC_FIRMWARE_VERSION = wilc_linux_16_1 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 36451f839d84..71f92aaf9163 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz +sha256 26d4c2a727cc59239b84735aad856b7c7d0b04e30aa5c235c4f7f47f5f053491 wireless-regdb-2023.09.01.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 68fbe35b8be9..5c8ef9639839 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,12 +4,11 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2023.02.13 +WIRELESS_REGDB_VERSION = 2023.09.01 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7128b560aedc..6610eb7781aa 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt -sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz -sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.12.txt +sha1 e00d90769995bf786b05c05bdd9a2c6c8e372e70 wireshark-4.0.12.tar.xz +sha256 e4e3d618ba11e159fb163f0dc4716a8b72a065aafd1111db9405332552a5a115 wireshark-4.0.12.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 12c36575df10..3759f9bf9410 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.3 +WIRESHARK_VERSION = 4.0.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index c41bdb6888ce..9d173412fedf 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS bool default y if BR2_aarch64 - default y if BR2_arm || BR2_armeb + default y if (BR2_arm || BR2_armeb) && !BR2_ARM_CPU_ARMV4 # clz default y if BR2_powerpc default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 08262113a0ba..59e42e98b915 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 wolfssl-5.5.3.tar.gz +sha256 75aaafe3b8c776d1ac417288116c8d444115f9fac5acb382a39a7d163dfd618d wolfssl-5.6.6.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 9f06bb1b4b58..68c69afd59b0 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 5.5.3 -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) +WOLFSSL_VERSION = 5.6.6 +WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/releases/download/v$(WOLFSSL_VERSION)-stable WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ @@ -14,10 +14,6 @@ WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_CONFIG_SCRIPTS = wolfssl-config WOLFSSL_DEPENDENCIES = host-pkgconf -# wolfssl's source code is released without a configure -# script, so we need autoreconf -WOLFSSL_AUTORECONF = YES - WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index d1a344a664e5..26ba12172711 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.1.tar.xz.sums -md5 2b49218cdd16075b028bbaf5a4f57890 wpebackend-fdo-1.14.1.tar.xz -sha1 a68db2480d29d53d7fa24c69888bacbab6efea11 wpebackend-fdo-1.14.1.tar.xz -sha256 01938dd93c62b3a47b18dd13c70d50490a8b8a6caec23c8550a3dbdbcc6bbb50 wpebackend-fdo-1.14.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.2.tar.xz.sums +sha1 f453f8d77e93f4ac6ac81c1874d4d6bdcb45c253 wpebackend-fdo-1.14.2.tar.xz +sha256 93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38 wpebackend-fdo-1.14.2.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index c1e4e0579678..7ef347b6221f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.14.1 +WPEBACKEND_FDO_VERSION = 1.14.2 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 000000000000..a15d9e647ffc --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 7a8dc557c366..ed2821697f6c 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -37,7 +37,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 0fa1018721be..71e41bb1dd22 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums -md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz -sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz -sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cdb1..6f469c5db4be 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,8 +4,9 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.5 -WPEWEBKIT_SITE = http://www.wpewebkit.org/releases +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 +WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause @@ -14,7 +15,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ +WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -26,6 +27,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ -DENABLE_WEB_RTC=OFF \ + -DUSE_AVIF=OFF \ -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) @@ -82,6 +84,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=ON +WPEWEBKIT_DEPENDENCIES += libjxl +else +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd @@ -89,6 +98,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=ON +WPEWEBKIT_DEPENDENCIES += libgbm +else +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/package/x11r7/xapp_xcalc/xapp_xcalc.hash index 0580253dd692..12633a41a92c 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003138.html -sha256 8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4 xcalc-1.1.1.tar.xz -sha512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb xcalc-1.1.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003391.html +sha256 8578dfa1457e94289f6d6ed6146714307d8a73a1b54d2f42af1321b625fc1cd4 xcalc-1.1.2.tar.xz +sha512 51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2 xcalc-1.1.2.tar.xz # Locally computed sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 849746ece3fb..ffb724e39cff 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.1.1 +XAPP_XCALC_VERSION = 1.1.2 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.xz XAPP_XCALC_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash index 07a3eb936cf7..b0afdc15acd1 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003157.html -sha256 356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206 xdpyinfo-1.3.3.tar.xz -sha512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442 xdpyinfo-1.3.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003388.html +sha256 a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b xdpyinfo-1.3.4.tar.xz +sha512 9ef9f5c10e15a40895e8f008896b960fdd438277657c7159d16f05db79cd2374cfaca4af2f4e59335824bfd2f74a045ef89dd99ea4130ed436ea59fbbb1cbe12 xdpyinfo-1.3.4.tar.xz # Locally computed sha256 49733ead65fdfa1da0d176f9b965cc08dae74d73d66c9606488d52f6fc036abf COPYING diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index c5e2a857e3f9..a198fc44c365 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDPYINFO_VERSION = 1.3.3 +XAPP_XDPYINFO_VERSION = 1.3.4 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.xz -XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDPYINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDPYINFO_LICENSE = MIT XAPP_XDPYINFO_LICENSE_FILES = COPYING XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR diff --git a/package/x11r7/xapp_xinput/xapp_xinput.hash b/package/x11r7/xapp_xinput/xapp_xinput.hash index 0961879637eb..d3a6a66902ab 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003013.html -md5 ac6b7432726008b2f50eba82b0e2dbe4 xinput-1.6.3.tar.bz2 -sha1 92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2 -sha256 35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed xinput-1.6.3.tar.bz2 -sha512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003389.html +sha256 ad04d00d656884d133110eeddc34e9c69e626ebebbbab04dc95791c2907057c8 xinput-1.6.4.tar.xz +sha512 6734860852715e5cb9d26259a173e42413fc037546ed7fa4173ffa802c2619ee0322bed228a28cd1911be759d860070867d9b89b115f37323cca1c9ef75354b9 xinput-1.6.4.tar.xz # Locally computed sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 0d6c0deffe4d..614b62fe7732 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.3 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 +XAPP_XINPUT_VERSION = 1.6.4 +XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.xz XAPP_XINPUT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINPUT_LICENSE = MIT XAPP_XINPUT_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index fbc7f7be0000..bbf2e37328a3 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003012.html -md5 26d46f7ef0588d3392da3ad5802be420 xwininfo-1.1.5.tar.bz2 -sha1 9f67b1eb07c5824d437bf577cf6198962af1aeb7 xwininfo-1.1.5.tar.bz2 -sha256 7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e xwininfo-1.1.5.tar.bz2 -sha512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003379.html +sha256 3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f xwininfo-1.1.6.tar.xz +sha512 c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc xwininfo-1.1.6.tar.xz # Locally computed -sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING +sha256 1be1f0763a5efd08e48089c52728a822bf769b690a2fd82fbab456cfffee822f COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 9652487aae59..196b73c83d2d 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.5 -XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 +XAPP_XWININFO_VERSION = 1.1.6 +XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.xz XAPP_XWININFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWININFO_LICENSE = MIT XAPP_XWININFO_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash index 7ebc88a0beed..c9a3956686ef 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002881.html -md5 cedeef095918aca86da79a2934e03daf xbitmaps-1.1.2.tar.bz2 -sha1 1cb0e485a66280e9a64b48426140b8a0de9cf169 xbitmaps-1.1.2.tar.bz2 -sha256 b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee xbitmaps-1.1.2.tar.bz2 -sha512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003333.html +sha256 ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a xbitmaps-1.1.3.tar.xz +sha512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 xbitmaps-1.1.3.tar.xz # Locally computed sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk index e9545abaec64..c8b644582910 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XBITMAPS_VERSION = 1.1.2 -XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XBITMAPS_VERSION = 1.1.3 +XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.xz +XDATA_XBITMAPS_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XBITMAPS_LICENSE = MIT XDATA_XBITMAPS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index 2b88f567a074..1bb3831c91e3 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html -md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 -sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 -sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 -sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003332.html +sha256 95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8 xcursor-themes-1.0.7.tar.xz +sha512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902 xcursor-themes-1.0.7.tar.xz # Locally computed sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index c3c5f388e906..e5bf1e502f4e 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.6 -XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 -XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XCURSOR_THEMES_VERSION = 1.0.7 +XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.xz +XDATA_XCURSOR_THEMES_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index adba659aea65..d654c362a94f 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003247.html -sha256 7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c xf86-input-mouse-1.9.4.tar.xz -sha512 7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003392.html +sha256 4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968 xf86-input-mouse-1.9.5.tar.xz +sha512 ed9bd9cb9a05dac0ff1bfb4e4704cb2e94117afb400aa9e0b7ccdbb102bc6db1b0d3af7cb6f99d0892f8fc306f1643286291c0fa7114af8e65864412bd6c1afa xf86-input-mouse-1.9.5.tar.xz # Locally computed -sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING +sha256 5b066654bdb61a1ef41f38cceda752897bbddb6e60e20f5889cab436a9b7b813 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 4a9eb3089ffd..25e25ab93de5 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.4 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.5 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch deleted file mode 100644 index fa3e68596aa6..000000000000 --- a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Tue, 17 Sep 2013 19:55:37 +0000 -Subject: Remove usage of mibstore.h (removed from server) - -The module had a compile error for this missing header file. - -Changes similar to vmware commit -23d87c92b7211cc5249eefe4ab3a2c7f370e279e - -Reviewed-by: Alex Deucher -Signed-off-by: Gaetan Nadon ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-ark/commit/?id=3a3eb72baec46f48e6cf15a834271c3d3386deac - -Signed-off-by: Bernd Kuhls - -diff --git a/src/ark_driver.c b/src/ark_driver.c -index b7c287c..65cfe84 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash index 2e2e95367636..68131fdb38a5 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003328.html +sha256 5acc9e78122ff6f4390787b2d0d44df81379bd613b6245983cc4bf3f325d085d xf86-video-ark-0.7.6.tar.xz +sha512 a52623e07eef6fa12d77b1afc55bb74b21662b850515b3a32bbf5988dcea2e787b4eddf4e020279aa4e4ddba436505ca9298548406913031e0ed5edaac835491 xf86-video-ark-0.7.6.tar.xz # Locally calculated sha256 8ba9850fb0ecd9033bb1d25c1be85625cb53ca56ce76b71f78f4a034f7310bda COPYING diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 3f2a63609e11..6301a97300ff 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.5 -XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.6 +XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.xz +XDRIVER_XF86_VIDEO_ARK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index eed28d3fde31..6d7d0b4bc207 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003155.html -sha256 e78ceae5c8c0588c7cb658f2afc3a9fac9ef665b52a75b01f8e9c5449a4e1e5a xf86-video-dummy-0.4.0.tar.xz -sha512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9 xf86-video-dummy-0.4.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003394.html +sha256 351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf xf86-video-dummy-0.4.1.tar.xz +sha512 ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de xf86-video-dummy-0.4.1.tar.xz # Locally calculated sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index e863b1e5062f..f7f05c7c4182 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.0 +XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.1 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.xz XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 7a66c28b52bd..7dcb99fe2a81 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2023-May/003393.html +sha256 8256ac3f14117324d00b7bfa8053645ca92562fe837c542489a502adbb5f9f1e xf86-video-geode-2.11.21.tar.xz +sha512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61 xf86-video-geode-2.11.21.tar.xz # Locally calculated -sha256 f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 xf86-video-geode-2.11.20.tar.bz2 sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index dbeae1aa659b..8f84e4863ff8 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.20 -XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.21 +XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_GEODE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash index acc65348f79b..b5a139fdacd1 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002934.html -md5 349d5254d09eb46f2a1f151cd423b89a xf86-video-neomagic-1.3.0.tar.bz2 -sha1 6bccfa15ea05d5264120cd96ccf13687642e8f6d xf86-video-neomagic-1.3.0.tar.bz2 -sha256 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064 xf86-video-neomagic-1.3.0.tar.bz2 -sha512 25d019a2556e52aeb4e25942f444437a921e76d527c10ddd420f16aa7d85bf2b8a51612c382a2a7e3e407bb1e8d610d063101184eea0889c3e1a69bfb3b37735 xf86-video-neomagic-1.3.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003380.html +sha256 b61fac7ec32971e92e34cfd51f88fef169e272a210455e0e1a0faa0d30fc7494 xf86-video-neomagic-1.3.1.tar.xz +sha512 b2425c4e9b8e6e816cbb6fa436da12bd242acf55c3c615352fc80ea072b1822abdb40838c2adcc3c450e429ec6e3b5112d194e739cf5d8ac22d430e273d5378b xf86-video-neomagic-1.3.1.tar.xz # Locally computed sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9 COPYING diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index 8dd2777ff9c5..8c7beeed6e9f 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.0 -XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.xz +XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xfont_encodings/xfont_encodings.hash b/package/x11r7/xfont_encodings/xfont_encodings.hash index 6da1080576e5..80d4a48c4066 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.hash +++ b/package/x11r7/xfont_encodings/xfont_encodings.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003189.html -sha256 77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26 encodings-1.0.6.tar.xz -sha512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134 encodings-1.0.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003355.html +sha256 3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4 encodings-1.0.7.tar.xz +sha512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8 encodings-1.0.7.tar.xz # Locally computed sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index d499b421fb0a..7825f4117e17 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_ENCODINGS_VERSION = 1.0.6 +XFONT_ENCODINGS_VERSION = 1.0.7 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.xz -XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/releases/individual/font +XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_ENCODINGS_LICENSE = Public Domain XFONT_ENCODINGS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index ed68164d5fe2..56fecee9ff52 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html -sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz -sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-October/003426.html +sha256 05f267468e3c851ae2b5c830bcf74251a90f63f04dd7c709ca94dc155b7e99ee libX11-1.8.7.tar.xz +sha512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6 libX11-1.8.7.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index add16f49dbfa..920a5d9aed39 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.4 +XLIB_LIBX11_VERSION = 1.8.7 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/package/x11r7/xlib_libXaw/xlib_libXaw.hash index f289e661530d..ce2ec4a3e158 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003077.html -sha256 76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e libXaw-1.0.14.tar.bz2 -sha512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-March/003372.html +sha256 ab35f70fde9fb02cc71b342f654846a74328b74cb3a0703c02d20eddb212754a libXaw-1.0.15.tar.xz +sha512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821 libXaw-1.0.15.tar.xz # Locally calculated sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 6b615a8de5eb..f81a7b4a8890 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.14 -XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 -XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXAW_VERSION = 1.0.15 +XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.xz +XLIB_LIBXAW_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXAW_LICENSE = MIT XLIB_LIBXAW_LICENSE_FILES = COPYING XLIB_LIBXAW_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index 5dfe49605258..03de90624532 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-May/003086.html -sha256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c libXfixes-6.0.0.tar.bz2 -sha512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-April/003382.html +sha256 b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58 libXfixes-6.0.1.tar.xz +sha512 b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe libXfixes-6.0.1.tar.xz # Locally calculated -sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING +sha256 a07d8a5a6972638a745a03983207a1052881c24eea29021fdca7794bea8d7774 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index c0229b57d2e1..3f535fc1d499 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 6.0.0 -XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 -XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFIXES_VERSION = 6.0.1 +XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.xz +XLIB_LIBXFIXES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFIXES_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING XLIB_LIBXFIXES_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 5074365aeda8..749aa0ad620b 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg/2022-November/061175.html -sha256 79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71 libXft-2.3.7.tar.xz -sha512 9df29d3c7b88a21952df1015604511e5d79856d721b2a61eb2c5a062a9abccf16318132432a7c86c0ef816bf174ae86842fa67dabbaa0b163dfa56d99022de19 libXft-2.3.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003384.html +sha256 5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49 libXft-2.3.8.tar.xz +sha512 fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 libXft-2.3.8.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 845b612669f8..154c220aa119 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.7 +XLIB_LIBXFT_VERSION = 2.3.8 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index a86ef13225fc..545d4881f6ac 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html -sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2 -sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003390.html +sha256 89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7 libXi-1.8.1.tar.xz +sha512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 libXi-1.8.1.tar.xz # Locally computed sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index b4802cf018cf..6ae5ec8be837 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.8 -XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXI_VERSION = 1.8.1 +XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.xz +XLIB_LIBXI_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING XLIB_LIBXI_CPE_ID_VENDOR = x.org diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 733c404543f6..358216989148 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html -sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz -sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-October/003425.html +sha256 64b31f81019e7d388c822b0b28af8d51c4622b83f1f0cb6fa3fc95e271226e43 libXpm-3.5.17.tar.xz +sha512 52f9d2664a47a26c1a6ad65d18867de870b66947b0b0d99cca3512756a0aaa6ce2a245c0b49f20b70c3ce48bf04c47c333e8119a147465c277bca727f6ab017e libXpm-3.5.17.tar.xz # Locally calculated sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 970ec9340773..1239ba0d4d9b 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,12 +4,12 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.15 +XLIB_LIBXPM_VERSION = 3.5.17 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index e2a2a251c337..be636936e2ab 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html -sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz -sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html +sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz +sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 33b35b79797c..1d0807ffecac 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,11 +4,13 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.7 -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz +XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES @@ -176,13 +178,18 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +# Install the systemd unit only when nodm nor xdm aren't enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \ $(TARGET_DIR)/usr/lib/systemd/system/xorg.service endef +endif -# init script conflicts with S90nodm -ifneq ($(BR2_PACKAGE_NODM),y) +# Install the init script only when neither nodm nor xdm are enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 241ab73ad3fe..9ac1928f51b2 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XWAYLAND # them, otherwise, use the small libsha1 library. depends on !BR2_RISCV_32 # xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 0c476f31837d..5bb26bf17e7a 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html -sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz -sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html +sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz +sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 7aef1156d359..c66dd471ac6d 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,13 +4,15 @@ # ################################################################################ -XWAYLAND_VERSION = 22.1.8 +XWAYLAND_VERSION = 23.2.4 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_CPE_ID_VENDOR = x.org XWAYLAND_INSTALL_STAGING = YES XWAYLAND_DEPENDENCIES = \ + libdrm \ pixman \ wayland \ wayland-protocols \ @@ -22,15 +24,16 @@ XWAYLAND_DEPENDENCIES = \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ + -Ddri3=true \ -Dxwayland_eglstream=false \ -Dxvfb=false \ -Ddefault_font_path=/usr/share/fonts/X11/ \ -Ddtrace=false \ -Ddocs=false -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) XWAYLAND_CONF_OPTS += -Dglamor=true -XWAYLAND_DEPENDENCIES += libdrm libepoxy +XWAYLAND_DEPENDENCIES += libepoxy else XWAYLAND_CONF_OPTS += -Dglamor=false endif @@ -78,13 +81,6 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_LIBDRM),y) -XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += libdrm -else -XWAYLAND_CONF_OPTS += -Ddri3=false -endif - ifeq ($(BR2_PACKAGE_LIBUNWIND),y) XWAYLAND_CONF_OPTS += -Dlibunwind=true XWAYLAND_DEPENDENCIES += libunwind diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index 7bbea72b03e2..f61a6a91aec4 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.4 -sha256 1ec0eab53d1e49966d722352bcfd51ac402dce5190baedc749a8541e761670ab xdg-dbus-proxy-0.1.4.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.5 +sha256 061dcfaf8a0650e5fd9d5432dfe88bda749ea0d079dc136304bfecfbce0661fb xdg-dbus-proxy-0.1.5.tar.xz # Hash for license files: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 48f49dba2acd..2e8c054386ec 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.4 +XDG_DBUS_PROXY_VERSION = 0.1.5 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 5637f0e8d9bd..d2350ac51574 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a1a24092ad14658eed420b7d56b67d0d9d5b314e96c30a799b45f3a721f98bf0 xen-4.14.5.tar.gz +sha256 7917681bc6e744789815131fcf7799e6b83a0d45b5801ac654322b037ce472f8 xen-4.14.6.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 169753e89f79..651442cfdf50 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.5 +XEN_VERSION = 4.14.6 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING diff --git a/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch b/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch new file mode 100644 index 000000000000..fcc1f1e6730d --- /dev/null +++ b/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch @@ -0,0 +1,56 @@ +From 6c6da9e6d75ccfaa83c1efe14211f080c14181c6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 3 Dec 2023 15:28:50 +0100 +Subject: [PATCH] lib/psos/task.c: fix build with gcc >= 12 + +Fix the following build failure with gcc >= 12: + +task.c: In function 't_start': +task.c:398:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] + 398 | return ret; + | ^~~ +task.c:364:13: note: 'ret' was declared here + 364 | int ret; + | ^~~ +task.c: In function 't_resume': +task.c:444:16: error: 'ret' may be used uninitialized [-Werror=maybe-uninitialized] + 444 | return ret; + | ^~~ +task.c:428:13: note: 'ret' was declared here + 428 | int ret; + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/bc1b40de22e563b704ad7f20b6bf4d1f73a6ed8a + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/xenomai/20231203144307.1940139-1-fontaine.fabrice@gmail.com/T/#u +--- + lib/psos/task.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/psos/task.c b/lib/psos/task.c +index f678be61d..27bcc28a9 100644 +--- a/lib/psos/task.c ++++ b/lib/psos/task.c +@@ -362,7 +362,7 @@ u_long t_start(u_long tid, + { + struct psos_task *task; + struct service svc; +- int ret; ++ int ret = SUCCESS; + + CANCEL_DEFER(svc); + +@@ -426,7 +426,7 @@ u_long t_resume(u_long tid) + { + struct psos_task *task; + struct service svc; +- int ret; ++ int ret = SUCCESS; + + CANCEL_DEFER(svc); + +-- +2.42.0 + diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index c1ad0c5df62b..9356919259ba 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -41,7 +41,6 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user XENOMAI_CONF_OPTS += \ --disable-demo \ - --disable-testsuite \ --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) @@ -87,17 +86,10 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES -ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) -define XENOMAI_REMOVE_TESTSUITE - rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency smokey spitest switchtest \ - xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done - rm -rf $(TARGET_DIR)/usr/demo/ -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE +ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),y) +XENOMAI_CONF_OPTS += --enable-testsuite +else +XENOMAI_CONF_OPTS += --disable-testsuite endif ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 695471bddcc0..09f59a76f4d8 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -27,6 +27,10 @@ else XFSPROGS_CONF_OPTS += --disable-libicu endif +ifeq ($(BR2_OPTIMIZE_0),y) +XFSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install $(eval $(autotools-package)) diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in index 4dd16fa2b05f..0b5f5370e4e8 100644 --- a/package/xmrig/Config.in +++ b/package/xmrig/Config.in @@ -15,6 +15,7 @@ config BR2_PACKAGE_XMRIG # xmrig needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBUV help @@ -22,10 +23,11 @@ config BR2_PACKAGE_XMRIG https://xmrig.com -comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++" +comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++, gcc >= 4.9" depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 60185db7363f..8676f065f82c 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz +sha256 93388424f1f136db541ce056be017f2f0f6688278ac15a88bef34da8f12ffea6 xr819-xradio-119cad7d07aef6973dd44e4dae74d4c9defd06a2.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index e5daaa60511d..66c08e79215a 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f +XR819_XRADIO_VERSION = 119cad7d07aef6973dd44e4dae74d4c9defd06a2 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index e794538956c1..adfedbc874d2 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -13,7 +13,6 @@ XTABLES_ADDONS_LICENSE_FILES = LICENSE XTABLES_ADDONS_CONF_OPTS = \ --with-kbuild="$(LINUX_DIR)" \ - --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" define XTABLES_ADDONS_BUILD_CMDS diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 12cd2e639b90..e0fdcfe66e2e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 1e5bb7aad068fb31d6d3cbb77f80c7ad1526cd4c956a4ddcf2c5cf28af5334e1 xterm-376.tgz +sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz # Locally calculated -sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING +sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index d01b608d992d..c2c97dd3186a 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 376 +XTERM_VERSION = 389 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf diff --git a/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch new file mode 100644 index 000000000000..349d4415e2c7 --- /dev/null +++ b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch @@ -0,0 +1,35 @@ +From 888c94e7a121d96aa88f84c58fe7e2bd771fc5ac Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 25 Aug 2023 21:56:37 +0200 +Subject: [PATCH] TOOLS: d2c.py: explicitly use the python3 interpreter + +When compiling Xvisor on a system not providing the "python" +interpreter binary, compilation fails with output: + + (d2c) core/vio/keymaps/modifiers.c + /bin/sh: 1: /build/xvisor-0.3.2/tools/scripts/d2c.py: not found + +This commit fixes the issue following the PEP 394 recommendation: +https://peps.python.org/pep-0394/ + +It sets the "shebang" to `#! /usr/bin/env python3` to allow using other +interpreters in the PATH, or virtual environment. + +Signed-off-by: Julien Olivain + +Upstream: https://github.com/xvisor/xvisor/commit/888c94e7a121d96aa88f84c58fe7e2bd771fc5ac +Signed-off-by: Fabrice Fontaine +--- + tools/scripts/d2c.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/scripts/d2c.py b/tools/scripts/d2c.py +index b46a7bc468..daac4a5450 100755 +--- a/tools/scripts/d2c.py ++++ b/tools/scripts/d2c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#! /usr/bin/env python3 + #/** + # Copyright (c) 2013 Anup Patel. + # All rights reserved. diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index d7bb288ea8a6..9a4abb7ee400 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex $(BR2_PYTHON3_HOST_DEPENDENCY) XVISOR_MAKE_TARGETS = all diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index d14a68b4024b..cd23c8728da3 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -9,5 +9,6 @@ YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING +YAJL_CPE_ID_VENDOR = yajl_project $(eval $(cmake-package)) diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index d65298ffb9cf..367df27ff19d 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -13,6 +13,7 @@ YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ + -DCMAKE_DEBUG_POSTFIX="" \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aeec2..cdb8e15bee25 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk index d16bee69b117..db481b77b957 100644 --- a/package/yavta/yavta.mk +++ b/package/yavta/yavta.mk @@ -5,7 +5,7 @@ ################################################################################ YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70 -YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git +YAVTA_SITE = https://git.ideasonboard.org/yavta.git YAVTA_SITE_METHOD = git YAVTA_LICENSE = GPL-2.0+ YAVTA_LICENSE_FILES = COPYING.GPL diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 377c0ff692c6..af677f782ea6 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_ZABBIX_SERVER depends on BR2_USE_MMU # mysql, postgresql depends on \ (BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) || \ - (BR2_USE_WCHAR && !BR2_STATIC_LIBS) + (BR2_USE_WCHAR && !BR2_STATIC_LIBS && !BR2_OPTIMIZE_FAST) select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBEVENT diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index fb83fa01d5fa..2c933929cf11 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -9,6 +9,7 @@ ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md +ZBAR_CPE_ID_VENDOR = zbar_project ZBAR_INSTALL_STAGING = YES ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features diff --git a/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch b/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch deleted file mode 100644 index 6c9cdba3adc4..000000000000 --- a/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 473c97cda44b95f5cea08a0cdd566e602df564db Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 21 Apr 2022 14:24:01 -0600 -Subject: [PATCH] meson: fix argp-standalone wrap and find_library - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -473c97cda44b95f5cea08a0cdd566e602df564db] ---- - .github/workflows/main.yml | 27 --------------------------- - meson.build | 6 +++--- - subprojects/argp-standalone.wrap | 7 +++++++ - 3 files changed, 10 insertions(+), 30 deletions(-) - create mode 100644 subprojects/argp-standalone.wrap - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index c49806f..35667af 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -35,25 +35,11 @@ jobs: - steps: - - uses: actions/checkout@v2 - -- - uses: actions/checkout@v2 -- with: -- repository: wolfv/argp-standalone -- path: argp-standalone -- - - name: Install mamba - uses: mamba-org/provision-with-micromamba@main - with: - environment-file: .github/environment.yml - -- - name: Compile argp-standalone -- shell: cmd /C CALL {0} -- run: | -- CALL micromamba activate zchunk_test_env -- cd argp-standalone -- meson setup builddir -- meson compile -C builddir --prefix=%CONDA_PREFIX%\Library -- meson install -C builddir -- - - name: Compile zchunk - shell: cmd /C CALL {0} - run: | -@@ -75,11 +61,6 @@ jobs: - steps: - - uses: actions/checkout@v2 - -- - uses: actions/checkout@v2 -- with: -- repository: wolfv/argp-standalone -- path: argp-standalone -- - - uses: actions/setup-python@v1 - with: - python-version: '3.x' -@@ -87,14 +68,6 @@ jobs: - - name: Install meson and ninja - run: pip install meson ninja - -- - name: Compile argp-standalone -- shell: cmd /C CALL {0} -- run: | -- cd argp-standalone -- meson setup builddir -- meson compile -C builddir -- meson install -C builddir -- - - name: Compile zchunk - shell: cmd /C CALL {0} - run: | -diff --git a/meson.build b/meson.build -index 1c6b32d..aa7dd25 100644 ---- a/meson.build -+++ b/meson.build -@@ -58,10 +58,10 @@ endif - - # argp-standalone dependency (if required) - if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') -- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) -- inc += include_directories(join_paths([get_option('prefix'), 'include'])) -+ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) -+ if not argplib.found() -+ argplib = dependency('argp-standalone') - endif -- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) - else - argplib = dependency('', required : false) - endif -diff --git a/subprojects/argp-standalone.wrap b/subprojects/argp-standalone.wrap -new file mode 100644 -index 0000000..14c0b63 ---- /dev/null -+++ b/subprojects/argp-standalone.wrap -@@ -0,0 +1,7 @@ -+[wrap-git] -+directory = argp-standalone-1.4.1 -+url = https://github.com/argp-standalone/argp-standalone.git -+revision = 21855f34ec9997c37e1a08cd69497336513a5800 -+ -+[provide] -+dependency_names = argp-standalone --- -2.25.1 - diff --git a/package/zchunk/0002-zck-declare-write_data-as-static.patch b/package/zchunk/0002-zck-declare-write_data-as-static.patch deleted file mode 100644 index 3c48ab3d5092..000000000000 --- a/package/zchunk/0002-zck-declare-write_data-as-static.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 4 May 2022 16:32:48 -0600 -Subject: [PATCH] zck: declare write_data as static - -This needs to be declared static to avoid a symbol conflict: -io.c:(.text+0xe8): multiple definition of `write_data'; src/zck.p/zck.c.o:zck.c:(.text+0x1f4): first defined here - -Fixes: - - http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702a - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc] ---- - src/zck.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/zck.c b/src/zck.c -index 7727479..83b2630 100644 ---- a/src/zck.c -+++ b/src/zck.c -@@ -159,7 +159,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { - - static struct argp argp = {options, parse_opt, args_doc, doc}; - --void write_data(zckCtx *zck, char *data, ssize_t in_size) { -+static void write_data(zckCtx *zck, char *data, ssize_t in_size) { - if(zck_write(zck, data, in_size) < 0) { - LOG_ERROR("%s", zck_get_error(zck)); - exit(1); --- -2.25.1 - diff --git a/package/zchunk/zchunk.hash b/package/zchunk/zchunk.hash index fa097d4ae0ad..15103a9ea066 100644 --- a/package/zchunk/zchunk.hash +++ b/package/zchunk/zchunk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526 zchunk-1.2.2.tar.gz +sha256 4d923d32af7db33f3c0a6655b258e857a2ca564912cf85ddce14e9b1b7d495bf zchunk-1.3.2.tar.gz sha256 3c6a4fd5a93cacec6bf694d0537246bc15a95a274f5c5301749754e56d27b797 LICENSE diff --git a/package/zchunk/zchunk.mk b/package/zchunk/zchunk.mk index fc91f90431c0..39d51ac35248 100644 --- a/package/zchunk/zchunk.mk +++ b/package/zchunk/zchunk.mk @@ -4,11 +4,13 @@ # ################################################################################ -ZCHUNK_VERSION = 1.2.2 +ZCHUNK_VERSION = 1.3.2 ZCHUNK_SITE = $(call github,zchunk,zchunk,$(ZCHUNK_VERSION)) ZCHUNK_LICENSE = BSD-2-Clause ZCHUNK_LICENSE_FILES = LICENSE +ZCHUNK_CPE_ID_VENDOR = zchunk ZCHUNK_INSTALL_STAGING = YES +ZCHUNK_CONF_OPTS = -Ddocs=false -Dtests=false ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) ZCHUNK_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) diff --git a/package/zeek/Config.in b/package/zeek/Config.in index 114ec4235de6..730388ded753 100644 --- a/package/zeek/Config.in +++ b/package/zeek/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ZEEK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_ZLIB help The Zeek Network Security Monitor diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in index 99466d6baec0..e7007819d876 100644 --- a/package/zerofree/Config.in +++ b/package/zerofree/Config.in @@ -9,6 +9,6 @@ config BR2_PACKAGE_ZEROFREE https://frippery.org/uml/ -comment "zerofree needs a toolchain w/ dynamic library" +comment "zerofree needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS diff --git a/package/zfs/Config.in b/package/zfs/Config.in index 6209c5865b70..049e0716f3ad 100644 --- a/package/zfs/Config.in +++ b/package/zfs/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_ZFS depends on BR2_PACKAGE_HAS_UDEV depends on BR2_USE_MMU # util-linux (libblkid) depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc + select BR2_LINUX_NEEDS_MODULES select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBUUID diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 0bce3817fee1..01c86f2bd69c 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,6 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc -sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz -sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch +# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.sha256.asc +sha256 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9 zfs-2.2.2.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 84e9099ba901..4aa165fd4c1e 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,17 +4,17 @@ # ################################################################################ -ZFS_VERSION = 2.1.7 +ZFS_VERSION = 2.2.2 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) -ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_LICENSE = CDDL ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs +# 0001-config-user-check-for-aio.h.patch ZFS_AUTORECONF = YES -ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl +ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux # sysvinit installs only a commented-out modules-load.d/ config file ZFS_CONF_OPTS = \ @@ -57,6 +57,14 @@ else ZFS_CONF_OPTS += --disable-pam endif +# Sets the environment for the `make` that will be run ZFS autotools checks. +ZFS_CONF_ENV += \ + ARCH=$(KERNEL_ARCH) \ + CROSS_COMPILE="$(TARGET_CROSS)" +ZFS_MAKE_ENV += \ + ARCH=$(KERNEL_ARCH) \ + CROSS_COMPILE="$(TARGET_CROSS)" + # ZFS userland tools are unfunctional without the Linux kernel modules. ZFS_MODULE_SUBDIRS = \ module/avl \ @@ -78,5 +86,7 @@ define ZFS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_ZLIB_INFLATE) endef -$(eval $(kernel-module)) +# Even though zfs builds a kernel module, it gets built directly by +# the autotools logic, so we don't use the kernel-module +# infrastructure. $(eval $(autotools-package)) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 40f68f02996b..a2720a27baa3 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html -sha512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b tzcode2022f.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html +sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 229afaadc21c..a915f6d25653 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2022f +ZIC_VERSION = 2023c ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index aa65d8437dbc..a85913224a44 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch new file mode 100644 index 000000000000..cb0988e63149 --- /dev/null +++ b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch @@ -0,0 +1,53 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 + +Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d43578e0e..efab0ee1ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt +index e18fe47644..a87f74e478 100644 +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt +index edbeb41ed5..36a2e649f0 100644 +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index 1051376808e4..85836924b965 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -33,7 +33,10 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) ZXING_CPP_DEPENDENCIES += python3 python-pybind -ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=ON +ZXING_CPP_CONF_OPTS += \ + -DBUILD_PYTHON_MODULE=ON \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) else ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF endif diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index fb930cbef7cc..cd148f32e63b 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_36_X=y -BR2_GCC_VERSION_11_X=y +BR2_BINUTILS_VERSION_2_39_X=y +BR2_GCC_VERSION_12_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 5760e4ded1f1..e3676903198b 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,11 @@ -# Set this to either 3.18 or higher, depending on the highest minimum -# version required by any of the packages bundled in Buildroot. If a -# package is bumped or a new one added, and it requires a higher -# version, our cmake infra will catch it and build its own. +# The cmake minimum version is set to either 3.18 or higher, +# depending on the highest minimum version required by any +# of the packages bundled in Buildroot. If a package is +# bumped or a new one added, and it requires a higher +# cmake version than the one provided by the host, our +# cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.18 +BR2_CMAKE_VERSION_MIN = $(BR2_HOST_CMAKE_AT_LEAST) BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ diff --git a/support/dependencies/check-host-tar.sh b/support/dependencies/check-host-tar.sh index b7d607a47a0b..7d6b3bf68816 100755 --- a/support/dependencies/check-host-tar.sh +++ b/support/dependencies/check-host-tar.sh @@ -33,7 +33,12 @@ fi major_min=1 minor_min=27 -if [ $major -lt $major_min ]; then +# Maximal version = 1.34 (1.35 changed devmajor/devminor for files) +# https://lists.gnu.org/archive/html/info-gnu/2023-07/msg00005.html +major_max=1 +minor_max=34 + +if [ $major -lt $major_min -o $major -gt $major_max ]; then # echo nothing: no suitable tar found exit 1 fi @@ -43,5 +48,10 @@ if [ $major -eq $major_min -a $minor -lt $minor_min ]; then exit 1 fi +if [ $major -eq $major_max -a $minor -gt $minor_max ]; then + # echo nothing: no suitable tar found + exit 1 +fi + # valid echo $tar diff --git a/support/download/check-hash b/support/download/check-hash index 5a47f49bc302..03a655718770 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -3,12 +3,12 @@ set -e # Helper to check a file matches its known hash # Call it with: -# $1: the path of the file containing all the expected hashes -# $2: the full path to the temporary file that was downloaded, and +# $1: the full path to the temporary file that was downloaded, and # that is to be checked -# $3: the final basename of the file, to which it will be ultimately +# $2: the final basename of the file, to which it will be ultimately # saved as, to be able to match it to the corresponding hashes # in the .hash file +# $*: the paths of the files containing all the expected hashes # # Exit codes: # 0: the hash file exists and the file to check matches all its hashes, @@ -27,28 +27,21 @@ while getopts :q OPT; do done shift $((OPTIND-1)) -h_file="${1}" -file="${2}" -base="${3}" - -# Bail early if no hash to check -if [ -z "${h_file}" ]; then - exit 0 -fi -# Does the hash-file exist? -if [ ! -f "${h_file}" ]; then - printf "WARNING: no hash file for %s\n" "${base}" >&2 - exit 0 -fi +file="${1}" +base="${2}" +shift 2 +declare -a h_files=( "${@}" ) # Check one hash for a file # $1: algo hash # $2: known hash # $3: file (full path) +# $4: hash file (full path) check_one_hash() { _h="${1}" _known="${2}" _file="${3}" + _h_file="${4}" # Note: md5 is supported, but undocumented on purpose. # Note: sha3 is not supported, since there is currently no implementation @@ -70,6 +63,7 @@ check_one_hash() { return 0 fi + printf "ERROR: while checking hashes from %s\n" "${_h_file}" >&2 printf "ERROR: %s has wrong %s hash:\n" "${base}" "${_h}" >&2 printf "ERROR: expected: %s\n" "${_known}" >&2 printf "ERROR: got : %s\n" "${_hash}" >&2 @@ -79,21 +73,31 @@ check_one_hash() { } # Do we know one or more hashes for that file? +nb_h_files=0 nb_checks=0 -while read t h f; do - case "${t}" in - ''|'#'*) - # Skip comments and empty lines - continue - ;; - *) - if [ "${f}" = "${base}" ]; then - check_one_hash "${t}" "${h}" "${file}" - : $((nb_checks++)) - fi - ;; - esac -done <"${h_file}" +for h_file in "${h_files[@]}"; do + [ -f "${h_file}" ] || continue + : $((nb_h_files++)) + while read t h f; do + case "${t}" in + ''|'#'*) + # Skip comments and empty lines + continue + ;; + *) + if [ "${f}" = "${base}" ]; then + check_one_hash "${t}" "${h}" "${file}" "${h_file}" + : $((nb_checks++)) + fi + ;; + esac + done <"${h_file}" +done + +if [ ${nb_h_files} -eq 0 ]; then + printf "WARNING: no hash file for %s\n" "${base}" >&2 + exit 0 +fi if [ ${nb_checks} -eq 0 ]; then case " ${BR_NO_CHECK_HASH_FOR} " in diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 1e8d6058f664..35428faeefe5 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -21,8 +21,8 @@ export BR_BACKEND_DL_GETOPTS=":hc:d:o:n:N:H:lru:qf:e" main() { local OPT OPTARG - local backend output hfile large_file recurse quiet rc - local -a uris + local backend output large_file recurse quiet rc + local -a uris hfiles # Parse our options; anything after '--' is for the backend while getopts ":c:d:D:o:n:N:H:lrf:u:qp:" OPT; do @@ -33,7 +33,7 @@ main() { o) output="${OPTARG}";; n) raw_base_name="${OPTARG}";; N) base_name="${OPTARG}";; - H) hfile="${OPTARG}";; + H) hfiles+=( "${OPTARG}" );; l) large_file="-l";; r) recurse="-r";; f) filename="${OPTARG}";; @@ -70,7 +70,7 @@ main() { # - fails at least one of its hashes: force a re-download # - there's no hash (but a .hash file): consider it a hard error if [ -e "${output}" ]; then - if support/download/check-hash ${quiet} "${hfile}" "${output}" "${output##*/}"; then + if support/download/check-hash ${quiet} "${output}" "${output##*/}" "${hfiles[@]}"; then exit 0 elif [ ${?} -ne 2 ]; then # Do not remove the file, otherwise it might get re-downloaded @@ -154,7 +154,7 @@ main() { # Check if the downloaded file is sane, and matches the stored hashes # for that file - if support/download/check-hash ${quiet} "${hfile}" "${tmpf}" "${output##*/}"; then + if support/download/check-hash ${quiet} "${tmpf}" "${output##*/}" "${hfiles[@]}"; then rc=0 else if [ ${?} -ne 3 ]; then diff --git a/support/download/git b/support/download/git index 1a1c315f73d7..6654d98a008e 100755 --- a/support/download/git +++ b/support/download/git @@ -5,8 +5,8 @@ # (e.g. tar options, compression ratio or method)), we MUST update the format # version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. -# We want to catch any unexpected failure, and exit immediately -set -E +# We want to catch any unexpected failure +set -e # Download helper for git, to be called from the download wrapper script # @@ -21,6 +21,7 @@ set -E # Environment: # GIT : the git command to call +# shellcheck disable=SC1090 # Only provides mk_tar_gz() . "${0%/*}/helpers" # Save our path and options in case we need to call ourselves again @@ -77,17 +78,19 @@ pushd "${git_cache}" >/dev/null # Any error now should try to recover trap _on_error ERR +set -E # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _git() { if [ -z "${quiet}" ]; then - printf '%s ' GIT_DIR="${git_cache}/.git" ${GIT} "${@}"; printf '\n' + printf '%s ' GIT_DIR="${git_cache}/.git" "${GIT}" "${@}"; printf '\n' fi _plain_git "$@" } # Note: please keep command below aligned with what is printed above _plain_git() { + # shellcheck disable=SC2086 # We want word-splitting for GIT eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } @@ -173,6 +176,7 @@ fi # the working copy as well as the repository, which means submodules # will not be cached for older versions. # +# shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "Deregistering submodule \"%s\"\n" "${path}" && cd .. && rm -rf "${path##*/}"' _git submodule --quiet foreach "'${cmd}'" @@ -199,11 +203,12 @@ if [ ${recurse} -eq 1 ]; then # that the archives are reproducible across a wider range of git # versions. However, we can't do that if git is too old and uses # full repositories for submodules. + # shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "%s\n" "${path}/"' for module_dir in $( _plain_git submodule --quiet foreach "'${cmd}'" ); do [ -f "${module_dir}/.git" ] || continue relative_dir="$( sed -r -e 's,/+,/,g; s,[^/]+/,../,g' <<<"${module_dir}" )" - sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: "${relative_dir}":" "${module_dir}/.git" + sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: ${relative_dir}:" "${module_dir}/.git" done fi @@ -213,6 +218,7 @@ if [ ${large_file} -eq 1 ]; then _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, + # shellcheck disable=SC2086 # We want word-splitting for GIT if [ ${recurse} -eq 1 ]; then _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index a1de1707495a..f18c6067b9a3 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02' +RELEASE='2023.02.11' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 38aca31fb5de..656f39d57061 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -60,6 +60,11 @@ before_script: tail -200 runtime-test.log exit 1 } + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -81,6 +86,11 @@ before_script: - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -101,6 +111,11 @@ before_script: needs: - pipeline: $PARENT_PIPELINE_ID job: generate-gitlab-ci-yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3248e3678d7e..a539808eca9f 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -84,7 +84,7 @@ class Package: all_ignored_cves = dict() all_cpeids = dict() # This is the list of all possible checks. Add new checks to this list so - # a tool that post-processeds the json output knows the checks before + # a tool that post-processes the json output knows the checks before # iterating over the packages. status_checks = ['cve', 'developers', 'hash', 'license', 'license-files', 'patches', 'pkg-check', 'url', 'version'] @@ -259,7 +259,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionnary") + self.status['cpe'] = ("warning", "not checked against CPE dictionary") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -499,7 +499,7 @@ def check_package_latest_version_set_status(pkg, status, version, identifier): async def check_package_get_latest_version_by_distro(session, pkg, retry=True): - url = "https://release-monitoring.org//api/project/Buildroot/%s" % pkg.name + url = "https://release-monitoring.org/api/project/Buildroot/%s" % pkg.name try: async with session.get(url) as resp: if resp.status != 200: @@ -865,6 +865,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -982,10 +989,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
{current_version}
\n') diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 53876f828cc0..09f81eca89b3 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -20,7 +20,7 @@ def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): # # kernel: path to the kernel image, or the special string # 'builtin'. 'builtin' means a pre-built kernel image will be - # downloaded from ARTEFACTS_URL and suitable options are + # downloaded from ARTIFACTS_URL and suitable options are # automatically passed to qemu and added to the kernel cmdline. So # far only armv5, armv7 and i386 builtin kernels are available. # If None, then no kernel is used, and we assume a bootable device @@ -84,11 +84,11 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): # Wait for the login prompt to appear, and then login as root with # the provided password, or no password if not specified. - def login(self, password=None): + def login(self, password=None, timeout=60): # The login prompt can take some time to appear when running multiple # instances in parallel, so set the timeout to a large value index = self.qemu.expect(["buildroot login:", pexpect.TIMEOUT], - timeout=60 * self.timeout_multiplier) + timeout=timeout * self.timeout_multiplier) if index != 0: self.logfile.write("==> System does not boot") raise SystemError("System does not boot") diff --git a/support/testing/tests/init/test_systemd_selinux.py b/support/testing/tests/init/test_systemd_selinux.py index 73604cfc32e4..f95ac3a41115 100644 --- a/support/testing/tests/init/test_systemd_selinux.py +++ b/support/testing/tests/init/test_systemd_selinux.py @@ -20,9 +20,9 @@ class TestSELinuxSystemd(infra.basetest.BRTest): """ def wait_boot(self): - # The complete boot with systemd takes more time than what the default multipler permits - self.emulator.timeout_multiplier *= 10 - self.emulator.login() + # The complete boot with systemd takes more time than what the + # default typically allows + self.emulator.login(timeout=600) def run_tests(self, fstype): kernel = os.path.join(self.builddir, "images", "bzImage") diff --git a/support/testing/tests/package/sample_python_docker.py b/support/testing/tests/package/sample_python_docker.py new file mode 100644 index 000000000000..a69097b4125a --- /dev/null +++ b/support/testing/tests/package/sample_python_docker.py @@ -0,0 +1,12 @@ +import docker + +client = docker.from_env() +info = client.info() +images = client.images.list() + +assert len(images) > 0 + +print('Version:', info['ServerVersion']) +print('Images:') +for i in images: + print(i.tags[0]) diff --git a/support/testing/tests/package/test_bash.py b/support/testing/tests/package/test_bash.py new file mode 100644 index 000000000000..f0ee8cadc120 --- /dev/null +++ b/support/testing/tests/package/test_bash.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestBash(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_ENABLE_LOCALE_WHITELIST="" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BASH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check that we are indeed not (yet) running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Already running bash instead of busybox' sh") + + self.assertRunOk("bash -il") + # Twist! The above command is still runing, it's just that + # bash did display the prompt we expect. Check we are indeed + # actually bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + # Exit bash, back to busybox' shell + self.emulator.run("exit 0") + + # Check that we are indeed no longer running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Still running bash instead of busybox' sh") + + # Try to run with a non-available locale + self.assertRunOk("LC_ALL=en_US bash -il") + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + self.emulator.run("exit 0") diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py index df3990c6be82..f36faa059a54 100644 --- a/support/testing/tests/package/test_clang.py +++ b/support/testing/tests/package/test_clang.py @@ -14,7 +14,7 @@ class TestClangCompilerRT(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.283" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 38b669fc6d61..16027c9c3ada 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -4,6 +4,8 @@ class TestDockerCompose(infra.basetest.BRTest): + scripts = ["conf/docker-compose.yml", + "tests/package/sample_python_docker.py"] config = \ """ BR2_x86_64=y @@ -18,6 +20,8 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DOCKER=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_COMPOSE=y @@ -27,7 +31,7 @@ class TestDockerCompose(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """.format( infra.filepath("tests/package/copy-sample-script-to-target.sh"), - infra.filepath("conf/docker-compose.yml"), + " ".join([infra.filepath(i) for i in scripts]), infra.filepath("conf/docker-compose-kernel.config")) def wait_for_dockerd(self): @@ -46,6 +50,9 @@ def docker_compose_test(self): self.assertRunOk('wget -q -O /tmp/busybox http://127.0.0.1/busybox', 120) self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) + def python_docker_test(self): + self.assertRunOk('python3 ./sample_python_docker.py', 120) + def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage") rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") @@ -62,3 +69,4 @@ def test_run(self): self.wait_for_dockerd() self.docker_test() self.docker_compose_test() + self.python_docker_test() diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py index 4505e1c33913..2b18f54fa320 100644 --- a/support/testing/tests/package/test_gnupg2.py +++ b/support/testing/tests/package/test_gnupg2.py @@ -37,7 +37,7 @@ def test_run(self): # Test symmetric encrypt cmd = "gpg --batch --symmetric" cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=10) # Test symmetric decrypt cmd = "gpg --batch --decrypt" diff --git a/support/testing/tests/package/test_lxc.py b/support/testing/tests/package/test_lxc.py index f66b31f3bac2..5a37df7a38d7 100644 --- a/support/testing/tests/package/test_lxc.py +++ b/support/testing/tests/package/test_lxc.py @@ -32,9 +32,9 @@ def run_ok(self, cmd): self.assertRunOk(cmd, 120) def wait_boot(self): - # the complete boot with systemd takes more time than what the default multipler permits - self.emulator.timeout_multiplier *= 10 - self.emulator.login() + # the complete boot with systemd takes more time than what the + # default typically allows + self.emulator.login(timeout=600) def setup_run_test_container(self): self.run_ok("lxc-create -n lxc_iperf3 -t none -f /usr/share/lxc/config/minimal-iperf3.conf") diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index 0b7d35bb6a1e..e1ca50f6d8dc 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -6,7 +6,7 @@ class TestPythonDjango(TestPythonPackageBase): sample_scripts = ["tests/package/sample_python_django.py"] def run_sample_scripts(self): - timeout = 35 * self.emulator.timeout_multiplier + timeout = 35 cmd = "cd /opt && /usr/bin/django-admin startproject testsite" self.assertRunOk(cmd, timeout=timeout) diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py index d6541a248011..d1a37acbc6ed 100644 --- a/support/testing/tests/package/test_python_magic_wormhole.py +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -56,7 +56,9 @@ def test_run(self): cmd += "sleep 25" self.assertRunOk(cmd, timeout=30) - cmd = wormhole_cmd + " receive {}".format(code) + wormhole_env = "_MAGIC_WORMHOLE_TEST_KEY_TIMER=100 " + wormhole_env += "_MAGIC_WORMHOLE_TEST_VERIFY_TIMER=100 " + cmd = wormhole_env + wormhole_cmd + " receive {}".format(code) output, exit_code = self.emulator.run(cmd, timeout=35) self.assertEqual(exit_code, 0) self.assertEqual(output[0], text) diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 1f01ddd76835..27dbc2869bc9 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -40,11 +40,11 @@ def base_test_run(self): cmds = [ # Init - "modprobe zfs", + "modprobe zfs && sleep 2", "mount -o remount,size=132M /tmp", "fallocate -l 64M /tmp/container1.raw", "fallocate -l 64M /tmp/container2.raw", - "zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw", + "zpool create pool raidz /tmp/container1.raw /tmp/container2.raw", "dd if=/dev/urandom bs=1M count=8 of=/pool/urandom", "sha256sum /pool/urandom > /tmp/urandom.sha256", # Check ZFS diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index d2c155684586..ca5cd5a50627 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ def test_run(self): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") @@ -228,9 +228,9 @@ def test_run(self): self.WITH_UTILS_IN_PATH, subdir_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forget to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forget to update " ".checkpackageignore_outdated?" .format(subdir_file), w) diff --git a/toolchain/Config.in b/toolchain/Config.in index 08e4ccad9ead..b3cbec83773c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -244,6 +244,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_OPTIMIZE_0 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 +# ICE: on M68K: in change_address_1, at emit-rtl.cc:2287 +# This bug exists in gcc = 12.3.0 and gcc = 13.2.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_110934 + bool + default y if BR2_m68k + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 24c482923ab0..08ee6060b0fd 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -307,7 +307,7 @@ check_uclibc = \ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_XLOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\ diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 7ae56a9d7908..d90137af0911 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -65,6 +65,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -88,6 +89,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -111,6 +113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -134,6 +137,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -157,6 +161,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -180,6 +185,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -202,6 +208,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -225,6 +232,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -249,6 +257,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -272,6 +281,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -440,6 +450,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -465,6 +476,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -490,6 +502,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -515,6 +528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -541,6 +555,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -566,6 +581,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -590,6 +606,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -615,6 +632,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -640,6 +658,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -665,6 +684,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -691,6 +711,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -716,6 +737,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -740,6 +762,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -765,6 +788,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -790,6 +814,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -815,6 +840,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -841,6 +867,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -866,6 +893,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -890,6 +918,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -915,6 +944,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -940,6 +970,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -965,6 +996,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -991,6 +1023,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1016,6 +1049,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1040,6 +1074,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1062,6 +1097,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1083,6 +1119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1106,6 +1143,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1452,6 +1490,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1477,6 +1516,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1502,6 +1542,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1527,6 +1568,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1552,6 +1594,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1577,6 +1620,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1601,6 +1645,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1626,6 +1671,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1651,6 +1697,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1676,6 +1723,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1701,6 +1749,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1726,6 +1775,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1750,6 +1800,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1775,6 +1826,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1800,6 +1852,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1825,6 +1878,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1851,6 +1905,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1876,6 +1931,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1900,6 +1956,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1925,6 +1982,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1950,6 +2008,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1975,6 +2034,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2001,6 +2061,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2026,6 +2087,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2051,6 +2113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2077,6 +2140,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2103,6 +2167,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2129,6 +2194,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2156,6 +2222,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2182,6 +2249,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2207,6 +2275,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2233,6 +2302,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2259,6 +2329,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2285,6 +2356,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2312,6 +2384,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2338,6 +2411,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2363,6 +2437,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2389,6 +2464,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2415,6 +2491,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2441,6 +2518,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2468,6 +2546,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2494,6 +2573,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2516,6 +2596,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2539,6 +2620,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2563,6 +2645,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2587,6 +2670,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2611,6 +2695,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2635,6 +2720,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2659,6 +2745,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2683,6 +2770,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2706,6 +2794,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2730,6 +2819,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2754,6 +2844,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2777,6 +2868,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2801,6 +2893,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2825,6 +2918,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2848,6 +2942,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2872,6 +2967,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2896,6 +2992,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2919,6 +3016,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2943,6 +3041,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2967,6 +3066,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2990,6 +3090,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3014,6 +3115,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3038,6 +3140,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3061,6 +3164,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3085,6 +3189,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3109,6 +3214,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3132,6 +3238,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3156,6 +3263,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3180,6 +3288,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3204,6 +3313,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3228,6 +3338,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3252,6 +3363,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3276,6 +3388,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3300,6 +3413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3324,6 +3438,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3348,6 +3463,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3372,6 +3488,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3396,6 +3513,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3420,6 +3538,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3444,6 +3563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3470,6 +3590,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3496,6 +3617,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3522,6 +3644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3548,6 +3671,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3574,6 +3698,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3602,6 +3727,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3629,6 +3755,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3652,6 +3779,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3676,6 +3804,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3700,6 +3829,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3724,6 +3854,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3748,6 +3879,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3772,6 +3904,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3796,6 +3929,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3820,6 +3954,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3843,6 +3978,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3867,6 +4003,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3891,6 +4028,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3915,6 +4053,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3938,6 +4077,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3962,6 +4102,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3987,6 +4128,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4011,6 +4153,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4036,6 +4179,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4062,6 +4206,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4088,6 +4233,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4114,6 +4260,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4140,6 +4287,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4166,6 +4314,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4195,6 +4344,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4225,6 +4375,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4255,6 +4406,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4285,6 +4437,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4315,6 +4468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4345,6 +4499,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4376,6 +4531,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4408,6 +4564,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4440,6 +4597,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4472,6 +4630,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4504,6 +4663,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4536,6 +4696,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4568,6 +4729,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4601,6 +4763,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4634,6 +4797,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4667,6 +4831,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4700,6 +4865,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4733,6 +4899,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4762,6 +4929,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4792,6 +4960,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4822,6 +4991,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4852,6 +5022,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4883,6 +5054,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4913,6 +5085,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4940,6 +5113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4968,6 +5142,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4996,6 +5171,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5023,6 +5199,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5050,6 +5227,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5078,6 +5256,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5108,6 +5287,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5139,6 +5319,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5170,6 +5351,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5200,6 +5382,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5230,6 +5413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5261,6 +5445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5286,6 +5471,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5311,6 +5497,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2341d0883256..d49c61023754 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 8217ddc38c73..720d705d14ba 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd67..e9a9c1c2a176 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -24,6 +24,21 @@ config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX string "Toolchain prefix" default "$(ARCH)-linux" + help + Component name prefix used by your external toolchain. + + Typically, this is the target tuple, e.g. something that + looks like: $(ARCH)-unknown-linux-gnu. + + If unsure, look at the "bin" directory of your toolchain and + note the part of component name before the last dash, i.e. if + you call the toolchain's gcc as $(ARCH)-unknown-linux-gnu-gcc, + the prefix is $(ARCH)-unknown-linux-gnu. + + Note that Buildroot toolchains have shorter aliases that look + like $(ARCH)-linux, as symlinks to the full-tuple components, + so you can leave this option at default value if you use them + as external toolchain. choice bool "External toolchain gcc version" diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index c3483f331c77..37c7b826440c 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -4,7 +4,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/utils/add-custom-hashes b/utils/add-custom-hashes new file mode 100755 index 000000000000..20e48d8ef3df --- /dev/null +++ b/utils/add-custom-hashes @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +set -e + +# Add hash files for packages with custom versions for +# BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +# +# Run in a configured Buildroot directory, E.G. +# make foo_defconfig; ./utils/add-custom-hashes + +# print BR-style message +# message +message() { + tput smso 2>/dev/null + echo "$*" + tput rmso 2>/dev/null +} + +# print error message and exit +# die +die() { + echo "Error: $*" >&2 + exit 1 +} + +# get package(s) for download file, if any +# get_pkgs +get_pkgs() { + jq --arg file "$2" -r \ + 'to_entries[] | select(.value.downloads[0].source == $file) | .key | strings' "$1" +} + +# get download dir for package +# get_pkg_dl_dir +get_pkg_dl_dir() { + jq --arg pkg "$2" -r '.[$pkg].dl_dir | strings' "$1" +} + +# generate hash file for download file +# gen_hash +gen_hash() { + ( + cd "$1" && printf '# Locally calculated\nsha256 ' && sha256sum "$2" + ) +} + +command -v jq >/dev/null || die 'Script needs jq' + +[ -e .config ] || \ + die "No .config found, please run this in a configured Buildroot (O=) directory" + +message Collecting data + +eval "$(make -s VARS='TOPDIR DL_DIR BR_NO_CHECK_HASH_FOR BR2_GLOBAL_PATCH_DIR' QUOTED_VARS=YES printvars)" +# global patch dir may already have quotes +BR2_GLOBAL_PATCH_DIR=$(echo "$BR2_GLOBAL_PATCH_DIR" | tr -d '"') + +[ -n "$BR2_GLOBAL_PATCH_DIR" ] || die "No BR2_GLOBAL_PATCH_DIR defined, nothing to do" +[ -n "$BR_NO_CHECK_HASH_FOR" ] || die "No packages without hashes found, nothing to do" + +[ -d "$TOPDIR" ] || die "TOPDIR ($TOPDIR) does not look correct" +[ -d "$DL_DIR" ] || die "DL_DIR ($DL_DIR) does not look correct" + +# patch dir may contain multiple dirs, use the last one +# shellcheck disable=SC2086 # we need the word splitting +set -- $BR2_GLOBAL_PATCH_DIR +if [ $# -gt 1 ]; then + BR2_GLOBAL_PATCH_DIR="${!#}"; + message BR2_GLOBAL_PATCH_DIR contains multiple directories, using "$BR2_GLOBAL_PATCH_DIR" +fi + +# patch dir may be relative to TOPDIR +case "$BR2_GLOBAL_PATCH_DIR" in + /*) ;; + *) BR2_GLOBAL_PATCH_DIR="$TOPDIR/$BR2_GLOBAL_PATCH_DIR" + ;; +esac + +[ -d "$BR2_GLOBAL_PATCH_DIR" ] \ + || die "BR2_GLOBAL_PATCH_DIR ($BR2_GLOBAL_PATCH_DIR) does not look correct" + +trap 'rm -f "$JSON"' EXIT +JSON=$(mktemp) +make show-info > "$JSON" + +# ensure files have been downloaded, but without checking +make BR2_DOWNLOAD_FORCE_CHECK_HASHES= source + +message Updating hashes + +for file in $BR_NO_CHECK_HASH_FOR; do + for pkg in $(get_pkgs "$JSON" "$file"); do + HASHFILE="$BR2_GLOBAL_PATCH_DIR/$pkg/$pkg.hash" + PKG_DL_DIR=$(get_pkg_dl_dir "$JSON" "$pkg") + message "Adding hash for $file to $HASHFILE" + mkdir -p "${HASHFILE%/*}" + gen_hash "$DL_DIR/$PKG_DL_DIR" "$file" > "$HASHFILE" + done +done + +message Verifying hashes + +make clean +make BR2_DOWNLOAD_FORCE_CHECK_HASHES=y source diff --git a/utils/check-package b/utils/check-package index 98a25bd0b2de..59b2e9033e1e 100755 --- a/utils/check-package +++ b/utils/check-package @@ -6,12 +6,12 @@ import inspect import magic import os import re -import six import sys import checkpackagelib.base import checkpackagelib.lib_config import checkpackagelib.lib_hash +import checkpackagelib.lib_ignore import checkpackagelib.lib_mk import checkpackagelib.lib_patch import checkpackagelib.lib_shellscript @@ -68,7 +68,7 @@ def parse_args(): help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", - default="http://nightly.buildroot.org/", + default="https://nightly.buildroot.org/", help="default: %(default)s") parser.add_argument("--verbose", "-v", action="count", default=0) parser.add_argument("--quiet", "-q", action="count", default=0) @@ -105,6 +105,7 @@ def get_lib_from_filetype(fname): CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ + r".checkpackageignore", r"Config.in", r"arch/", r"boot/", @@ -137,6 +138,8 @@ def get_lib_from_filename(fname): if os.path.basename(fname) == "external.mk" and \ os.path.exists(fname[:-2] + "desc"): return None + if fname == ".checkpackageignore": + return checkpackagelib.lib_ignore if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config if fname.endswith(".hash"): @@ -218,12 +221,9 @@ def check_file_using_lib(fname): if fail > 0: failed.add(name) nwarnings += warn - if six.PY3: - f = open(fname, "r", errors="surrogateescape") - else: - f = open(fname, "r") + lastline = "" - for lineno, text in enumerate(f.readlines()): + for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()): nlines += 1 for name, cf in objects: if cf.disable.search(lastline): @@ -233,7 +233,7 @@ def check_file_using_lib(fname): failed.add(name) nwarnings += warn lastline = text - f.close() + for name, cf in objects: warn, fail = print_warnings(cf.after(), name in xfail) if fail > 0: @@ -250,7 +250,7 @@ def check_file_using_lib(fname): for should_fail in xfail: if should_fail not in failed: - print("{}:0: {} was expected to fail, did you fixed the file and forgot to update {}?" + print("{}:0: {} was expected to fail, did you fix the file and forget to update {}?" .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 diff --git a/utils/checkpackagelib/lib_ignore.py b/utils/checkpackagelib/lib_ignore.py new file mode 100644 index 000000000000..f3698fc3b4d2 --- /dev/null +++ b/utils/checkpackagelib/lib_ignore.py @@ -0,0 +1,14 @@ +# See utils/checkpackagelib/readme.txt before editing this file. + +import os + +from checkpackagelib.base import _CheckFunction + + +class IgnoreMissingFile(_CheckFunction): + def check_line(self, lineno, text): + fields = text.split() + if not os.path.exists(fields[0]): + return ["{}:{}: ignored file {} is missing" + .format(self.filename, lineno, fields[0]), + text] diff --git a/utils/checkpackagelib/test_lib_ignore.py b/utils/checkpackagelib/test_lib_ignore.py new file mode 100644 index 000000000000..6cd856d66940 --- /dev/null +++ b/utils/checkpackagelib/test_lib_ignore.py @@ -0,0 +1,18 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_ignore as m + + +IgnoreMissingFile = [ + ('missing ignored file', + '.checkpackageignore', + 'this-file-does-not-exist SomeTest', + [['.checkpackageignore:1: ignored file this-file-does-not-exist is missing', + 'this-file-does-not-exist SomeTest']]), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', IgnoreMissingFile) +def test_IgnoreMissingFile(testname, filename, string, expected): + warnings = util.check_file(m.IgnoreMissingFile, filename, string) + assert warnings == expected diff --git a/utils/docker-run b/utils/docker-run index 164e11c0e6f1..ab95e61e846b 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -2,12 +2,40 @@ set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") +if [ -L "${MAIN_DIR}/.git/config" ]; then + # Support git-new-workdir + GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")" +else + # Support git-worktree + GIT_DIR="$(cd "${MAIN_DIR}" && git rev-parse --no-flags --git-common-dir)" +fi # shellcheck disable=SC2016 IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') -exec docker run -it --rm \ - --user "$(id -u):$(id -g)" \ - --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ - --workdir "${MAIN_DIR}" \ - "${IMAGE}" "${@}" +declare -a docker_opts=( + -i + --rm + --user "$(id -u):$(id -g)" + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" + --workdir "${MAIN_DIR}" +) + +# Empty GIT_DIR means that we are not in a workdir, *and* git is too old +# to know about worktrees, so we're not in a worktree either. So it means +# we're in the main git working copy, and thus we don't need to mount the +# .git directory. +if [ "${GIT_DIR}" ]; then + # GIT_DIR in the main working copy (when git supports worktrees) will + # be just '.git', but 'docker run' needs an absolute path. If it is + # not absolute, GIT_DIR is relative to MAIN_DIR. If it's an absolute + # path already (in a wordir), then that's a noop. + GIT_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}")" + docker_opts+=( --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" ) +fi + +if tty -s; then + docker_opts+=( -t ) +fi + +exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" diff --git a/utils/genrandconfig b/utils/genrandconfig index 2b0baedf310f..846cf1aa9f1f 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -512,6 +512,9 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_OPTEE_OS=y\n') configlines.remove('BR2_TARGET_OPTEE_OS_PLATFORM=""\n') + if 'BR2_TARGET_ROOTFS_CRAMFS=y\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_CRAMFS=y\n') + if 'BR2_TARGET_ROOTFS_EXT2=y\n' in configlines and \ 'BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n' in configlines: configlines.remove('BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n') @@ -522,6 +525,17 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + if 'BR2_TARGET_ROOTFS_UBIFS=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') + configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index e7d0d23e49e8..469360b801cf 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -25,7 +25,7 @@ def analyze_patch(patch): m = FIND_INFRA_IN_PATCH.match(line) if m: infras.add(m.group(2)) - if not line.startswith("+++ "): + if not line.startswith("+++ ") and not line.startswith("--- "): continue line.strip() fname = line[line.find("/") + 1:].strip()